diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc
index 6f5e60df58..ea9ee3b85a 100644
--- a/config/boards/armsom-sige7.csc
+++ b/config/boards/armsom-sige7.csc
@@ -12,6 +12,8 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
 BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 
diff --git a/config/boards/armsom-w3.csc b/config/boards/armsom-w3.csc
index 535326bd4a..c22f00f6cc 100644
--- a/config/boards/armsom-w3.csc
+++ b/config/boards/armsom-w3.csc
@@ -12,6 +12,8 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
 BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 
diff --git a/config/boards/fxblox-rk1.csc b/config/boards/fxblox-rk1.csc
index 63c3117640..5d59c2bf6c 100644
--- a/config/boards/fxblox-rk1.csc
+++ b/config/boards/fxblox-rk1.csc
@@ -12,6 +12,8 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
 BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 
diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc
index e50948a8d1..8b5cfceb0b 100644
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -12,9 +12,11 @@ declare -g BOOT_SCENARIO="spl-blobs"
 declare -g BOOT_SUPPORT_SPI="no"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g SRC_EXTLINUX="no" # going back to standard uboot for now
+declare -g UEFI_EDK2_BOARD_ID="indiedroid-nova" # This _only_ used for uefi-edk2-rk3588 extension
+
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-declare -g UEFI_EDK2_BOARD_ID="indiedroid-nova" # This _only_ used for uefi-edk2-rk3588 extension
 
 ## only applies to extlinux so not used
 declare -g SRC_CMDLINE="console=ttyS0,115200n8 console=tty1 console=both net.ifnames=0 rootflags=data=writeback"
diff --git a/config/boards/khadas-edge2.conf b/config/boards/khadas-edge2.conf
index f10bafa83b..d38493360b 100644
--- a/config/boards/khadas-edge2.conf
+++ b/config/boards/khadas-edge2.conf
@@ -25,8 +25,6 @@ function post_family_tweaks__kedge2_naming_audios() {
 	return 0
 }
 
-declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-declare -g BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 declare -g BL32_BLOB='rk35/rk3588_bl32_v1.15.bin'
 
 # for the kedge2, we're counting on the blobs+u-boot in SPI working, as it comes from factory. It does not support bootscripts.
diff --git a/config/boards/mixtile-blade3.csc b/config/boards/mixtile-blade3.csc
index 5aff522b79..b62d8de9e8 100644
--- a/config/boards/mixtile-blade3.csc
+++ b/config/boards/mixtile-blade3.csc
@@ -13,6 +13,7 @@ declare -g UEFI_EDK2_BOARD_ID="blade3" # This _only_ used for uefi-edk2-rk3588 e
 
 # newer blobs from rockchip. tested to work.
 # set as variables, early, so they're picked up by `prepare_boot_configuration()`
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
 declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
 
diff --git a/config/boards/nanopc-cm3588-nas.csc b/config/boards/nanopc-cm3588-nas.csc
index d98a0acc3f..0c2fcf5fdf 100644
--- a/config/boards/nanopc-cm3588-nas.csc
+++ b/config/boards/nanopc-cm3588-nas.csc
@@ -10,8 +10,6 @@ BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-cm3588-nas.dtb"
 BOOT_SCENARIO="spl-blobs"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 
 function post_family_tweaks__nanopccm3588nas_udev_naming_audios() {
 	display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"
diff --git a/config/boards/nanopct6.csc b/config/boards/nanopct6.csc
index 2bcb26fb3a..4c3499397d 100644
--- a/config/boards/nanopct6.csc
+++ b/config/boards/nanopct6.csc
@@ -15,9 +15,6 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="nanopc-t6" # This _only_ used for uefi-edk2-rk3588 extension
 
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
-
 function post_family_tweaks__nanopct6_naming_audios() {
 	display_alert "$BOARD" "Renaming nanopct6 audio" "info"
 
diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc
index 0ca97a11a1..8583268b7c 100644
--- a/config/boards/nanopi-r6c.csc
+++ b/config/boards/nanopi-r6c.csc
@@ -10,8 +10,6 @@ BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6c.dtb"
 BOOT_SCENARIO="spl-blobs"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 
 function post_family_tweaks__nanopi_r6c_naming_audios() {
 	display_alert "$BOARD" "Renaming NanoPi R6C HDMI audio interface to human-readable form" "info"
@@ -36,9 +34,9 @@ function post_family_tweaks__nanopi_r6c_naming_udev_network_interfaces() {
 function post_family_config__nanopi_r6c_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
-	declare -g BOOTCONFIG="generic-rk3588_defconfig"               # Use generic defconfig which should boot all RK3588 boards
-	declare -g BOOTDELAY=1                                         # Wait for UART interrupt to enter UMS/RockUSB mode etc
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"   # We ❤️ Mainline U-Boot
+	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
 	declare -g BOOTBRANCH="tag:v2024.07-rc4"
 	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
diff --git a/config/boards/nanopi-r6s.csc b/config/boards/nanopi-r6s.csc
index 30098219be..4b9bcfab53 100644
--- a/config/boards/nanopi-r6s.csc
+++ b/config/boards/nanopi-r6s.csc
@@ -11,8 +11,6 @@ BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6s.dtb"
 BOOT_SCENARIO="spl-blobs"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 declare -g UEFI_EDK2_BOARD_ID="nanopi-r6s" # This _only_ used for uefi-edk2-rk3588 extension
 
 function post_family_tweaks__nanopir6s_naming_udev_audios() {
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
index b551b0063e..025029b6c2 100644
--- a/config/boards/orangepi5-plus.conf
+++ b/config/boards/orangepi5-plus.conf
@@ -10,8 +10,6 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
 BOOT_SCENARIO="spl-blobs"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf
index 6a8b420f2e..19577a4bff 100644
--- a/config/boards/orangepi5.conf
+++ b/config/boards/orangepi5.conf
@@ -14,9 +14,11 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
+declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension
+
+# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
 DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin'
 BL31_BLOB='rk35/rk3588_bl31_v1.44.elf'
-declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension
 
 declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension
 enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
diff --git a/config/boards/orangepi5pro.wip b/config/boards/orangepi5pro.wip
index 592c35d920..ed26f854c3 100644
--- a/config/boards/orangepi5pro.wip
+++ b/config/boards/orangepi5pro.wip
@@ -11,11 +11,9 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5-pro.dtb"
 BOOT_SCENARIO="spl-blobs"
-BOOT_SUPPORT_SPI="yes" 
+BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 
 function post_family_tweaks__orangepi5pro_naming_audios() {
 	display_alert "$BOARD" "Renaming orangepi5pro audios" "info"
diff --git a/config/boards/rock-5-itx.conf b/config/boards/rock-5-itx.conf
index 13eec553f9..015f2dcfa2 100644
--- a/config/boards/rock-5-itx.conf
+++ b/config/boards/rock-5-itx.conf
@@ -9,8 +9,6 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5-itx.dtb"
 BOOT_SCENARIO="spl-blobs"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index d2442b9be5..4fc6dda61b 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -121,8 +121,8 @@ case "$BOOT_SOC" in
 
 	rk3588) #CPUMAX undefined?
 		BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
-		DDR_BLOB="${DDR_BLOB:-"rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin"}"
-		BL31_BLOB="${BL31_BLOB:-"rk35/rk3588_bl31_v1.28.elf"}"
+		DDR_BLOB="${DDR_BLOB:-"rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"}"
+		BL31_BLOB="${BL31_BLOB:-"rk35/rk3588_bl31_v1.45.elf"}"
 		;;
 
 	rk3308)
diff --git a/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh b/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh
index 60b589e54e..e56a746974 100644
--- a/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh
+++ b/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh
@@ -21,10 +21,7 @@ declare -g BOOT_SOC="rk3588"                            # so we don't depend on
 declare -g BOOTCONFIG="rk3588_meko_defconfig" # generic ebv plus distro dtb hacks
 declare -g IMAGE_PARTITION_TABLE="gpt"
 
-# newer blobs from rockchip. tested to work.
-# set as variables, early, so they're picked up by `prepare_boot_configuration()`
-declare -g DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
+# Uses default DDR_BLOB and BL31_BLOB from rockchip64_common.
 
 # For the u-boot-menu extension (build with 'EXT=u-boot-menu')
 declare -g SRC_CMDLINE="loglevel=7 console=ttyS2,1500000 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"