rock-s0/rockpi-s: use BOOT_SCENARIO=binman; move blobs to armbi…

…an/rkbin - Move rk3308 boot blobs to armbian/rkbin - delete obsolete ones - Alter rock-s0 and rockpi-s to use the new "binman" BOOT_SCENARIO Co-authored-by: Ricardo Pardini <[email protected]> (shellfmt; small fixes; squashes)
armbian · Nov 22, 2024 · b162924 · b162924
1 parent e18f634
commit b162924
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 66 deletions.
diff --git a/config/boards/rock-s0.conf b/config/boards/rock-s0.conf
@@ -1,13 +1,32 @@
 # Rockchip RK3308 quad core 512MB SoC WiFi
 # https://radxa.com/products/rocks/s0
 
-# This board is very similar to the older RockPi-S model
-source "${SRC}/config/boards/rockpi-s.conf"
-
 BOARD_NAME="Rock S0"
-BOARD_MAINTAINER="brentr"
-BOARDFAMILY="rockchip64"
-BOOTCONFIG="rock-s0-rk3308_defconfig"
-BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+BOARDFAMILY=rockchip64
+BOARD_MAINTAINER=brentr
+
+BOOTCONFIG=rock-s0-rk3308_defconfig
+BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb
+
+KERNEL_TARGET=current,edge
+KERNEL_TEST_TARGET=current
+
+DEFAULT_CONSOLE=serial
+SERIALCON=ttyS0
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+HAS_VIDEO_OUTPUT=no
+
+BOOTBRANCH_BOARD=tag:v2024.10
+BOOTPATCHDIR=v2024.10
+BOOT_SCENARIO=binman
+DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
+
+OVERLAY_PREFIX=rk3308
+
+function post_family_config__rocks0() {
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
+
+	unset family_tweaks_bsp # disable from rockchip64_common
+}
diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf
@@ -1,74 +1,42 @@
 # Rockchip RK3308 quad core 256-512MB SoC WiFi
-# https://radaxa.com/products/rockpi/pis
-BOARD_NAME="Rockpi S"
-BOARDFAMILY="rockchip64"
-BOARD_MAINTAINER="brentr"
-BOOTCONFIG="rock-pi-s-rk3308_defconfig"
-BOOT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
-
-DEFAULT_CONSOLE="serial"
-SERIALCON="ttyS0"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
-HAS_VIDEO_OUTPUT="no"
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
-
-OVERLAY_PREFIX='rk3308'
-
-#comment out line below for an image that will NOT boot from the built-in SDNAND
-IDBLOADER_BLOB=$SRC/packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin
-
-#The SDNAND capabilty IDBLOADER_BLOB requires the U-Boot and Linux serial console on UART0
-#Linux will hang on reboot if the console remains on UART2
+# https://radxa.com/products/rockpi/pis
 
-#Note:  IDBLOADER_BLOB is derived from
-#  https://dl.radxa.com/rockpis/images/loader/rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
-#by using the rkdeveloptool to "upgrade" the previous DDR_BLOB loader on the SDNAND
-#To recreate it, build the image with IDBLOADER_BLOB unset and boot Rock PI-S in MASKROM mode
-#On your host (connected to the RockPi-S's USB-C port):
-#  rdeveloptool db rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
-#  rdeveloptool wl 0 newly_built_image.img
-#  rdeveloptool ul rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin  #this writes 280 sectors
+BOARD_NAME="Rockpi S"
+BOARDFAMILY=rockchip64
+BOARD_MAINTAINER=brentr
 
-#Then, reset the RockPi-S to boot from SDNAND.  Using that running image:
-#  dd if=/dev/mmcblk0 of=rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin skip=64 count=280
+BOOTCONFIG=rock-pi-s-rk3308_defconfig
+BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb
 
-function post_family_config___uboot_config() {
+KERNEL_TARGET=current,edge
+KERNEL_TEST_TARGET=current
 
-	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
-	unset uboot_custom_postprocess family_tweaks_bsp # disable stuff from rockchip64_common
+DEFAULT_CONSOLE=serial
+SERIALCON=ttyS0
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+HAS_VIDEO_OUTPUT=no
 
-	BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
+BOOTBRANCH_BOARD=tag:v2024.10
+BOOTPATCHDIR=v2024.10
+BOOT_SCENARIO=binman
+DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
 
-	uboot_custom_postprocess() {
+OVERLAY_PREFIX=rk3308
 
-		# TODO: remove this diversion from common caused by different loaderimage params
-		run_host_x86_binary_logged $RKBIN_DIR/tools/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img 0x600000 --size 1024 1 &&
-			if [ -r "$IDBLOADER_BLOB" ]; then
-				echo "Installing $IDBLOADER_BLOB"
-				echo "Capable of booting from built-in SDNAND"
-				cp $IDBLOADER_BLOB idbloader.bin
-			else
-				[ "$IDBLOADER_BLOB" ] && echo "Missing $IDBLOADER_BLOB"
-				echo "WARNING:  This image will not boot from built-in SDNAND"
-				tools/mkimage -n rk3308 -T rksd -d $RKBIN_DIR/$DDR_BLOB idbloader.bin &&
-					cat $RKBIN_DIR/$MINILOADER_BLOB >> idbloader.bin
-			fi &&
-			run_host_x86_binary_logged $RKBIN_DIR/tools/trust_merger --replace bl31.elf $RKBIN_DIR/$BL31_BLOB trust.ini
-	}
-
-	family_tweaks_bsp() { #Install udev script that derives fixed, unique MAC addresses for net interfaces
+function post_family_config__rockpis() {
+	declare -g BOOTDIR="u-boot-${BOARD}"
+	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
 
+	family_tweaks_bsp() { #overrides rockchip64_common.inc
+		#Install udev script that derives fixed, unique MAC addresses for net interfaces
 		#that are assigned random ones -- like RockPI-S's WiFi network interfaces
 		bsp=$SRC/packages/bsp/rockpis
 		rules=etc/udev/rules.d
 
 		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev &&
-		install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
+			install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
 	}
-
 }
 
 function pre_install_kernel_debs__enforce_cma() {
@@ -77,5 +45,5 @@ function pre_install_kernel_debs__enforce_cma() {
 	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
 	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
 
-        return 0
+	return 0
 }
diff --git a/packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin b/packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin
diff --git a/packages/blobs/rockchip/rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin b/packages/blobs/rockchip/rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
diff --git a/patch/u-boot/v2024.10/board_rock-s0/1120-mmcBootOnRockS0v1-1.patch b/patch/u-boot/v2024.10/board_rock-s0/1120-mmcBootOnRockS0v1-1.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brent Roman <[email protected]>
+Date: Sat, 16 Nov 2024 20:50:41 -0800
+Subject: Ensure Rock S0 v1.1 boards u-boot SPL can access MMC card
+
+Signed-off-by: Brent Roman <[email protected]>
+---
+ arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | 15 ++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
+index 84ca2ee0d5..c0d7f7b651 100644
+--- a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
++++ b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
+@@ -5,10 +5,25 @@
+ &emmc_pwren {
+ 	bootph-pre-ram;
+ 	bootph-some-ram;
+ };
+
++&pcfg_pull_down {
++	bootph-pre-ram;
++	bootph-some-ram;
++};
++
++&sdmmc {
++	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_pwren &sdmmc_bus4>;
++};
++
++&sdmmc_pwren {
++	bootph-pre-ram;
++	bootph-some-ram;
++	rockchip,pins = <4 RK_PD6 0 &pcfg_pull_down>;
++};
++
+ &uart0 {
+ 	bootph-all;
+ 	clock-frequency = <24000000>;
+ };
+
+-- 
+Created with Armbian build tools https://github.com/armbian/build