diff --git a/patch/u-boot/u-boot-mvebu/README.md b/patch/u-boot/u-boot-clearfog/README.md
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/README.md
rename to patch/u-boot/u-boot-clearfog/README.md
diff --git a/patch/u-boot/u-boot-mvebu/add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/add-boot-marvell.cmd-backward-compatibility.patch
rename to patch/u-boot/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch
diff --git a/patch/u-boot/u-boot-mvebu/add_2GB_SOM_support.patch.disabled b/patch/u-boot/u-boot-clearfog/add_2GB_SOM_support.patch.disabled
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/add_2GB_SOM_support.patch.disabled
rename to patch/u-boot/u-boot-clearfog/add_2GB_SOM_support.patch.disabled
diff --git a/patch/u-boot/u-boot-mvebu/arm-mvebu-add-rev-id-a38x-b0.patch b/patch/u-boot/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/arm-mvebu-add-rev-id-a38x-b0.patch
rename to patch/u-boot/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch
diff --git a/patch/u-boot/u-boot-mvebu/board_clearfogbase/do_pcie_reset_during_init.patch b/patch/u-boot/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/board_clearfogbase/do_pcie_reset_during_init.patch
rename to patch/u-boot/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch
diff --git a/patch/u-boot/u-boot-mvebu/board_clearfogbase/enable_base_model.patch b/patch/u-boot/u-boot-clearfog/board_clearfogbase/enable_base_model.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/board_clearfogbase/enable_base_model.patch
rename to patch/u-boot/u-boot-clearfog/board_clearfogbase/enable_base_model.patch
diff --git a/patch/u-boot/u-boot-mvebu/board_clearfogpro/do_pcie_reset_during_init.patch b/patch/u-boot/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/board_clearfogpro/do_pcie_reset_during_init.patch
rename to patch/u-boot/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch
diff --git a/patch/u-boot/u-boot-mvebu/clearfog-pci0=msata.patch.disabled b/patch/u-boot/u-boot-clearfog/clearfog-pci0=msata.patch.disabled
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/clearfog-pci0=msata.patch.disabled
rename to patch/u-boot/u-boot-clearfog/clearfog-pci0=msata.patch.disabled
diff --git a/patch/u-boot/u-boot-mvebu/clearfog-pci1=msata.patch.disabled b/patch/u-boot/u-boot-clearfog/clearfog-pci1=msata.patch.disabled
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/clearfog-pci1=msata.patch.disabled
rename to patch/u-boot/u-boot-clearfog/clearfog-pci1=msata.patch.disabled
diff --git a/patch/u-boot/u-boot-mvebu/enable-pcie-support.patch b/patch/u-boot/u-boot-clearfog/enable-pcie-support.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/enable-pcie-support.patch
rename to patch/u-boot/u-boot-clearfog/enable-pcie-support.patch
diff --git a/patch/u-boot/u-boot-mvebu/swap-sata-serdes-rx.patch b/patch/u-boot/u-boot-clearfog/swap-sata-serdes-rx.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/swap-sata-serdes-rx.patch
rename to patch/u-boot/u-boot-clearfog/swap-sata-serdes-rx.patch
diff --git a/patch/u-boot/u-boot-mvebu/target_mmc/set_default_boot_target_to_mmc.patch b/patch/u-boot/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/target_mmc/set_default_boot_target_to_mmc.patch
rename to patch/u-boot/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch
diff --git a/patch/u-boot/u-boot-mvebu/target_sata/set_default_boot_target_to_sata.patch b/patch/u-boot/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/target_sata/set_default_boot_target_to_sata.patch
rename to patch/u-boot/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch
diff --git a/patch/u-boot/u-boot-mvebu/target_sdhc/set_default_boot_target_to_sdhc.patch b/patch/u-boot/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/target_sdhc/set_default_boot_target_to_sdhc.patch
rename to patch/u-boot/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch
diff --git a/patch/u-boot/u-boot-mvebu/target_spi/set_default_boot_target_to_spi.patch b/patch/u-boot/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/target_spi/set_default_boot_target_to_spi.patch
rename to patch/u-boot/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch
diff --git a/patch/u-boot/u-boot-mvebu/target_uart/set_default_boot_target_to_uart.patch b/patch/u-boot/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu/target_uart/set_default_boot_target_to_uart.patch
rename to patch/u-boot/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/ARMADA-A388-SOM-U-Boot-ODT-Update.patch b/patch/u-boot/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/ARMADA-A388-SOM-U-Boot-ODT-Update.patch
rename to patch/u-boot/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/Add-DM-driver-for-mvebu-rtc.patch b/patch/u-boot/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/Add-DM-driver-for-mvebu-rtc.patch
rename to patch/u-boot/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/add-boot-marvell.cmd-backward-compatibility.patch
rename to patch/u-boot/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch b/patch/u-boot/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch
rename to patch/u-boot/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/Add-RTC-to-clearfog.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/Add-RTC-to-clearfog.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/add-clearfog-base-DT.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/add-clearfog-base-DT.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/board-name-to-clearfog-base.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/board-name-to-clearfog-base.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch b/patch/u-boot/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogpro/Add-RTC-to-clearfog.patch b/patch/u-boot/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogpro/Add-RTC-to-clearfog.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_clearfogpro/board-name-to-clearfog-pro.patch b/patch/u-boot/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_clearfogpro/board-name-to-clearfog-pro.patch
rename to patch/u-boot/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_helios4/Add-RTC-to-helios4.patch b/patch/u-boot/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_helios4/Add-RTC-to-helios4.patch
rename to patch/u-boot/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/board_helios4/arm-mvebu-helios4-Update-Load-address.patch b/patch/u-boot/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/board_helios4/arm-mvebu-helios4-Update-Load-address.patch
rename to patch/u-boot/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/enable-DT-overlays-support.patch b/patch/u-boot/u-boot-helios4/enable-DT-overlays-support.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/enable-DT-overlays-support.patch
rename to patch/u-boot/u-boot-helios4/enable-DT-overlays-support.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_spi/clearfog-add-spi-support-in-spl.patch b/patch/u-boot/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_spi/clearfog-add-spi-support-in-spl.patch
rename to patch/u-boot/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_spi/clearfog-set-default-boot-target-to-spi.patch b/patch/u-boot/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_spi/clearfog-set-default-boot-target-to-spi.patch
rename to patch/u-boot/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_spi/helios4-config-set-boot-device-spinor.patch b/patch/u-boot/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_spi/helios4-config-set-boot-device-spinor.patch
rename to patch/u-boot/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_spi/helios4-reorder-boot-device.patch b/patch/u-boot/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_spi/helios4-reorder-boot-device.patch
rename to patch/u-boot/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_uart/clearfog-disable-autoboot-and-env-storage.patch b/patch/u-boot/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_uart/clearfog-disable-autoboot-and-env-storage.patch
rename to patch/u-boot/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch
diff --git a/patch/u-boot/u-boot-mvebu-next/target_uart/helios4-prepare-for-uart-image.patch b/patch/u-boot/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch
similarity index 100%
rename from patch/u-boot/u-boot-mvebu-next/target_uart/helios4-prepare-for-uart-image.patch
rename to patch/u-boot/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch