Fix rockchip uboot on 6.1

Ysurac · Dec 29, 2023 · 1fd3a0d · 1fd3a0d
1 parent d05bd9b
commit 1fd3a0d
Show file tree

Hide file tree

Showing 35 changed files with 4 additions and 2 deletions.
diff --git a/...trusted-firmware-rockchip-vendor/Makefile → ...trusted-firmware-rockchip-vendor/Makefile b/...trusted-firmware-rockchip-vendor/Makefile → ...trusted-firmware-rockchip-vendor/Makefile
diff --git a/...firmware-rockchip-vendor/pack-firmware.sh → ...firmware-rockchip-vendor/pack-firmware.sh b/...firmware-rockchip-vendor/pack-firmware.sh → ...firmware-rockchip-vendor/pack-firmware.sh
diff --git a/...ed-firmware-rockchip-vendor/src/trust.ini → ...ed-firmware-rockchip-vendor/src/trust.ini b/...ed-firmware-rockchip-vendor/src/trust.ini → ...ed-firmware-rockchip-vendor/src/trust.ini
diff --git a/...ot/arm-trusted-firmware-rockchip/Makefile → ...ot/arm-trusted-firmware-rockchip/Makefile b/...ot/arm-trusted-firmware-rockchip/Makefile → ...ot/arm-trusted-firmware-rockchip/Makefile
diff --git a/common/package/boot/uboot-rockchip/Makefile → 5.4/package/boot/uboot-rockchip/Makefile b/common/package/boot/uboot-rockchip/Makefile → 5.4/package/boot/uboot-rockchip/Makefile
diff --git a/...ert-rockchip-rk3399-Drop-altbootcmd.patch → ...ert-rockchip-rk3399-Drop-altbootcmd.patch b/...ert-rockchip-rk3399-Drop-altbootcmd.patch → ...ert-rockchip-rk3399-Drop-altbootcmd.patch
diff --git a/...isable-DISTRO_DEFAULTS-for-rk3399-b.patch → ...isable-DISTRO_DEFAULTS-for-rk3399-b.patch b/...isable-DISTRO_DEFAULTS-for-rk3399-b.patch → ...isable-DISTRO_DEFAULTS-for-rk3399-b.patch
diff --git a/...onvert-rockpro64-rk3399-to-use-stan.patch → ...onvert-rockpro64-rk3399-to-use-stan.patch b/...onvert-rockpro64-rk3399-to-use-stan.patch → ...onvert-rockpro64-rk3399-to-use-stan.patch
diff --git a/...ches/015-uboot-add-NanoPi-R5S-board.patch → ...ches/015-uboot-add-NanoPi-R5S-board.patch b/...ches/015-uboot-add-NanoPi-R5S-board.patch → ...ches/015-uboot-add-NanoPi-R5S-board.patch
diff --git a/...-driver-Makefile-support-adc-in-SPL.patch → ...-driver-Makefile-support-adc-in-SPL.patch b/...-driver-Makefile-support-adc-in-SPL.patch → ...-driver-Makefile-support-adc-in-SPL.patch
diff --git a/...rockchip-handle-bootrom-mode-in-spl.patch → ...rockchip-handle-bootrom-mode-in-spl.patch b/...rockchip-handle-bootrom-mode-in-spl.patch → ...rockchip-handle-bootrom-mode-in-spl.patch
diff --git a/...atches/020-update-rock-3a-defconfig.patch → ...atches/020-update-rock-3a-defconfig.patch b/...atches/020-update-rock-3a-defconfig.patch → ...atches/020-update-rock-3a-defconfig.patch
diff --git a/...ot-rockchip/patches/106-no-kwbimage.patch → ...ot-rockchip/patches/106-no-kwbimage.patch b/...ot-rockchip/patches/106-no-kwbimage.patch → ...ot-rockchip/patches/106-no-kwbimage.patch
diff --git a/...ip/patches/110-force-pylibfdt-build.patch → ...ip/patches/110-force-pylibfdt-build.patch b/...ip/patches/110-force-pylibfdt-build.patch → ...ip/patches/110-force-pylibfdt-build.patch
diff --git a/.../patches/111-fix-mkimage-host-build.patch → .../patches/111-fix-mkimage-host-build.patch b/.../patches/111-fix-mkimage-host-build.patch → .../patches/111-fix-mkimage-host-build.patch
diff --git a/...clk-scmi-Add-Kconfig-option-for-SPL.patch → ...clk-scmi-Add-Kconfig-option-for-SPL.patch b/...clk-scmi-Add-Kconfig-option-for-SPL.patch → ...clk-scmi-Add-Kconfig-option-for-SPL.patch
diff --git a/...rl-rockchip-Fix-IO-mux-selection-on.patch → ...rl-rockchip-Fix-IO-mux-selection-on.patch b/...rl-rockchip-Fix-IO-mux-selection-on.patch → ...rl-rockchip-Fix-IO-mux-selection-on.patch
diff --git a/...ock64pro-disable-CONFIG_USE_PREBOOT.patch → ...ock64pro-disable-CONFIG_USE_PREBOOT.patch b/...ock64pro-disable-CONFIG_USE_PREBOOT.patch → ...ock64pro-disable-CONFIG_USE_PREBOOT.patch
diff --git a/...35xx-Fix-boot-with-a-large-fdt-blob.patch → ...35xx-Fix-boot-with-a-large-fdt-blob.patch b/...35xx-Fix-boot-with-a-large-fdt-blob.patch → ...35xx-Fix-boot-with-a-large-fdt-blob.patch
diff --git a/...-rockchip-Add-GuangMiao-G4C-support.patch → ...-rockchip-Add-GuangMiao-G4C-support.patch b/...-rockchip-Add-GuangMiao-G4C-support.patch → ...-rockchip-Add-GuangMiao-G4C-support.patch
diff --git a/...28-Add-support-for-Orangepi-R1-Plus.patch → ...28-Add-support-for-Orangepi-R1-Plus.patch b/...28-Add-support-for-Orangepi-R1-Plus.patch → ...28-Add-support-for-Orangepi-R1-Plus.patch
diff --git a/...dd-support-for-Orangepi-R1-Plus-LTS.patch → ...dd-support-for-Orangepi-R1-Plus-LTS.patch b/...dd-support-for-Orangepi-R1-Plus-LTS.patch → ...dd-support-for-Orangepi-R1-Plus-LTS.patch
diff --git a/...dd-support-for-FriendlyARM-NanoPi-R.patch → ...dd-support-for-FriendlyARM-NanoPi-R.patch b/...dd-support-for-FriendlyARM-NanoPi-R.patch → ...dd-support-for-FriendlyARM-NanoPi-R.patch
diff --git a/...dd-support-for-FriendlyARM-NanoPi-R.patch → ...dd-support-for-FriendlyARM-NanoPi-R.patch b/...dd-support-for-FriendlyARM-NanoPi-R.patch → ...dd-support-for-FriendlyARM-NanoPi-R.patch
diff --git a/...99-Add-support-for-Rongpin-king3399.patch → ...99-Add-support-for-Rongpin-king3399.patch b/...99-Add-support-for-Rongpin-king3399.patch → ...99-Add-support-for-Rongpin-king3399.patch
diff --git a/...99-Add-support-for-Rocktech-MPC1903.patch → ...99-Add-support-for-Rocktech-MPC1903.patch b/...99-Add-support-for-Rocktech-MPC1903.patch → ...99-Add-support-for-Rocktech-MPC1903.patch
diff --git a/...99-Add-support-for-sharevdi-h3399pc.patch → ...99-Add-support-for-sharevdi-h3399pc.patch b/...99-Add-support-for-sharevdi-h3399pc.patch → ...99-Add-support-for-sharevdi-h3399pc.patch
diff --git a/...9-Add-support-for-dilusense-dlfr100.patch → ...9-Add-support-for-dilusense-dlfr100.patch b/...9-Add-support-for-dilusense-dlfr100.patch → ...9-Add-support-for-dilusense-dlfr100.patch
diff --git a/...8-Add-support-for-ezpro_mrkaio-m68s.patch → ...8-Add-support-for-ezpro_mrkaio-m68s.patch b/...8-Add-support-for-ezpro_mrkaio-m68s.patch → ...8-Add-support-for-ezpro_mrkaio-m68s.patch
diff --git a/...68-Add-support-for-hinlink-opc-h68k.patch → ...68-Add-support-for-hinlink-opc-h68k.patch b/...68-Add-support-for-hinlink-opc-h68k.patch → ...68-Add-support-for-hinlink-opc-h68k.patch
diff --git a/...3568-Add-support-for-fastrhino-r66s.patch → ...3568-Add-support-for-fastrhino-r66s.patch b/...3568-Add-support-for-fastrhino-r66s.patch → ...3568-Add-support-for-fastrhino-r66s.patch
diff --git a/...p-rk3568-Add-support-for-Station-P2.patch → ...p-rk3568-Add-support-for-Station-P2.patch b/...p-rk3568-Add-support-for-Station-P2.patch → ...p-rk3568-Add-support-for-Station-P2.patch
diff --git a/...p-rk3568-Add-support-for-photonicat.patch → ...p-rk3568-Add-support-for-photonicat.patch b/...p-rk3568-Add-support-for-photonicat.patch → ...p-rk3568-Add-support-for-photonicat.patch
diff --git a/...ip-rk3568-Add-support-for-radxa_e25.patch → ...ip-rk3568-Add-support-for-radxa_e25.patch b/...ip-rk3568-Add-support-for-radxa_e25.patch → ...ip-rk3568-Add-support-for-radxa_e25.patch
diff --git a/build.sh b/build.sh
@@ -168,8 +168,10 @@ rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/files" "$OMR_TARGET/${OMR_KERNEL}/sourc
 #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/mediatek/patches-5.4"
 #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mediatek"
 #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek"
-echo "rm -rf $OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-rockchip"
-rm -rf "${OMR_TARGET}/${OMR_KERNEL}/source/package/boot/uboot-rockchip"
+if [ "${OMR_KERNEL}" = "5.4" ]; then
+	echo "rm -rf $OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-rockchip"
+	rm -rf "${OMR_TARGET}/${OMR_KERNEL}/source/package/boot/uboot-rockchip"
+fi
 echo "rm -rf $OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mvebu"
 rm -rf "${OMR_TARGET}/${OMR_KERNEL}/source/package/boot/uboot-mvebu"
 [ "${OMR_KERNEL}" = "6.1" ] || [ "${OMR_KERNEL}" = "6.6" ] || [ "${OMR_KERNEL}" = "6.7" ] && {