diff --git a/board/bananapi/boot-fwupdater.cmd b/board/bananapi/boot-fwupdater.cmd
index dec6a46ac7..ce854c9be1 100644
--- a/board/bananapi/boot-fwupdater.cmd
+++ b/board/bananapi/boot-fwupdater.cmd
@@ -1,8 +1,8 @@
 setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra}
 setenv fdt_high ffffffff
 setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
-fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
 fatload mmc 0 0x41000000 uImage
+fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
 fatload mmc 0 0x45000000 uInitrd
-bootm 0x43000000 0x41000000 0x45000000
+bootm 0x41000000 0x45000000 0x43000000
 
diff --git a/board/bananapi/boot.cmd b/board/bananapi/boot.cmd
index 28f43dc899..9e9ec4851b 100644
--- a/board/bananapi/boot.cmd
+++ b/board/bananapi/boot.cmd
@@ -1,7 +1,7 @@
 setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra}
 setenv fdt_high ffffffff
 setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
-fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
 fatload mmc 0 0x41000000 uImage
-bootm 0x43000000 - 0x45000000
+fatload mmc 0 0x43000000 sun7i-a20-bananapi.dtb
+bootm 0x41000000 - 0x43000000
 
diff --git a/board/bananapi/overlay-initramfs/remove_initramfs b/board/bananapi/overlay-initramfs/remove_initramfs
new file mode 100755
index 0000000000..81c5f6adde
--- /dev/null
+++ b/board/bananapi/overlay-initramfs/remove_initramfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -f /boot/boot-normal.scr ]; then
+    mv /boot/boot.scr /boot/boot-fwupdater.scr
+    mv /boot/boot-normal.scr /boot/boot.scr
+fi
+
diff --git a/board/bananapi/overlay/usr/libexec/fw-prepare-boot b/board/bananapi/overlay/usr/libexec/fw-prepare-boot
index 3617a48109..86f340ad02 100755
--- a/board/bananapi/overlay/usr/libexec/fw-prepare-boot
+++ b/board/bananapi/overlay/usr/libexec/fw-prepare-boot
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ -f /boot/boot-fwupdater.scr ] then
+if [ -f /boot/boot-fwupdater.scr ]; then
     mv /boot/boot.scr /boot/boot-normal.scr
     mv /boot/boot-fwupdater.scr /boot/boot.scr
 fi
diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh
index 633c3505da..9c46b9aa1b 100755
--- a/board/bananapi/postscript.sh
+++ b/board/bananapi/postscript.sh
@@ -8,3 +8,5 @@ cp $IMG_DIR/sun7i-a20-bananapi.dtb $BOOT_DIR
 $UBOOT_HOST_DIR/tools/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
 $UBOOT_HOST_DIR/tools/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
 
+cp $BOARD_DIR/uInitrd $BOOT_DIR
+
diff --git a/board/bananapi/uInitrd b/board/bananapi/uInitrd
new file mode 100644
index 0000000000..efc46c2fdd
Binary files /dev/null and b/board/bananapi/uInitrd differ
diff --git a/configs/bananapi_initramfs_defconfig b/configs/bananapi_initramfs_defconfig
new file mode 100644
index 0000000000..bf8a06a8ce
--- /dev/null
+++ b/configs/bananapi_initramfs_defconfig
@@ -0,0 +1,16 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_DL_DIR="$(TOPDIR)/.download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapi-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapi/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+# BR2_TARGET_ROOTFS_TAR is not set