Rockpis family

config/boards/rock-s0.conf

@@ -1,15 +1,13 @@
 # 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"
-BOARDFAMILY="rock-s0"
 BOARD_MAINTAINER="brentr"
+BOARDFAMILY="rockchip64"
 BOOTCONFIG="rock-s0-rk3308_defconfig"
-DEFAULT_CONSOLE="serial"
-SERIALCON="ttyS0"
+BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb"
-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"

config/boards/rockpi-s.conf

@@ -1,15 +1,15 @@
 # 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"
-MODULES_LEGACY="g_serial"
 SERIALCON="ttyS0"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
 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"
@@ -40,8 +40,7 @@ function post_family_config___uboot_config() {
 	display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info"
 	unset uboot_custom_postprocess family_tweaks_bsp # disable stuff from rockchip64_common
 
-	BOOTSCRIPT=boot-rockpis.cmd:boot.cmd
-	BOOTENV_FILE='rockpis.txt'
+	BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
 
 	uboot_custom_postprocess() {
 

config/bootscripts/boot-rock-s0.cmd → config/bootscripts/boot-rockchip64-ttyS0.cmd

@@ -3,22 +3,23 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #
 
-setenv load_addr  "0x9000000"
-# Ensure the ever expanding kernel never overlaps initial device tree load area
-setenv fdt_addr_r "0x7800000"
+setenv load_addr "0x9000000"
 setenv overlay_error "false"
 # default values
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"
 
-echo "Boot script loaded from ${devtype} ${devnum}"
+test -n "${distro_bootpart}" || distro_bootpart=1
 
-if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
-	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
+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}
 fi
 
@@ -27,46 +28,53 @@ if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,1500000 ${consoleargs}"; fi
 if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+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"
 	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 load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+	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
 fi
+
 booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 
 # Recompile with: