From 0f72e01e055f79e84e876dd01c03f29abdbd531b Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 1 Feb 2022 00:24:55 +0300 Subject: [PATCH] board/orangepi/orangepi-zero-plus2: 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/2021478371 Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index aee9719ae4..5a7ee7707a 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -22,11 +22,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" } @@ -34,7 +34,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 = 256M }