Fixed BLOB paths

armbian · Nov 22, 2024 · ff1b62e · ff1b62e
1 parent 80b8f8e
commit ff1b62e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config/boards/rock-s0.conf b/config/boards/rock-s0.conf
@@ -19,14 +19,14 @@ HAS_VIDEO_OUTPUT=no
 BOOTBRANCH_BOARD=tag:v2024.10
 BOOTPATCHDIR=v2024.10
 BOOT_SCENARIO=binman
-DDR_BLOB=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
-BL31_BLOB=rk3308_bl31_v2.26.elf
+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
+	unset family_tweaks_bsp # disable from rockchip64_common
 }
diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf
@@ -19,8 +19,8 @@ HAS_VIDEO_OUTPUT=no
 BOOTBRANCH_BOARD=tag:v2024.10
 BOOTPATCHDIR=v2024.10
 BOOT_SCENARIO=binman
-DDR_BLOB=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
-BL31_BLOB=rk3308_bl31_v2.26.elf
+DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin
+BL31_BLOB=rk33/rk3308_bl31_v2.26.elf
 
 OVERLAY_PREFIX=rk3308
 
@@ -29,13 +29,13 @@ function post_family_config__rockpis() {
 	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
+		#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
 	}
 }
 
@@ -45,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
 }