* [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors
@ 2024-02-19 17:48 Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype Trevor Woerner
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Trevor Woerner @ 2024-02-19 17:48 UTC (permalink / raw)
To: yocto
In WIC, size arguments can be optionally specified using one of a variety
of suffixes (e.g. K, M, G, etc.) thanks to sizetype(). One such suffix being
"s/S" for handling sector sizes which are assumed to be 512 bytes, rather than
the other size suffixes which are multiples of 1024 bytes.
Using the s/S sizetype allows the definition to match the documentation.
Unfortunately we can not use the s/S suffix for --fixed-size.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v3:
- new
---
wic/rockchip.wks | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index fac0b8f70112..804e84ceb316 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -5,8 +5,7 @@
# short-description: Create a disk image suitable for booting Rockchip from SD-card
# long-description: Creates a disk image partitioned using GPT, suitable for Rockchip
# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks. The following table uses 512 byte sectors:
+# See: https://opensource.rock-chips.com/wiki_Partitions
#
# Partition Start Sector Number of Sectors
# loader1 64 8000 (idbloader / U-Boot SPL)
@@ -17,12 +16,12 @@
# boot 32768 229376
# root 262144 - (suggested)
-part loader1 --offset 32 --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}"
-part reserved1 --offset 4032 --fixed-size 64K
-part reserved2 --offset 4096 --fixed-size 4096K
-part loader2 --offset 8192 --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
-part atf --offset 12288 --fixed-size 4096K
-part /boot --offset 16384 --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot"
+part loader1 --offset 64s --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}"
+part reserved1 --offset 8064s --fixed-size 64K
+part reserved2 --offset 8192s --fixed-size 4096K
+part loader2 --offset 16384s --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
+part atf --offset 24576s --fixed-size 4096K
+part /boot --offset 32768s --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot"
part / --source rootfs --fstype=ext4 --label root --use-uuid
bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init"
--
2.43.0.76.g1a87c842ece3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
@ 2024-02-19 17:48 ` Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions Trevor Woerner
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2024-02-19 17:48 UTC (permalink / raw)
To: yocto; +Cc: Quentin Schulz
If the wks file doesn't specify, the assumption is that each partition
contains a vfat-formatted filesystem. Most of the partitions in the
Rockchip layout don't have filesystems. Implicitly setting the fstype to
vfat causes wic to format the partitions. It doesn't make sense to format
the rawcopy partitions as vfat just to immediately overwrite them with
binaries, and it wastes time formatting partitions that won't ever be used
as filesystems.
Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v3:
- tweak to accommodate offsets specified in sectors
changes in v2:
- reword the commit message to add clarity
- add Quentin's tag
---
wic/rockchip.wks | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index 804e84ceb316..42b731ac47b2 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -16,12 +16,12 @@
# boot 32768 229376
# root 262144 - (suggested)
-part loader1 --offset 64s --fixed-size 4000K --source rawcopy --sourceparams="file=${SPL_BINARY}"
-part reserved1 --offset 8064s --fixed-size 64K
-part reserved2 --offset 8192s --fixed-size 4096K
-part loader2 --offset 16384s --fixed-size 4096K --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
-part atf --offset 24576s --fixed-size 4096K
-part /boot --offset 32768s --size 114688K --active --source bootimg-partition --fstype=vfat --label boot --use-uuid --sourceparams="loader=u-boot"
-part / --source rootfs --fstype=ext4 --label root --use-uuid
+part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
+part reserved1 --offset 8064s --fixed-size 64K --fstype=none
+part reserved2 --offset 8192s --fixed-size 4096K --fstype=none
+part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
+part atf --offset 24576s --fixed-size 4096K --fstype=none
+part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot"
+part / --fstype=ext4 --source rootfs --label root --use-uuid
bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init"
--
2.43.0.76.g1a87c842ece3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype Trevor Woerner
@ 2024-02-19 17:48 ` Trevor Woerner
2024-02-21 18:38 ` [yocto] " Quentin Schulz
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 4/5] remove /boot partition Trevor Woerner
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Trevor Woerner @ 2024-02-19 17:48 UTC (permalink / raw)
To: yocto; +Cc: Quentin Schulz
Rockchip defines the expected layout/map of the default storage device.
Fill out the wks description so it matches.
https://opensource.rock-chips.com/wiki_Partitions
There are 2 partitions at the start that can not be specified in
rockchip.wks due to a limitation in wic which assumes all sizes (e.g.
--size or --fixed-size) are specified in units of 1024 bytes. Due to the
fact these partitions don't fall on 1024-byte boundaries, they can not be
specified at this time.
Note: in the Rockchip layout, not all partitions are expected to show up
in the gpt partition table. This patch uses "--no-table" to only number the
partitions that are numbered in the Rockchip wiki, as well as to give these
partitions the partition numbers indicated in the wiki.
Note: there is a mistake in the Rockchip table (which I've copied verbatim
here in this commit message but corrected in rockchip.wks). Going by the
values of the "Start Sector", the size of the "reserved1" partition is
listed as being 2x its actual size/number of sectors.
Expected:
Partition Start Sector Number of Sectors Partition Size PartNum in GPT Requirements
MBR 0 00000000 1 00000001 512 0.5KB
Primary GPT 1 00000001 63 0000003F 32256 31.5KB
loader1 64 00000040 7104 00001bc0 4096000 2.5MB 1 preloader (miniloader or U-Boot SPL)
Vendor Storage 7168 00001c00 512 00000200 262144 256KB SN, MAC and etc.
Reserved Space 7680 00001e00 384 00000180 196608 192KB Not used
reserved1 8064 00001f80 128 00000080 65536 64KB legacy DRM key
U-Boot ENV 8128 00001fc0 64 00000040 32768 32KB
reserved2 8192 00002000 8192 00002000 4194304 4MB legacy parameter
loader2 16384 00004000 8192 00002000 4194304 4MB 2 U-Boot or UEFI
trust 24576 00006000 8192 00002000 4194304 4MB 3 trusted-os like ATF, OP-TEE
boot 32768 00008000 229376 00038000 117440512 112MB 4 kernel, dtb, extlinux.conf, ramdisk
rootfs 262144 00040000 - - - -MB 5 Linux system
Prior to this patch:
# fdisk -l /dev/mmcblk1
GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
The backup GPT table is not on the end of the device.
Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
Device Start End Sectors Size Type
/dev/mmcblk1p1 64 8063 8000 3.9M Microsoft basic data
/dev/mmcblk1p2 8064 8191 128 64K Microsoft basic data
/dev/mmcblk1p3 8192 16383 8192 4M Microsoft basic data
/dev/mmcblk1p4 16384 24575 8192 4M Microsoft basic data
/dev/mmcblk1p5 24576 32767 8192 4M Microsoft basic data
/dev/mmcblk1p6 32768 330955 298188 145.6M Microsoft basic data
/dev/mmcblk1p7 330956 1504693 1173738 573.1M Linux filesystem
New:
# fdisk -l /dev/mmcblk1
GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
The backup GPT table is not on the end of the device.
Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
Device Start End Sectors Size Type
/dev/mmcblk1p1 64 7167 7104 3.5M Linux filesystem
/dev/mmcblk1p2 16384 24575 8192 4M Linux filesystem
/dev/mmcblk1p3 24576 32767 8192 4M Linux filesystem
/dev/mmcblk1p4 32768 330955 298188 145.6M Microsoft basic data
/dev/mmcblk1p5 330956 1504693 1173738 573.1M Linux filesystem
Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v3:
- tweaked to accommodate offsets specified in sectors
- clarified that the first 2 partitions can not be added
- change name of vstorage to v_storage
- fixed typo (ATR -> ATF)
- added Quentin's tag
changes in v2:
- expand the commit message to show past, expected, and new behaviour
- spell out that vstorage stands for "vendor storage"
---
wic/rockchip.wks | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index 42b731ac47b2..b557f8137af1 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -8,17 +8,23 @@
# See: https://opensource.rock-chips.com/wiki_Partitions
#
# Partition Start Sector Number of Sectors
-# loader1 64 8000 (idbloader / U-Boot SPL)
-# reserved1 8064 128
-# reserved2 8192 8192
+# loader1 64 7104 (idbloader / U-Boot SPL)
+# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc)
+# reserved 7680 384 (not used)
+# reserved1 8064 64 (legacy DRM key)
+# uboot_env 8128 64 (U-Boo environment)
+# reserved2 8192 8192 (legacy parameters, ATAGS, etc)
# loader2 16384 8192 (U-Boot proper)
-# atf 24576 8192
+# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
# boot 32768 229376
# root 262144 - (suggested)
-part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
-part reserved1 --offset 8064s --fixed-size 64K --fstype=none
-part reserved2 --offset 8192s --fixed-size 4096K --fstype=none
+part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
+part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
+part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
+part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
+part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
+part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
part atf --offset 24576s --fixed-size 4096K --fstype=none
part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot"
--
2.43.0.76.g1a87c842ece3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-rockchip][PATCH v3 4/5] remove /boot partition
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions Trevor Woerner
@ 2024-02-19 17:48 ` Trevor Woerner
2024-02-21 18:43 ` [yocto] " Quentin Schulz
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 5/5] rockchip.wks: wks file cleanup Trevor Woerner
2024-02-21 18:32 ` [yocto] [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Quentin Schulz
4 siblings, 1 reply; 10+ messages in thread
From: Trevor Woerner @ 2024-02-19 17:48 UTC (permalink / raw)
To: yocto
In order to boot successfully, most Rockchip SoCs require a specific
partitioning scheme which was defined many years (and many SoCs) ago. That
partitioning scheme places the SPL and U-Boot at specific offsets at the
start of the boot block device:
https://opensource.rock-chips.com/wiki_Partitions
The Rockchip partitioning scheme goes on to also define the locations
of a number of additional partitions, including the "boot" and "root"
partitions.
Since both the SPL and U-Boot have already been placed on the block device,
the "boot" partition only contains the extlinux config file and the
kernel+dtb/fitImage; it doesn't contain any bootloader artifacts (other
than the extlinux config).
The location of the SPL partition is a hard dependency since the BOOTROM
etched inside the Rockchip SoCs is programmed to load and run a validated
binary it finds at this location. The locations of the "boot" and "root"
partitions are not so rigid since it is U-Boot which interacts with them.
U-Boot is very flexible with how it finds boot components, and in its
support for various devices, filesystems, sizes, etc.
Both oe-core's U-Boot metadata and wic's bootimg-partition script contain
logic to generate the extlinux pieces required for a bootloader to boot
a Linux system. If both are enabled, the wic pieces silently clobber the
U-Boot pieces. However, the mechanisms contained in the U-Boot metadata are
much more flexible, from a user's point of view, than the mechanisms in
wic's bootimg-partition.
If a user wishes to setup some sort of A/B redundant update mechanism, they
must have redundant root partitions (in order to update their filesystem
contents) but they also need to have redundant boot partitions if they
wish to update the kernel as part of their update mechanism. Pairing
redundant kernel partitions with redundant filesystem partitions becomes
unnecessarily complicated. Therefore it makes sense to combine the kernel
and the filesystem into the same partition so that both the kernel and
filesystem are updated, or rolled back, in lock-step as one unit. Specific
kernel versions and configurations often have dependencies on user-space
components and versions.
The /boot location is not going away. This patch simply transfers
responsibility for its creation to the more flexible U-Boot mechanism
and includes the kernel as part of the same partition as the root
filesystem. Not only does it add flexibility, it also makes update schemes
more straightforward. Although having a separate /boot partition is a
"requirement" of the Rockchip partitioning scheme, it is not an actual
hard requirement when using a flexible, open-source bootloader (such as
U-Boot) instead of using Rockchip's proprietary miniloader, preloader, and
trust.img.
Build-tested for all boards.
Run-tested on:
nanopi-m4-2gb, nanopi-m4b, nanopi-r2s, nanopi-r4s, roc-rk3328-cc,
rock-3a, rock-5a, rock-5b, rock-pi-4b, rock-pi-e, rock-pi-s,
rock64
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v3:
- add back the comment explaining the need for NONFITDT
- change the inclusion of the u-boot-extlinux package from RRECOMMENDS
to RDEPENDS
- clarify the commit message to remove the un-true statement that sizes
are hard requirements
- add back the "--ptable gpt" line to rockchip.wks
changes in v2:
- add UBOOT_EXTLINUX_FDT and tweak UBOOT_EXTLINUX_FDTDIR to modify their
behaviour based on whether or not KERNEL_IMAGETYPE is fitImage
- remove extraneous WKS_FILE_DEPENDS
- remove "--ptable gpt" from wks
- move newly added "earlycon" to UBOOT_EXTLINUX_CONSOLE
- re-word the commit message to better explain the behaviour of the
Rockchip BootROM
---
conf/machine/include/rockchip-defaults.inc | 2 ++
conf/machine/include/rockchip-extlinux.inc | 24 ++++++++++++++++++++++
conf/machine/include/rockchip-wic.inc | 20 ++----------------
wic/rockchip.wks | 12 +++++------
4 files changed, 33 insertions(+), 25 deletions(-)
create mode 100644 conf/machine/include/rockchip-extlinux.inc
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
index 3ce2e246ab0b..2387eb909934 100644
--- a/conf/machine/include/rockchip-defaults.inc
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -19,3 +19,5 @@ XSERVER = " \
# misc
SERIAL_CONSOLES ?= "1500000;ttyS2"
+RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}"
+RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}"
diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc
new file mode 100644
index 000000000000..ca33f4c7f42a
--- /dev/null
+++ b/conf/machine/include/rockchip-extlinux.inc
@@ -0,0 +1,24 @@
+# KERNEL_DEVICETREE follows the pattern of
+# 'rockchip/${SOC_FAMILY}-${BOARD}.dtb' which is required when compiling
+# the kernel so the kernel's Makefile can find the device tree
+#
+# when using extlinux with a fitImage the device tree is contained in the
+# fitImage
+#
+# however for non-fitImages it is not found at
+# $UBOOT_EXTLINUX_FDTDIR/rockchip/$KERNEL_DEVICETREE but rather at
+# $UBOOT_EXTLINUX_FDTDIR/$KERNEL_DEVICETREE therefore we need to strip off
+# the 'rockchip/' part for extlinux non-fitImage builds
+NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}"
+
+UBOOT_EXTLINUX ?= "1"
+UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=root"
+UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}"
+UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)}"
+UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8"
+UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4"
+UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}"
+UBOOT_EXTLINUX_LABELS ?= "default"
+UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux"
diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc
index 67a8310f7d6a..147a36685d7d 100644
--- a/conf/machine/include/rockchip-wic.inc
+++ b/conf/machine/include/rockchip-wic.inc
@@ -1,33 +1,17 @@
# common meta-rockchip wic/wks items
+require conf/machine/include/rockchip-extlinux.inc
+
SPL_BINARY ?= "idbloader.img"
IMAGE_FSTYPES += "wic wic.bmap"
WKS_FILE ?= "rockchip.wks"
WKS_FILE_DEPENDS ?= " \
- mtools-native \
- dosfstools-native \
e2fsprogs-native \
virtual/bootloader \
- virtual/kernel \
- "
-# KERNEL_DEVICETREE follows the pattern of 'rockchip/${SOC_FAMILY}-${BOARD}.dtb'
-# but is placed in the deploy directory as simply '${SOC_FAMILY}-${BOARD}.dtb'
-# therefore we have to strip off the 'rockchip/' for IMAGE_BOOT_FILES
-NONFITDT="${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}"
-IMAGE_BOOT_FILES = " \
- ${KERNEL_IMAGETYPE} \
- ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)} \
"
-# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
-# for the console parameter in the wks files
-RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}"
-RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}"
-
WICVARS:append = " \
- RK_CONSOLE_BAUD \
- RK_CONSOLE_DEVICE \
SPL_BINARY \
UBOOT_SUFFIX \
"
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index b557f8137af1..e8f0251272c1 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -16,18 +16,16 @@
# reserved2 8192 8192 (legacy parameters, ATAGS, etc)
# loader2 16384 8192 (U-Boot proper)
# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
-# boot 32768 229376
-# root 262144 - (suggested)
+# root 32768 -
-part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
+part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
-part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
+part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
part atf --offset 24576s --fixed-size 4096K --fstype=none
-part /boot --offset 32768s --size 114688K --fstype=vfat --active --source bootimg-partition --label boot --use-uuid --sourceparams="loader=u-boot"
-part / --fstype=ext4 --source rootfs --label root --use-uuid
+part / --offset 32768s --fstype=ext4 --active --source rootfs --label root
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw rootfstype=ext4 init=/sbin/init"
+bootloader --ptable gpt
--
2.43.0.76.g1a87c842ece3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [meta-rockchip][PATCH v3 5/5] rockchip.wks: wks file cleanup
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
` (2 preceding siblings ...)
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 4/5] remove /boot partition Trevor Woerner
@ 2024-02-19 17:48 ` Trevor Woerner
2024-02-21 18:32 ` [yocto] [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Quentin Schulz
4 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2024-02-19 17:48 UTC (permalink / raw)
To: yocto; +Cc: Quentin Schulz
Cleanup the elements of the wic/rockchip.wks file so that they take up less
horizontal space.
Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v3:
- tweaks to accommodate the existing changes
changes in v2:
- add Quentin's tag
---
wic/rockchip.wks | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index e8f0251272c1..0e929bc0749a 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -18,14 +18,14 @@
# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
# root 32768 -
-part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
-part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
-part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
-part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
-part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
-part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
-part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
-part atf --offset 24576s --fixed-size 4096K --fstype=none
-part / --offset 32768s --fstype=ext4 --active --source rootfs --label root
+part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
+part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
+part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
+part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
+part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
+part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
+part loader2 --offset 16384s --fixed-size 4096K --fstype=none --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
+part atf --offset 24576s --fixed-size 4096K --fstype=none
+part / --label root --active --fstype=ext4 --source rootfs
bootloader --ptable gpt
--
2.43.0.76.g1a87c842ece3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [yocto] [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
` (3 preceding siblings ...)
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 5/5] rockchip.wks: wks file cleanup Trevor Woerner
@ 2024-02-21 18:32 ` Quentin Schulz
4 siblings, 0 replies; 10+ messages in thread
From: Quentin Schulz @ 2024-02-21 18:32 UTC (permalink / raw)
To: yocto, twoerner
Hi Trevor,
On 2/19/24 18:48, Trevor Woerner via lists.yoctoproject.org wrote:
> In WIC, size arguments can be optionally specified using one of a variety
> of suffixes (e.g. K, M, G, etc.) thanks to sizetype(). One such suffix being
> "s/S" for handling sector sizes which are assumed to be 512 bytes, rather than
> the other size suffixes which are multiples of 1024 bytes.
>
> Using the s/S sizetype allows the definition to match the documentation.
> Unfortunately we can not use the s/S suffix for --fixed-size.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Thanks,
Quentin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [yocto] [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions Trevor Woerner
@ 2024-02-21 18:38 ` Quentin Schulz
2024-02-21 19:02 ` Trevor Woerner
0 siblings, 1 reply; 10+ messages in thread
From: Quentin Schulz @ 2024-02-21 18:38 UTC (permalink / raw)
To: yocto, twoerner; +Cc: Quentin Schulz
Hi Trevor,
On 2/19/24 18:48, Trevor Woerner via lists.yoctoproject.org wrote:
> Rockchip defines the expected layout/map of the default storage device.
> Fill out the wks description so it matches.
>
> https://opensource.rock-chips.com/wiki_Partitions
>
> There are 2 partitions at the start that can not be specified in
> rockchip.wks due to a limitation in wic which assumes all sizes (e.g.
> --size or --fixed-size) are specified in units of 1024 bytes. Due to the
> fact these partitions don't fall on 1024-byte boundaries, they can not be
> specified at this time.
>
> Note: in the Rockchip layout, not all partitions are expected to show up
> in the gpt partition table. This patch uses "--no-table" to only number the
> partitions that are numbered in the Rockchip wiki, as well as to give these
> partitions the partition numbers indicated in the wiki.
>
> Note: there is a mistake in the Rockchip table (which I've copied verbatim
> here in this commit message but corrected in rockchip.wks). Going by the
> values of the "Start Sector", the size of the "reserved1" partition is
> listed as being 2x its actual size/number of sectors.
>
> Expected:
> Partition Start Sector Number of Sectors Partition Size PartNum in GPT Requirements
> MBR 0 00000000 1 00000001 512 0.5KB
> Primary GPT 1 00000001 63 0000003F 32256 31.5KB
> loader1 64 00000040 7104 00001bc0 4096000 2.5MB 1 preloader (miniloader or U-Boot SPL)
> Vendor Storage 7168 00001c00 512 00000200 262144 256KB SN, MAC and etc.
> Reserved Space 7680 00001e00 384 00000180 196608 192KB Not used
> reserved1 8064 00001f80 128 00000080 65536 64KB legacy DRM key
> U-Boot ENV 8128 00001fc0 64 00000040 32768 32KB
> reserved2 8192 00002000 8192 00002000 4194304 4MB legacy parameter
> loader2 16384 00004000 8192 00002000 4194304 4MB 2 U-Boot or UEFI
> trust 24576 00006000 8192 00002000 4194304 4MB 3 trusted-os like ATF, OP-TEE
> boot 32768 00008000 229376 00038000 117440512 112MB 4 kernel, dtb, extlinux.conf, ramdisk
> rootfs 262144 00040000 - - - -MB 5 Linux system
>
> Prior to this patch:
> # fdisk -l /dev/mmcblk1
> GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
> The backup GPT table is not on the end of the device.
> Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
> Units: sectors of 1 * 512 = 512 bytes
> Sector size (logical/physical): 512 bytes / 512 bytes
> I/O size (minimum/optimal): 512 bytes / 512 bytes
> Disklabel type: gpt
> Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
>
> Device Start End Sectors Size Type
> /dev/mmcblk1p1 64 8063 8000 3.9M Microsoft basic data
> /dev/mmcblk1p2 8064 8191 128 64K Microsoft basic data
> /dev/mmcblk1p3 8192 16383 8192 4M Microsoft basic data
> /dev/mmcblk1p4 16384 24575 8192 4M Microsoft basic data
> /dev/mmcblk1p5 24576 32767 8192 4M Microsoft basic data
> /dev/mmcblk1p6 32768 330955 298188 145.6M Microsoft basic data
> /dev/mmcblk1p7 330956 1504693 1173738 573.1M Linux filesystem
>
> New:
> # fdisk -l /dev/mmcblk1
> GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
> The backup GPT table is not on the end of the device.
> Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
> Units: sectors of 1 * 512 = 512 bytes
> Sector size (logical/physical): 512 bytes / 512 bytes
> I/O size (minimum/optimal): 512 bytes / 512 bytes
> Disklabel type: gpt
> Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
>
> Device Start End Sectors Size Type
> /dev/mmcblk1p1 64 7167 7104 3.5M Linux filesystem
> /dev/mmcblk1p2 16384 24575 8192 4M Linux filesystem
> /dev/mmcblk1p3 24576 32767 8192 4M Linux filesystem
> /dev/mmcblk1p4 32768 330955 298188 145.6M Microsoft basic data
> /dev/mmcblk1p5 330956 1504693 1173738 573.1M Linux filesystem
>
> Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
> changes in v3:
> - tweaked to accommodate offsets specified in sectors
> - clarified that the first 2 partitions can not be added
> - change name of vstorage to v_storage
> - fixed typo (ATR -> ATF)
> - added Quentin's tag
>
> changes in v2:
> - expand the commit message to show past, expected, and new behaviour
> - spell out that vstorage stands for "vendor storage"
> ---
> wic/rockchip.wks | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/wic/rockchip.wks b/wic/rockchip.wks
> index 42b731ac47b2..b557f8137af1 100644
> --- a/wic/rockchip.wks
> +++ b/wic/rockchip.wks
> @@ -8,17 +8,23 @@
> # See: https://opensource.rock-chips.com/wiki_Partitions
> #
> # Partition Start Sector Number of Sectors
> -# loader1 64 8000 (idbloader / U-Boot SPL)
> -# reserved1 8064 128
> -# reserved2 8192 8192
> +# loader1 64 7104 (idbloader / U-Boot SPL)
> +# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc)
> +# reserved 7680 384 (not used)
> +# reserved1 8064 64 (legacy DRM key)
> +# uboot_env 8128 64 (U-Boo environment)
> +# reserved2 8192 8192 (legacy parameters, ATAGS, etc)
> # loader2 16384 8192 (U-Boot proper)
> -# atf 24576 8192
> +# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
> # boot 32768 229376
> # root 262144 - (suggested)
>
> -part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
> -part reserved1 --offset 8064s --fixed-size 64K --fstype=none
> -part reserved2 --offset 8192s --fixed-size 4096K --fstype=none
> +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
> +part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
> +part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
> +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
I would have kept this one and...
> +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
> +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
this one in the table to keep the offsets identical before and after
this patch is applied.
If you don't care about this, then I strongly suggest to have uboot_env
actually a partition (and maybe v_storage as well), those partitions are
the only ones among the one removed now that would make some sense to me
to expose to the user.
Cheers,
Quentin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [yocto] [meta-rockchip][PATCH v3 4/5] remove /boot partition
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 4/5] remove /boot partition Trevor Woerner
@ 2024-02-21 18:43 ` Quentin Schulz
0 siblings, 0 replies; 10+ messages in thread
From: Quentin Schulz @ 2024-02-21 18:43 UTC (permalink / raw)
To: yocto, twoerner
Hi Trevor,
On 2/19/24 18:48, Trevor Woerner via lists.yoctoproject.org wrote:
> In order to boot successfully, most Rockchip SoCs require a specific
> partitioning scheme which was defined many years (and many SoCs) ago. That
> partitioning scheme places the SPL and U-Boot at specific offsets at the
> start of the boot block device:
>
> https://opensource.rock-chips.com/wiki_Partitions
>
> The Rockchip partitioning scheme goes on to also define the locations
> of a number of additional partitions, including the "boot" and "root"
> partitions.
>
> Since both the SPL and U-Boot have already been placed on the block device,
> the "boot" partition only contains the extlinux config file and the
> kernel+dtb/fitImage; it doesn't contain any bootloader artifacts (other
> than the extlinux config).
>
> The location of the SPL partition is a hard dependency since the BOOTROM
> etched inside the Rockchip SoCs is programmed to load and run a validated
> binary it finds at this location. The locations of the "boot" and "root"
> partitions are not so rigid since it is U-Boot which interacts with them.
> U-Boot is very flexible with how it finds boot components, and in its
> support for various devices, filesystems, sizes, etc.
>
> Both oe-core's U-Boot metadata and wic's bootimg-partition script contain
> logic to generate the extlinux pieces required for a bootloader to boot
> a Linux system. If both are enabled, the wic pieces silently clobber the
> U-Boot pieces. However, the mechanisms contained in the U-Boot metadata are
> much more flexible, from a user's point of view, than the mechanisms in
> wic's bootimg-partition.
>
> If a user wishes to setup some sort of A/B redundant update mechanism, they
> must have redundant root partitions (in order to update their filesystem
> contents) but they also need to have redundant boot partitions if they
> wish to update the kernel as part of their update mechanism. Pairing
> redundant kernel partitions with redundant filesystem partitions becomes
> unnecessarily complicated. Therefore it makes sense to combine the kernel
> and the filesystem into the same partition so that both the kernel and
> filesystem are updated, or rolled back, in lock-step as one unit. Specific
> kernel versions and configurations often have dependencies on user-space
> components and versions.
>
> The /boot location is not going away. This patch simply transfers
> responsibility for its creation to the more flexible U-Boot mechanism
> and includes the kernel as part of the same partition as the root
> filesystem. Not only does it add flexibility, it also makes update schemes
> more straightforward. Although having a separate /boot partition is a
> "requirement" of the Rockchip partitioning scheme, it is not an actual
> hard requirement when using a flexible, open-source bootloader (such as
> U-Boot) instead of using Rockchip's proprietary miniloader, preloader, and
> trust.img.
>
> Build-tested for all boards.
> Run-tested on:
> nanopi-m4-2gb, nanopi-m4b, nanopi-r2s, nanopi-r4s, roc-rk3328-cc,
> rock-3a, rock-5a, rock-5b, rock-pi-4b, rock-pi-e, rock-pi-s,
> rock64
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Thanks,
Quentin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [yocto] [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions
2024-02-21 18:38 ` [yocto] " Quentin Schulz
@ 2024-02-21 19:02 ` Trevor Woerner
2024-02-22 9:30 ` Quentin Schulz
0 siblings, 1 reply; 10+ messages in thread
From: Trevor Woerner @ 2024-02-21 19:02 UTC (permalink / raw)
To: Quentin Schulz; +Cc: yocto, Quentin Schulz
On Wed 2024-02-21 @ 07:38:41 PM, Quentin Schulz wrote:
> Hi Trevor,
>
> On 2/19/24 18:48, Trevor Woerner via lists.yoctoproject.org wrote:
> > Rockchip defines the expected layout/map of the default storage device.
> > Fill out the wks description so it matches.
> >
> > https://opensource.rock-chips.com/wiki_Partitions
> >
> > There are 2 partitions at the start that can not be specified in
> > rockchip.wks due to a limitation in wic which assumes all sizes (e.g.
> > --size or --fixed-size) are specified in units of 1024 bytes. Due to the
> > fact these partitions don't fall on 1024-byte boundaries, they can not be
> > specified at this time.
> >
> > Note: in the Rockchip layout, not all partitions are expected to show up
> > in the gpt partition table. This patch uses "--no-table" to only number the
> > partitions that are numbered in the Rockchip wiki, as well as to give these
> > partitions the partition numbers indicated in the wiki.
> >
> > Note: there is a mistake in the Rockchip table (which I've copied verbatim
> > here in this commit message but corrected in rockchip.wks). Going by the
> > values of the "Start Sector", the size of the "reserved1" partition is
> > listed as being 2x its actual size/number of sectors.
> >
> > Expected:
> > Partition Start Sector Number of Sectors Partition Size PartNum in GPT Requirements
> > MBR 0 00000000 1 00000001 512 0.5KB
> > Primary GPT 1 00000001 63 0000003F 32256 31.5KB
> > loader1 64 00000040 7104 00001bc0 4096000 2.5MB 1 preloader (miniloader or U-Boot SPL)
> > Vendor Storage 7168 00001c00 512 00000200 262144 256KB SN, MAC and etc.
> > Reserved Space 7680 00001e00 384 00000180 196608 192KB Not used
> > reserved1 8064 00001f80 128 00000080 65536 64KB legacy DRM key
> > U-Boot ENV 8128 00001fc0 64 00000040 32768 32KB
> > reserved2 8192 00002000 8192 00002000 4194304 4MB legacy parameter
> > loader2 16384 00004000 8192 00002000 4194304 4MB 2 U-Boot or UEFI
> > trust 24576 00006000 8192 00002000 4194304 4MB 3 trusted-os like ATF, OP-TEE
> > boot 32768 00008000 229376 00038000 117440512 112MB 4 kernel, dtb, extlinux.conf, ramdisk
> > rootfs 262144 00040000 - - - -MB 5 Linux system
> >
> > Prior to this patch:
> > # fdisk -l /dev/mmcblk1
> > GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
> > The backup GPT table is not on the end of the device.
> > Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
> > Units: sectors of 1 * 512 = 512 bytes
> > Sector size (logical/physical): 512 bytes / 512 bytes
> > I/O size (minimum/optimal): 512 bytes / 512 bytes
> > Disklabel type: gpt
> > Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
> >
> > Device Start End Sectors Size Type
> > /dev/mmcblk1p1 64 8063 8000 3.9M Microsoft basic data
> > /dev/mmcblk1p2 8064 8191 128 64K Microsoft basic data
> > /dev/mmcblk1p3 8192 16383 8192 4M Microsoft basic data
> > /dev/mmcblk1p4 16384 24575 8192 4M Microsoft basic data
> > /dev/mmcblk1p5 24576 32767 8192 4M Microsoft basic data
> > /dev/mmcblk1p6 32768 330955 298188 145.6M Microsoft basic data
> > /dev/mmcblk1p7 330956 1504693 1173738 573.1M Linux filesystem
> >
> > New:
> > # fdisk -l /dev/mmcblk1
> > GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
> > The backup GPT table is not on the end of the device.
> > Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
> > Units: sectors of 1 * 512 = 512 bytes
> > Sector size (logical/physical): 512 bytes / 512 bytes
> > I/O size (minimum/optimal): 512 bytes / 512 bytes
> > Disklabel type: gpt
> > Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
> >
> > Device Start End Sectors Size Type
> > /dev/mmcblk1p1 64 7167 7104 3.5M Linux filesystem
> > /dev/mmcblk1p2 16384 24575 8192 4M Linux filesystem
> > /dev/mmcblk1p3 24576 32767 8192 4M Linux filesystem
> > /dev/mmcblk1p4 32768 330955 298188 145.6M Microsoft basic data
> > /dev/mmcblk1p5 330956 1504693 1173738 573.1M Linux filesystem
> >
> > Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > ---
> > changes in v3:
> > - tweaked to accommodate offsets specified in sectors
> > - clarified that the first 2 partitions can not be added
> > - change name of vstorage to v_storage
> > - fixed typo (ATR -> ATF)
> > - added Quentin's tag
> >
> > changes in v2:
> > - expand the commit message to show past, expected, and new behaviour
> > - spell out that vstorage stands for "vendor storage"
> > ---
> > wic/rockchip.wks | 20 +++++++++++++-------
> > 1 file changed, 13 insertions(+), 7 deletions(-)
> >
> > diff --git a/wic/rockchip.wks b/wic/rockchip.wks
> > index 42b731ac47b2..b557f8137af1 100644
> > --- a/wic/rockchip.wks
> > +++ b/wic/rockchip.wks
> > @@ -8,17 +8,23 @@
> > # See: https://opensource.rock-chips.com/wiki_Partitions
> > #
> > # Partition Start Sector Number of Sectors
> > -# loader1 64 8000 (idbloader / U-Boot SPL)
> > -# reserved1 8064 128
> > -# reserved2 8192 8192
> > +# loader1 64 7104 (idbloader / U-Boot SPL)
> > +# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc)
> > +# reserved 7680 384 (not used)
> > +# reserved1 8064 64 (legacy DRM key)
> > +# uboot_env 8128 64 (U-Boo environment)
> > +# reserved2 8192 8192 (legacy parameters, ATAGS, etc)
> > # loader2 16384 8192 (U-Boot proper)
> > -# atf 24576 8192
> > +# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
> > # boot 32768 229376
> > # root 262144 - (suggested)
> > -part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
> > -part reserved1 --offset 8064s --fixed-size 64K --fstype=none
> > -part reserved2 --offset 8192s --fixed-size 4096K --fstype=none
> > +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
> > +part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
> > +part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
> > +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
>
> I would have kept this one and...
>
> > +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
> > +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
>
> this one in the table to keep the offsets identical before and after this
> patch is applied.
>
> If you don't care about this, then I strongly suggest to have uboot_env
> actually a partition (and maybe v_storage as well), those partitions are the
> only ones among the one removed now that would make some sense to me to
> expose to the user.
My preference would be to make them all show up in the partition table. If
you're okay with that then I'm happy to spin a v4 to remove --no-table from
all entries that have it in v3.
The conundrum is whether or not to follow what Rockchip dictates in:
https://opensource.rock-chips.com/wiki_Partitions
By removing /boot I guess we're not going to be following what Rockchip says
anyway, so we might as well expose them all for maximum flexibility.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [yocto] [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions
2024-02-21 19:02 ` Trevor Woerner
@ 2024-02-22 9:30 ` Quentin Schulz
0 siblings, 0 replies; 10+ messages in thread
From: Quentin Schulz @ 2024-02-22 9:30 UTC (permalink / raw)
To: Trevor Woerner; +Cc: yocto, Quentin Schulz
Hi Trevor,
On 2/21/24 20:02, Trevor Woerner wrote:
> On Wed 2024-02-21 @ 07:38:41 PM, Quentin Schulz wrote:
>> Hi Trevor,
>>
>> On 2/19/24 18:48, Trevor Woerner via lists.yoctoproject.org wrote:
>>> Rockchip defines the expected layout/map of the default storage device.
>>> Fill out the wks description so it matches.
>>>
>>> https://opensource.rock-chips.com/wiki_Partitions
>>>
>>> There are 2 partitions at the start that can not be specified in
>>> rockchip.wks due to a limitation in wic which assumes all sizes (e.g.
>>> --size or --fixed-size) are specified in units of 1024 bytes. Due to the
>>> fact these partitions don't fall on 1024-byte boundaries, they can not be
>>> specified at this time.
>>>
>>> Note: in the Rockchip layout, not all partitions are expected to show up
>>> in the gpt partition table. This patch uses "--no-table" to only number the
>>> partitions that are numbered in the Rockchip wiki, as well as to give these
>>> partitions the partition numbers indicated in the wiki.
>>>
>>> Note: there is a mistake in the Rockchip table (which I've copied verbatim
>>> here in this commit message but corrected in rockchip.wks). Going by the
>>> values of the "Start Sector", the size of the "reserved1" partition is
>>> listed as being 2x its actual size/number of sectors.
>>>
>>> Expected:
>>> Partition Start Sector Number of Sectors Partition Size PartNum in GPT Requirements
>>> MBR 0 00000000 1 00000001 512 0.5KB
>>> Primary GPT 1 00000001 63 0000003F 32256 31.5KB
>>> loader1 64 00000040 7104 00001bc0 4096000 2.5MB 1 preloader (miniloader or U-Boot SPL)
>>> Vendor Storage 7168 00001c00 512 00000200 262144 256KB SN, MAC and etc.
>>> Reserved Space 7680 00001e00 384 00000180 196608 192KB Not used
>>> reserved1 8064 00001f80 128 00000080 65536 64KB legacy DRM key
>>> U-Boot ENV 8128 00001fc0 64 00000040 32768 32KB
>>> reserved2 8192 00002000 8192 00002000 4194304 4MB legacy parameter
>>> loader2 16384 00004000 8192 00002000 4194304 4MB 2 U-Boot or UEFI
>>> trust 24576 00006000 8192 00002000 4194304 4MB 3 trusted-os like ATF, OP-TEE
>>> boot 32768 00008000 229376 00038000 117440512 112MB 4 kernel, dtb, extlinux.conf, ramdisk
>>> rootfs 262144 00040000 - - - -MB 5 Linux system
>>>
>>> Prior to this patch:
>>> # fdisk -l /dev/mmcblk1
>>> GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
>>> The backup GPT table is not on the end of the device.
>>> Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
>>> Units: sectors of 1 * 512 = 512 bytes
>>> Sector size (logical/physical): 512 bytes / 512 bytes
>>> I/O size (minimum/optimal): 512 bytes / 512 bytes
>>> Disklabel type: gpt
>>> Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
>>>
>>> Device Start End Sectors Size Type
>>> /dev/mmcblk1p1 64 8063 8000 3.9M Microsoft basic data
>>> /dev/mmcblk1p2 8064 8191 128 64K Microsoft basic data
>>> /dev/mmcblk1p3 8192 16383 8192 4M Microsoft basic data
>>> /dev/mmcblk1p4 16384 24575 8192 4M Microsoft basic data
>>> /dev/mmcblk1p5 24576 32767 8192 4M Microsoft basic data
>>> /dev/mmcblk1p6 32768 330955 298188 145.6M Microsoft basic data
>>> /dev/mmcblk1p7 330956 1504693 1173738 573.1M Linux filesystem
>>>
>>> New:
>>> # fdisk -l /dev/mmcblk1
>>> GPT PMBR size mismatch (1504727 != 30375935) will be corrected by write.
>>> The backup GPT table is not on the end of the device.
>>> Disk /dev/mmcblk1: 14.48 GiB, 15552479232 bytes, 30375936 sectors
>>> Units: sectors of 1 * 512 = 512 bytes
>>> Sector size (logical/physical): 512 bytes / 512 bytes
>>> I/O size (minimum/optimal): 512 bytes / 512 bytes
>>> Disklabel type: gpt
>>> Disk identifier: 00000000-0000-0000-0000-00004D9B9EF0
>>>
>>> Device Start End Sectors Size Type
>>> /dev/mmcblk1p1 64 7167 7104 3.5M Linux filesystem
>>> /dev/mmcblk1p2 16384 24575 8192 4M Linux filesystem
>>> /dev/mmcblk1p3 24576 32767 8192 4M Linux filesystem
>>> /dev/mmcblk1p4 32768 330955 298188 145.6M Microsoft basic data
>>> /dev/mmcblk1p5 330956 1504693 1173738 573.1M Linux filesystem
>>>
>>> Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
>>> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
>>> ---
>>> changes in v3:
>>> - tweaked to accommodate offsets specified in sectors
>>> - clarified that the first 2 partitions can not be added
>>> - change name of vstorage to v_storage
>>> - fixed typo (ATR -> ATF)
>>> - added Quentin's tag
>>>
>>> changes in v2:
>>> - expand the commit message to show past, expected, and new behaviour
>>> - spell out that vstorage stands for "vendor storage"
>>> ---
>>> wic/rockchip.wks | 20 +++++++++++++-------
>>> 1 file changed, 13 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/wic/rockchip.wks b/wic/rockchip.wks
>>> index 42b731ac47b2..b557f8137af1 100644
>>> --- a/wic/rockchip.wks
>>> +++ b/wic/rockchip.wks
>>> @@ -8,17 +8,23 @@
>>> # See: https://opensource.rock-chips.com/wiki_Partitions
>>> #
>>> # Partition Start Sector Number of Sectors
>>> -# loader1 64 8000 (idbloader / U-Boot SPL)
>>> -# reserved1 8064 128
>>> -# reserved2 8192 8192
>>> +# loader1 64 7104 (idbloader / U-Boot SPL)
>>> +# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc)
>>> +# reserved 7680 384 (not used)
>>> +# reserved1 8064 64 (legacy DRM key)
>>> +# uboot_env 8128 64 (U-Boo environment)
>>> +# reserved2 8192 8192 (legacy parameters, ATAGS, etc)
>>> # loader2 16384 8192 (U-Boot proper)
>>> -# atf 24576 8192
>>> +# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc)
>>> # boot 32768 229376
>>> # root 262144 - (suggested)
>>> -part loader1 --offset 64s --fixed-size 4000K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
>>> -part reserved1 --offset 8064s --fixed-size 64K --fstype=none
>>> -part reserved2 --offset 8192s --fixed-size 4096K --fstype=none
>>> +part loader1 --offset 64s --fixed-size 3552K --fstype=none --source rawcopy --sourceparams="file=${SPL_BINARY}"
>>> +part v_storage --offset 7168s --fixed-size 256K --fstype=none --no-table
>>> +part reserved --offset 7680s --fixed-size 192K --fstype=none --no-table
>>> +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --no-table
>>
>> I would have kept this one and...
>>
>>> +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --no-table
>>> +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --no-table
>>
>> this one in the table to keep the offsets identical before and after this
>> patch is applied.
>>
>> If you don't care about this, then I strongly suggest to have uboot_env
>> actually a partition (and maybe v_storage as well), those partitions are the
>> only ones among the one removed now that would make some sense to me to
>> expose to the user.
>
> My preference would be to make them all show up in the partition table. If
> you're okay with that then I'm happy to spin a v4 to remove --no-table from
> all entries that have it in v3.
>
> The conundrum is whether or not to follow what Rockchip dictates in:
> https://opensource.rock-chips.com/wiki_Partitions
>
> By removing /boot I guess we're not going to be following what Rockchip says
> anyway, so we might as well expose them all for maximum flexibility.
My preference is keep the current numbering and meaning of those
numbers.... However since you'll remove the /boot partition in a later
patch, I guess this isn't that much of a valid concern anymore for this
patch.
Quentin
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-02-22 9:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19 17:48 [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 2/5] rockchip.wks: specify fstype Trevor Woerner
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 3/5] rockchip.wks: add most Rockchip partitions Trevor Woerner
2024-02-21 18:38 ` [yocto] " Quentin Schulz
2024-02-21 19:02 ` Trevor Woerner
2024-02-22 9:30 ` Quentin Schulz
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 4/5] remove /boot partition Trevor Woerner
2024-02-21 18:43 ` [yocto] " Quentin Schulz
2024-02-19 17:48 ` [meta-rockchip][PATCH v3 5/5] rockchip.wks: wks file cleanup Trevor Woerner
2024-02-21 18:32 ` [yocto] [meta-rockchip][PATCH v3 1/5] rockchip.wks: specify offsets in sectors Quentin Schulz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.