diff --git a/common/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/5.4/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
similarity index 100%
rename from common/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
rename to 5.4/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
diff --git a/common/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh b/5.4/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
similarity index 100%
rename from common/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
rename to 5.4/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
diff --git a/common/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini b/5.4/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
similarity index 100%
rename from common/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
rename to 5.4/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
diff --git a/common/package/boot/arm-trusted-firmware-rockchip/Makefile b/5.4/package/boot/arm-trusted-firmware-rockchip/Makefile
similarity index 100%
rename from common/package/boot/arm-trusted-firmware-rockchip/Makefile
rename to 5.4/package/boot/arm-trusted-firmware-rockchip/Makefile
diff --git a/common/package/boot/uboot-rockchip/Makefile b/5.4/package/boot/uboot-rockchip/Makefile
similarity index 100%
rename from common/package/boot/uboot-rockchip/Makefile
rename to 5.4/package/boot/uboot-rockchip/Makefile
diff --git a/common/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch b/5.4/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch
rename to 5.4/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch
diff --git a/common/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch b/5.4/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch
rename to 5.4/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch
diff --git a/common/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch b/5.4/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch
rename to 5.4/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch
diff --git a/common/package/boot/uboot-rockchip/patches/015-uboot-add-NanoPi-R5S-board.patch b/5.4/package/boot/uboot-rockchip/patches/015-uboot-add-NanoPi-R5S-board.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/015-uboot-add-NanoPi-R5S-board.patch
rename to 5.4/package/boot/uboot-rockchip/patches/015-uboot-add-NanoPi-R5S-board.patch
diff --git a/common/package/boot/uboot-rockchip/patches/018-driver-Makefile-support-adc-in-SPL.patch b/5.4/package/boot/uboot-rockchip/patches/018-driver-Makefile-support-adc-in-SPL.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/018-driver-Makefile-support-adc-in-SPL.patch
rename to 5.4/package/boot/uboot-rockchip/patches/018-driver-Makefile-support-adc-in-SPL.patch
diff --git a/common/package/boot/uboot-rockchip/patches/019-rockchip-handle-bootrom-mode-in-spl.patch b/5.4/package/boot/uboot-rockchip/patches/019-rockchip-handle-bootrom-mode-in-spl.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/019-rockchip-handle-bootrom-mode-in-spl.patch
rename to 5.4/package/boot/uboot-rockchip/patches/019-rockchip-handle-bootrom-mode-in-spl.patch
diff --git a/common/package/boot/uboot-rockchip/patches/020-update-rock-3a-defconfig.patch b/5.4/package/boot/uboot-rockchip/patches/020-update-rock-3a-defconfig.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/020-update-rock-3a-defconfig.patch
rename to 5.4/package/boot/uboot-rockchip/patches/020-update-rock-3a-defconfig.patch
diff --git a/common/package/boot/uboot-rockchip/patches/106-no-kwbimage.patch b/5.4/package/boot/uboot-rockchip/patches/106-no-kwbimage.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/106-no-kwbimage.patch
rename to 5.4/package/boot/uboot-rockchip/patches/106-no-kwbimage.patch
diff --git a/common/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch b/5.4/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch
rename to 5.4/package/boot/uboot-rockchip/patches/110-force-pylibfdt-build.patch
diff --git a/common/package/boot/uboot-rockchip/patches/111-fix-mkimage-host-build.patch b/5.4/package/boot/uboot-rockchip/patches/111-fix-mkimage-host-build.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/111-fix-mkimage-host-build.patch
rename to 5.4/package/boot/uboot-rockchip/patches/111-fix-mkimage-host-build.patch
diff --git a/common/package/boot/uboot-rockchip/patches/120-clk-scmi-Add-Kconfig-option-for-SPL.patch b/5.4/package/boot/uboot-rockchip/patches/120-clk-scmi-Add-Kconfig-option-for-SPL.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/120-clk-scmi-Add-Kconfig-option-for-SPL.patch
rename to 5.4/package/boot/uboot-rockchip/patches/120-clk-scmi-Add-Kconfig-option-for-SPL.patch
diff --git a/common/package/boot/uboot-rockchip/patches/121-pinctrl-rockchip-Fix-IO-mux-selection-on.patch b/5.4/package/boot/uboot-rockchip/patches/121-pinctrl-rockchip-Fix-IO-mux-selection-on.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/121-pinctrl-rockchip-Fix-IO-mux-selection-on.patch
rename to 5.4/package/boot/uboot-rockchip/patches/121-pinctrl-rockchip-Fix-IO-mux-selection-on.patch
diff --git a/common/package/boot/uboot-rockchip/patches/203-rock64pro-disable-CONFIG_USE_PREBOOT.patch b/5.4/package/boot/uboot-rockchip/patches/203-rock64pro-disable-CONFIG_USE_PREBOOT.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/203-rock64pro-disable-CONFIG_USE_PREBOOT.patch
rename to 5.4/package/boot/uboot-rockchip/patches/203-rock64pro-disable-CONFIG_USE_PREBOOT.patch
diff --git a/common/package/boot/uboot-rockchip/patches/210-rockchip-rk35xx-Fix-boot-with-a-large-fdt-blob.patch b/5.4/package/boot/uboot-rockchip/patches/210-rockchip-rk35xx-Fix-boot-with-a-large-fdt-blob.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/210-rockchip-rk35xx-Fix-boot-with-a-large-fdt-blob.patch
rename to 5.4/package/boot/uboot-rockchip/patches/210-rockchip-rk35xx-Fix-boot-with-a-large-fdt-blob.patch
diff --git a/common/package/boot/uboot-rockchip/patches/301-arm64-dts-rockchip-Add-GuangMiao-G4C-support.patch b/5.4/package/boot/uboot-rockchip/patches/301-arm64-dts-rockchip-Add-GuangMiao-G4C-support.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/301-arm64-dts-rockchip-Add-GuangMiao-G4C-support.patch
rename to 5.4/package/boot/uboot-rockchip/patches/301-arm64-dts-rockchip-Add-GuangMiao-G4C-support.patch
diff --git a/common/package/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch b/5.4/package/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
rename to 5.4/package/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
diff --git a/common/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch b/5.4/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch
rename to 5.4/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch
diff --git a/common/package/boot/uboot-rockchip/patches/304-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/5.4/package/boot/uboot-rockchip/patches/304-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/304-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
rename to 5.4/package/boot/uboot-rockchip/patches/304-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
diff --git a/common/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/5.4/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
rename to 5.4/package/boot/uboot-rockchip/patches/305-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
diff --git a/common/package/boot/uboot-rockchip/patches/306-rockchip-rk3399-Add-support-for-Rongpin-king3399.patch b/5.4/package/boot/uboot-rockchip/patches/306-rockchip-rk3399-Add-support-for-Rongpin-king3399.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/306-rockchip-rk3399-Add-support-for-Rongpin-king3399.patch
rename to 5.4/package/boot/uboot-rockchip/patches/306-rockchip-rk3399-Add-support-for-Rongpin-king3399.patch
diff --git a/common/package/boot/uboot-rockchip/patches/307-rockchip-rk3399-Add-support-for-Rocktech-MPC1903.patch b/5.4/package/boot/uboot-rockchip/patches/307-rockchip-rk3399-Add-support-for-Rocktech-MPC1903.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/307-rockchip-rk3399-Add-support-for-Rocktech-MPC1903.patch
rename to 5.4/package/boot/uboot-rockchip/patches/307-rockchip-rk3399-Add-support-for-Rocktech-MPC1903.patch
diff --git a/common/package/boot/uboot-rockchip/patches/308-rockchip-rk3399-Add-support-for-sharevdi-h3399pc.patch b/5.4/package/boot/uboot-rockchip/patches/308-rockchip-rk3399-Add-support-for-sharevdi-h3399pc.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/308-rockchip-rk3399-Add-support-for-sharevdi-h3399pc.patch
rename to 5.4/package/boot/uboot-rockchip/patches/308-rockchip-rk3399-Add-support-for-sharevdi-h3399pc.patch
diff --git a/common/package/boot/uboot-rockchip/patches/309-rockchip-rk3399-Add-support-for-dilusense-dlfr100.patch b/5.4/package/boot/uboot-rockchip/patches/309-rockchip-rk3399-Add-support-for-dilusense-dlfr100.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/309-rockchip-rk3399-Add-support-for-dilusense-dlfr100.patch
rename to 5.4/package/boot/uboot-rockchip/patches/309-rockchip-rk3399-Add-support-for-dilusense-dlfr100.patch
diff --git a/common/package/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-ezpro_mrkaio-m68s.patch b/5.4/package/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-ezpro_mrkaio-m68s.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-ezpro_mrkaio-m68s.patch
rename to 5.4/package/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-ezpro_mrkaio-m68s.patch
diff --git a/common/package/boot/uboot-rockchip/patches/312-rockchip-rk3568-Add-support-for-hinlink-opc-h68k.patch b/5.4/package/boot/uboot-rockchip/patches/312-rockchip-rk3568-Add-support-for-hinlink-opc-h68k.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/312-rockchip-rk3568-Add-support-for-hinlink-opc-h68k.patch
rename to 5.4/package/boot/uboot-rockchip/patches/312-rockchip-rk3568-Add-support-for-hinlink-opc-h68k.patch
diff --git a/common/package/boot/uboot-rockchip/patches/313-rockchip-rk3568-Add-support-for-fastrhino-r66s.patch b/5.4/package/boot/uboot-rockchip/patches/313-rockchip-rk3568-Add-support-for-fastrhino-r66s.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/313-rockchip-rk3568-Add-support-for-fastrhino-r66s.patch
rename to 5.4/package/boot/uboot-rockchip/patches/313-rockchip-rk3568-Add-support-for-fastrhino-r66s.patch
diff --git a/common/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-Station-P2.patch b/5.4/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-Station-P2.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-Station-P2.patch
rename to 5.4/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-Station-P2.patch
diff --git a/common/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-photonicat.patch b/5.4/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-photonicat.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-photonicat.patch
rename to 5.4/package/boot/uboot-rockchip/patches/314-rockchip-rk3568-Add-support-for-photonicat.patch
diff --git a/common/package/boot/uboot-rockchip/patches/315-rockchip-rk3568-Add-support-for-radxa_e25.patch b/5.4/package/boot/uboot-rockchip/patches/315-rockchip-rk3568-Add-support-for-radxa_e25.patch
similarity index 100%
rename from common/package/boot/uboot-rockchip/patches/315-rockchip-rk3568-Add-support-for-radxa_e25.patch
rename to 5.4/package/boot/uboot-rockchip/patches/315-rockchip-rk3568-Add-support-for-radxa_e25.patch
diff --git a/build.sh b/build.sh
index 8fca5955..6ae619b7 100755
--- 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" ] && {