From 50963f8f2f28dd8abcc800ccbaca1f93c7a82de5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 Dec 2021 15:20:32 +0100 Subject: [PATCH] board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935239 ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type So change to partition-type-uuid instead. With that fixed, genimage-15 then also complains about the overlap between the u-boot partition and the GPT: ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000) So adjust the u-boot partition to end just before the GPT. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-r1/genimage.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index a2ad618557..e42c37d5fd 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -24,11 +24,11 @@ image sdcard.img { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8K - size = 1032K # 1MB - 8KB + 16KB(GPT) + size = 1016K # 1MB - 8KB } partition boot { - partition-type = 0xC + partition-type-uuid = "U" bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type = 0x83 + partition-type-uuid = "L" image = "rootfs.ext4" size = 512M }