NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

board/orangepi/orangepi-zero-plus2: fix build after genimage update

Browse Source 
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 <geomatsi@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Sergey Matyukevich 2022-02-01 00:24:55 +03:00 committed by Thomas Petazzoni
parent 755116460b
commit 0f72e01e05
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/orangepi/orangepi-zero-plus2/genimage.cfg
View File

@ -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
}