bootable: u-boot rk vendor: fixes for uinitrd; pass tink params; add blade3 board

- actually enables vendor/boot.scr-based bootables to work

Signed-off-by: Ricardo Pardini <[email protected]>

Author: rpardini

bash/bootable/armbian-u-boot.sh

@@ -41,6 +41,7 @@ function build_bootable_armbian_uboot_rockchip() {
 function list_bootable_armbian_uboot_rockchip_vendor() {
 	declare -g -A bootable_boards=()
 	bootable_boards["r58x"]="BOARD=mekotronics-r58x-pro BRANCH=vendor"
+	bootable_boards["blade3"]="BOARD=mixtile-blade3 BRANCH=vendor"
 }
 
 function build_bootable_armbian_uboot_rockchip_vendor() {
@@ -195,6 +196,10 @@ function write_uboot_script() {
 		exit 2
 	fi
 
+	declare -g -a bootable_tinkerbell_kernel_params=()
+	fill_array_bootable_tinkerbell_kernel_parameters "${BOARD}"
+	declare tinkerbell_args="${bootable_tinkerbell_kernel_params[*]}"
+
 	declare console_extra_args="${bootable_info['CONSOLE_EXTRA_ARGS']:-""}"
 	cat <<- BOOT_CMD > "${boot_cmd_file}"
 		# Hook u-boot bootscript; mkimage -C none -A arm -T script -d /boot.cmd /boot.scr
@@ -204,7 +209,7 @@ function write_uboot_script() {
 		setenv ramdisk_addr_r "0x40000000"
 		test -n "\${distro_bootpart}" || distro_bootpart=1
 		echo "Boot script loaded from \${devtype} \${devnum}:\${distro_bootpart}"
-		setenv bootargs "${UBOOT_EXTLINUX_CMDLINE} console=tty0 console=${UBOOT_KERNEL_SERIALCON}${console_extra_args}"
+		setenv bootargs "${UBOOT_EXTLINUX_CMDLINE} console=tty0 console=${UBOOT_KERNEL_SERIALCON}${console_extra_args} ${tinkerbell_args}"
 		echo "Booting with: \${bootargs}"
 
 		echo "Loading initramfs... \${ramdisk_addr_r} /uinitrd"
@@ -221,6 +226,9 @@ function write_uboot_script() {
 		booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
 	BOOT_CMD
 
+	log info "Marking uinitrd.wanted..."
+	touch "${fat32_root_dir}/uinitrd.wanted" # marker file for utility run during fat32 image creation; see create_image_fat32_root_from_dir()
+
 	log_file_bat "${boot_cmd_file}" "info" "Produced Armbian u-boot boot.cmd/boot.scr"
 
 	return 0

bash/bootable/fat32-image.sh

@@ -22,9 +22,10 @@ function create_image_fat32_root_from_dir() {
 		set -x
 
 		# Hack: transform the initramfs using mkimage to a u-boot image # @TODO refactor this out of here
-		if [ -f /work/input/initramfs ]]; then
+		ls -lah /work/input
+		if [[ -f /work/input/uinitrd.wanted ]]; then
 			mkimage -A arm64 -O linux -T ramdisk -C gzip -n uInitrd -d /work/input/initramfs /work/input/uinitrd
-			#rm -f /work/input/initramfs
+			rm -f /work/input/initramfs /work/input/uinitrd.wanted
 			ls -lah /work/input/uinitrd
 		fi