| Message ID | 20240522230808.14409-2-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip,1/4] rename root partition | expand |
Hi Trevor, On 5/23/24 1:08 AM, Trevor Woerner via lists.yoctoproject.org wrote: > Specify the root partition's type according to the Discoverable Partitions > Specification: > > 32-bit ARM: 69dad710-2ce4-4e3c-b16c-21a1d49abed3 > 64-bit ARM: B921B045-1DF0-41C3-AF44-4C6F280D3FAE > > Link: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > --- > conf/machine/include/rockchip-defaults.inc | 6 ++++++ > conf/machine/include/rockchip-wic.inc | 1 + > wic/rockchip.wks | 2 +- > 3 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc > index 2387eb909934..717085b1535c 100644 > --- a/conf/machine/include/rockchip-defaults.inc > +++ b/conf/machine/include/rockchip-defaults.inc > @@ -21,3 +21,9 @@ XSERVER = " \ > SERIAL_CONSOLES ?= "1500000;ttyS2" > RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" > RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" > + > +# Discoverable Partitions Specification (DPS) > +ROOT_DPS = "B921B045-1DF0-41C3-AF44-4C6F280D3FAE" The link you posted uses lowercase here as well, maybe match that? > +ROOT_DPS:rk3066 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" > +ROOT_DPS:rk3188 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" > +ROOT_DPS:rk3288 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" ROOT_DPS:arm = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" ROOT_DPS:aarch64 = "B921B045-1DF0-41C3-AF44-4C6F280D3FAE" So we don't have to maintain a list of aarch32 SoCs in there and also try to figure out while reading the file why those specific SoCs have this specific value instead. Note that arm OVERRIDES is part of TRANSLATED_TARGET_ARCH which is part of OVERRIDES. Otherwise, looks good to me. Cheers, Quentin
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 2387eb909934..717085b1535c 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -21,3 +21,9 @@ XSERVER = " \ SERIAL_CONSOLES ?= "1500000;ttyS2" RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" + +# Discoverable Partitions Specification (DPS) +ROOT_DPS = "B921B045-1DF0-41C3-AF44-4C6F280D3FAE" +ROOT_DPS:rk3066 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" +ROOT_DPS:rk3188 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" +ROOT_DPS:rk3288 = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index b5ee6e0c2724..dab61d83ed2c 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -19,6 +19,7 @@ RK_UBOOT_ENV:rk-u-boot-env = "${@ '--source rawcopy --sourceparams=file=u-boot.e WICVARS:append = " \ RK_UBOOT_ENV \ + ROOT_DPS \ SPL_BINARY \ UBOOT_SUFFIX \ " diff --git a/wic/rockchip.wks b/wic/rockchip.wks index e1d74d9983ab..cabdb6559550 100644 --- a/wic/rockchip.wks +++ b/wic/rockchip.wks @@ -26,6 +26,6 @@ part uboot_env --offset 8128s --fixed-size 32K --fstype=none --part-name uboo part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --part-name reserved2 part loader2 --offset 16384s --fixed-size 4096K --fstype=none --part-name loader2 --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" part atf --offset 24576s --fixed-size 4096K --fstype=none --part-name atf -part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs +part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs --part-type ${ROOT_DPS} bootloader --ptable gpt
Specify the root partition's type according to the Discoverable Partitions Specification: 32-bit ARM: 69dad710-2ce4-4e3c-b16c-21a1d49abed3 64-bit ARM: B921B045-1DF0-41C3-AF44-4C6F280D3FAE Link: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- conf/machine/include/rockchip-defaults.inc | 6 ++++++ conf/machine/include/rockchip-wic.inc | 1 + wic/rockchip.wks | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-)