diff --git a/board/tinkerboard/cpinitramfs.sh b/board/tinkerboard/cpinitramfs.sh
index 3478fc7f1f..ec58579d60 100755
--- a/board/tinkerboard/cpinitramfs.sh
+++ b/board/tinkerboard/cpinitramfs.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-#cp $IMG_DIR/rootfs.cpio.uboot $BOARD_DIR/uInitrd
+cp $IMG_DIR/rootfs.cpio.gz $BOARD_DIR/initrd.gz
 
diff --git a/board/tinkerboard/extlinux/extlinux.conf b/board/tinkerboard/extlinux/extlinux.conf
index d9aec52d42..c66bcf9569 100755
--- a/board/tinkerboard/extlinux/extlinux.conf
+++ b/board/tinkerboard/extlinux/extlinux.conf
@@ -2,4 +2,4 @@ label kernel-4.4
     kernel /zImage
     fdt /rk3288-miniarm.dtb
     append console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1
-    
+
diff --git a/board/tinkerboard/initrd.gz b/board/tinkerboard/initrd.gz
new file mode 100644
index 0000000000..d5f4c29f6c
Binary files /dev/null and b/board/tinkerboard/initrd.gz differ
diff --git a/board/tinkerboard/overlay-initramfs/remove_initramfs b/board/tinkerboard/overlay-initramfs/remove_initramfs
index 716f107a49..536c5b3b90 100755
--- a/board/tinkerboard/overlay-initramfs/remove_initramfs
+++ b/board/tinkerboard/overlay-initramfs/remove_initramfs
@@ -1,7 +1,4 @@
 #!/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
+sed -i 's/^initrd.*//g' /boot/extlinux/extlinux.conf
 
diff --git a/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot b/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
index b993038f1f..40ae425686 100755
--- a/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
+++ b/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-#if [ -f /boot/boot-fwupdater.scr ]; then
-#    mv /boot/boot.scr /boot/boot-normal.scr
-#    mv /boot/boot-fwupdater.scr /boot/boot.scr
-#fi
+echo "    initrd /initrd.gz" >> /boot/extlinux/extlinux.conf
 
diff --git a/configs/tinkerboard_defconfig b/configs/tinkerboard_defconfig
index 1b385d9141..db9ee4a4d2 100644
--- a/configs/tinkerboard_defconfig
+++ b/configs/tinkerboard_defconfig
@@ -40,8 +40,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
-BR2_PACKAGE_SUNXI_BOARDS=y
-BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex"
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
@@ -77,4 +75,5 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_NANO=y
 BR2_PACKAGE_HOST_DTC=y
+BR2_PACKAGE_HOST_SUNXI_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/configs/tinkerboard_initramfs_defconfig b/configs/tinkerboard_initramfs_defconfig
new file mode 100644
index 0000000000..d93c80bc28
--- /dev/null
+++ b/configs/tinkerboard_initramfs_defconfig
@@ -0,0 +1,16 @@
+BR2_arm=y
+BR2_cortex_a17=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-tinkerboard-initramfs"
+BR2_OPTIMIZE_2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/tinkerboard/overlay-initramfs"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
+BR2_PACKAGE_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y