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

configs/orangepi_r1_defconfig: change to GPT partitions for root=PARTLABEL support

Browse Source 
GPT provides partition labels, which can be used to tell the kernel to find
the rootfs based on it (root=PARTLABEL=rootfs) as a nicer/more extensible
solution than the MBR disk signature / PARTUUID.

When using GPT, the name of the partition in genimage.cfg is used as the
label for that partition.

The default GPT partition table location unfortunately conflicts with the
SPL location, so move the 16KB GPT table after it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[yann.morin.1998@free.fr: add the comment about 'rootfs']
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Korsgaard 2021-01-25 09:11:30 +01:00 committed by Yann E. MORIN
parent 8beee9309f
commit 38d04e6b13
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/orangepi/orangepi-r1/boot.cmd
View File

@ -1,6 +1,6 @@
setenv fdt_high ffffffff setenv fdt_high ffffffff
setenv bootargs console=ttyS0,115200 earlyprintk root=PARTUUID=feedc0de-02 rootwait setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait
fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb

10
board/orangepi/orangepi-r1/genimage.cfg
View File

@ -13,15 +13,17 @@ image boot.vfat {
image sdcard.img { image sdcard.img {
hdimage { hdimage {
# for root=PARTUUID=feedc0de-02 support # for root=PARTLABEL support
disk-signature = 0xfeedc0de gpt = true
# default GPT location conflicts with spl, move it after
gpt-location = 1M
} }
partition u-boot { partition u-boot {
in-partition-table = "no" in-partition-table = "no"
image = "u-boot-sunxi-with-spl.bin" image = "u-boot-sunxi-with-spl.bin"
offset = 8192 offset = 8192
size = 1040384 # 1MB - 8192 size = 1056768 # 1MB - 8192 + 16384 (GPT)
} }
partition boot { partition boot {
@ -30,6 +32,8 @@ image sdcard.img {
image = "boot.vfat" image = "boot.vfat"
} }
# 'rootfs' will be used as the partition label, used
# with root=PARTLABEL=rootfs kernel commadn line
partition rootfs { partition rootfs {
partition-type = 0x83 partition-type = 0x83
image = "rootfs.ext4" image = "rootfs.ext4"