From a8bca336cc785be144eb2c9b78825f82e96a25c4 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 23 Sep 2024 01:24:48 +0800 Subject: [PATCH 1/3] bootscript: rk3588-legacy: sync with boot-rockchip64.cmd --- config/bootscripts/boot-rk3588-legacy.cmd | 37 +++++++++++------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/config/bootscripts/boot-rk3588-legacy.cmd b/config/bootscripts/boot-rk3588-legacy.cmd index 0102f0d2b302..d65181e815b7 100644 --- a/config/bootscripts/boot-rk3588-legacy.cmd +++ b/config/bootscripts/boot-rk3588-legacy.cmd @@ -14,16 +14,13 @@ setenv rootfstype "ext4" setenv docker_optimizations "on" setenv earlycon "off" -echo "Boot script loaded from ${devtype} ${devnum}" +test -n "${distro_bootpart}" || distro_bootpart=1 -echo "Testing for existence ${devtype} ${devnum} ${prefix}armbianEnv.txt ..." -if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then - echo "Found ${devtype} ${devnum} ${prefix}armbianEnv.txt - loading ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt ..." - load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt - echo "Loaded environment from ${devtype} ${devnum} ${prefix}armbianEnv.txt into ${load_addr} filesize ${filesize}..." - echo "Importing into environment ..." +echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}" + +if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then + load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt env import -t ${load_addr} ${filesize} - echo "armbianEnv.txt imported into environment" fi if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi @@ -38,44 +35,44 @@ else fi # get PARTUUID of first partition on SD/eMMC the boot script was loaded from -if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi +if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}" if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi -load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd -load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image +load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd +load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image -load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} +load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile} fdt addr ${fdt_addr_r} fdt resize 65536 for overlay_file in ${overlays}; do - if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" - elif load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then + elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then echo "Applying kernel provided DT overlay ${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done for overlay_file in ${user_overlays}; do - if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then + if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then echo "Applying user provided DT overlay ${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done if test "${overlay_error}" = "true"; then echo "Error applying DT overlays, restoring original DT" - load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} + load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile} else - if test -e ${devtype} ${devnum} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then - load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr + if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then + load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" source ${load_addr} fi - if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then - load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr + if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then + load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr echo "Applying user provided fixup script (fixup.scr)" source ${load_addr} fi From cee38f962ef4d72180475a07906fd4f61c3e282a Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 23 Sep 2024 01:00:49 +0800 Subject: [PATCH 2/3] bootscript: rename boot-rk3588-legacy.cmd to boot-rk35xx.cmd --- .../bootscripts/{boot-rk3588-legacy.cmd => boot-rk35xx.cmd} | 0 config/sources/families/rockchip-rk3588.conf | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename config/bootscripts/{boot-rk3588-legacy.cmd => boot-rk35xx.cmd} (100%) diff --git a/config/bootscripts/boot-rk3588-legacy.cmd b/config/bootscripts/boot-rk35xx.cmd similarity index 100% rename from config/bootscripts/boot-rk3588-legacy.cmd rename to config/bootscripts/boot-rk35xx.cmd diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 021f8641a7e9..f1d71f2ff51e 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -18,7 +18,7 @@ case $BRANCH in legacy) display_alert "WARNING: 'legacy' branch" "is deprecated and slated for removal. Please switch to another branch unless you know what you're doing :)" "wrn" - BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd' + BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd' BOOTDIR='u-boot-rockchip64' declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo @@ -29,7 +29,7 @@ case $BRANCH in ;; vendor) - BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd' + BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd' BOOTDIR='u-boot-rockchip64' declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo From 947241a22430923d2ce54e6e2b4d976ca94d2ffb Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 23 Sep 2024 01:02:39 +0800 Subject: [PATCH 3/3] rk35xx: use boot-rk35xx.cmd for overlay support --- config/sources/families/rk35xx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 9eb411907dd1..7b2ec33e248b 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -18,6 +18,7 @@ case $BRANCH in legacy) display_alert "WARNING: 'legacy' branch" "is deprecated and slated for removal. Please switch to another branch unless you know what you're doing :)" "wrn" + BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd' BOOTDIR='u-boot-rockchip64' declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo @@ -27,6 +28,7 @@ case $BRANCH in ;; vendor) + BOOTSCRIPT='boot-rk35xx.cmd:boot.cmd' BOOTDIR='u-boot-rockchip64' declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo