mirror of
git://git.yoctoproject.org/meta-rockchip.git
synced 2025-07-05 05:04:47 +02:00
remove /boot partition
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
Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
This commit is contained in:
Trevor Woerner
parent
d19aa922c0
commit
3b51866f22
|
|
@ -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]}"
|
||||
|
|
|
|||
24
conf/machine/include/rockchip-extlinux.inc
Normal file
24
conf/machine/include/rockchip-extlinux.inc
Normal file
|
|
@ -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"
|
||||
|
|
@ -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 \
|
||||
"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
part reserved --offset 7680s --fixed-size 192K --fstype=none
|
||||
part reserved1 --offset 8064s --fixed-size 32K --fstype=none
|
||||
part uboot_env --offset 8128s --fixed-size 32K --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 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 / --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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user