diff --git a/config/bootscripts/boot-marvell.cmd b/config/bootscripts/boot-marvell.cmd
index 51d792b9d4..78d2d0caac 100644
--- a/config/bootscripts/boot-marvell.cmd
+++ b/config/bootscripts/boot-marvell.cmd
@@ -22,15 +22,15 @@ test -z "${boot_interface}" && setenv boot_interface "mmc"
 
 echo "Boot script loaded from ${boot_interface}"
 
-if ext4load ${boot_interface} 0:1 ${loadaddr} /boot/armbianEnv.txt || ext4load ${boot_interface} 0:1 ${loadaddr} armbianEnv.txt; then
+if load ${boot_interface} 0:1 ${loadaddr} ${prefix}armbianEnv.txt; then
 	env import -t ${loadaddr} ${filesize}
 fi
 
-setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${boot_interface} cgroup_disable=memory scandelay loglevel=${verbosity} ${extraargs}"
+setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${boot_interface} scandelay loglevel=${verbosity} ${extraargs}"
 
-ext4load ${boot_interface} 0:1 ${fdt_addr} boot/dtb/${fdtfile} || ext4load ${boot_interface} 0:1 ${fdt_addr} dtb/${fdtfile}
-ext4load ${boot_interface} 0:1 ${ramdisk_addr_r} boot/uInitrd || ext4load ${boot_interface} 0:1 ${ramdisk_addr_r} uInitrd
-ext4load ${boot_interface} 0:1 ${kernel_addr_r} boot/zImage || ext4load ${boot_interface} 0:1 ${kernel_addr_r} zImage
+load ${boot_interface} 0:1 ${fdt_addr} ${prefix}dtb/${fdtfile}
+load ${boot_interface} 0:1 ${ramdisk_addr_r} ${prefix}uInitrd
+load ${boot_interface} 0:1 ${kernel_addr_r} ${prefix}zImage
 
 setenv fdt_high 0xffffffff
 setenv initrd_high 0xffffffff
diff --git a/patch/u-boot/u-boot-mvebu/loading-boot-scr.patch b/patch/u-boot/u-boot-mvebu/loading-boot-scr.patch
index 69aeb169dd..54f08235d9 100644
--- a/patch/u-boot/u-boot-mvebu/loading-boot-scr.patch
+++ b/patch/u-boot/u-boot-mvebu/loading-boot-scr.patch
@@ -2,7 +2,7 @@ diff --git a/board/mv_ebu/a38x/mv_main_a38x.c b/board/mv_ebu/a38x/mv_main_a38x.c
 index 4b43a9c..748746e 100755
 --- a/board/mv_ebu/a38x/mv_main_a38x.c
 +++ b/board/mv_ebu/a38x/mv_main_a38x.c
-@@ -661,25 +661,31 @@ void misc_init_r_env(void)
+@@ -661,25 +661,33 @@ void misc_init_r_env(void)
  		setenv("enaLPAE", "no");
  #endif
  
@@ -22,8 +22,10 @@ index 4b43a9c..748746e 100755
 -#endif
 +	setenv("fdt_skip_update", "yes");
 +	setenv("boot_a_script",
-+		"ext4load ${boot_interface} 0:1 ${script_addr_r} boot/boot.scr || \
-+		ext4load ${boot_interface} 0:1 ${script_addr_r} boot.scr; source ${script_addr_r}");
++		"for prefix in /boot/ /; do \
++		load ${boot_interface} 0:1 ${script_addr_r} ${prefix}boot.scr && \
++		source ${script_addr_r}; \
++		done");
 +	setenv("mmcboot",
 +		"setenv boot_interface mmc; run boot_a_script;");
 +	setenv("sataboot",
@@ -49,3 +51,15 @@ index 4b43a9c..748746e 100755
  		"setenv bootargs $console $nandEcc $mtdparts $bootargs_root nfsroot=$serverip:$rootpath "
  		"ip=$ipaddr:$serverip$bootargs_end $mvNetConfig video=dovefb:lcd0:$lcd0_params "
  		"clcd.lcd0_enable=$lcd0_enable clcd.lcd_panel=$lcd_panel; bootz 0x2000000 - $fdtaddr;");
+diff --git a/include/configs/armada_38x.h b/include/configs/armada_38x.h
+index 75b8bf5..27cf703 100644
+--- a/include/configs/armada_38x.h
++++ b/include/configs/armada_38x.h
+@@ -162,6 +162,7 @@ extern unsigned int mvUartPortGet(void);
+ #define CONFIG_CMD_RCVR
+ #define CONFIG_CMD_BOOT_MENU
+ #define CONFIG_CMD_SYS_RESTORE
++#define CONFIG_CMD_FS_GENERIC
+ /* Open this define for enabling Secure Boot Mode eFuses modification
+ #define CONFIG_CMD_EFUSE
+ */