rkbin: Downgrade SPL back to v1.12

SD card driver in v1.13 throws errors and won't boot anymore. Tested on Indiedroid Nova. Signed-off-by: Mario Bălănică <[email protected]>
edk2-porting · Jun 23, 2024 · 83e1b9b · 83e1b9b
1 parent 9678f64
commit 83e1b9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -29,11 +29,20 @@ function _build_idblock() {
     FLASHFILES="FlashHead.bin FlashData.bin FlashBoot.bin"
     rm -f rk35*_spl_loader_*.bin idblock.bin rk35*_ddr_*.bin rk35*_usbplug*.bin UsbHead.bin ${FLASHFILES}
 
-    DDRBIN=$(grep '^FlashData' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
-    SPL=$(grep '^FlashBoot' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
+    DDRBIN_RKBIN=$(grep '^FlashData' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
+    SPL_RKBIN=$(grep '^FlashBoot' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
+
+    DDRBIN="${ROOTDIR}/misc/rkbin/${DDRBIN_RKBIN}"
+
+    #
+    # SPL v1.13 has broken SD card support!
+    # Use v1.12 instead.
+    #
+    # SPL="${ROOTDIR}/misc/rkbin/${SPL_RKBIN}"
+    SPL="${ROOTDIR}/misc/rk3588_spl_v1.12.bin"
 
     # Create idblock.bin
-    ${ROOTDIR}/misc/tools/${MACHINE_TYPE}/mkimage -n rk3588 -T rksd -d ${ROOTDIR}/misc/rkbin/${DDRBIN}:${ROOTDIR}/misc/rkbin/${SPL} idblock.bin
+    ${ROOTDIR}/misc/tools/${MACHINE_TYPE}/mkimage -n rk3588 -T rksd -d ${DDRBIN}:${SPL} idblock.bin
 
     popd
     echo " => idblock.bin build done"

diff --git a/misc/rk3588_spl_v1.12.bin b/misc/rk3588_spl_v1.12.bin