board/orangepi/orangepi-pc-plus: fix build after genimage update

ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type

To fix the first genimage error report, change 'partition-type' entries
to the appropriate 'partition-type-uuid'. Then genimage starts to
complain about overlaps:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

To fix the second genimage error report, update the size of bootloader
file. Do not reserve additional space for GPT partition table since
new genimage is able to keep track of it.

Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006300

Signed-off-by: Sergey Matyukevich <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg
index e730b380966757d211714258eb89be3fd1cac38b..3812d785d557ff7206fa2079eaf407f27f5a6642 100644 (file)
--- a/board/orangepi/orangepi-pc-plus/genimage.cfg
+++ b/board/orangepi/orangepi-pc-plus/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  = "F"
                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
        }