| Message ID | 20240524023724.20109-2-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip,v2,1/3] rename root partition | expand |
On Thu 2024-05-23 @ 10:37:23 PM, Trevor Woerner 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> > --- > v2 changes: > - use lower-case for both partition identifiers (in code and in commit msg) > - use Arm overrides instead of MACHINE overrides to identify which identifiers > are used for which builds, this clarifies why the 2 identifiers are needed > --- > conf/machine/include/rockchip-defaults.inc | 4 ++++ > conf/machine/include/rockchip-wic.inc | 1 + > wic/rockchip.wks | 2 +- > 3 files changed, 6 insertions(+), 1 deletion(-) Applied to meta-rockchip, master branch.
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 2387eb909934..e33a25c07b5a 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -21,3 +21,7 @@ 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:arm = "69dad710-2ce4-4e3c-b16c-21a1d49abed3" +ROOT_DPS:aarch64 = "b921b045-1df0-41c3-af44-4c6f280d3fae" 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> --- v2 changes: - use lower-case for both partition identifiers (in code and in commit msg) - use Arm overrides instead of MACHINE overrides to identify which identifiers are used for which builds, this clarifies why the 2 identifiers are needed --- conf/machine/include/rockchip-defaults.inc | 4 ++++ conf/machine/include/rockchip-wic.inc | 1 + wic/rockchip.wks | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-)