diff --git a/board/nanopineo2/boot-fwupdater.scr b/board/nanopineo2/boot-fwupdater.scr
new file mode 100644
index 0000000000..304451640f
Binary files /dev/null and b/board/nanopineo2/boot-fwupdater.scr differ
diff --git a/board/nanopineo2/boot.scr b/board/nanopineo2/boot.scr
new file mode 100644
index 0000000000..cc56c98d7b
Binary files /dev/null and b/board/nanopineo2/boot.scr differ
diff --git a/board/nanopineo2/mkimage.sh b/board/nanopineo2/mkimage.sh
new file mode 100755
index 0000000000..e9971785f1
--- /dev/null
+++ b/board/nanopineo2/mkimage.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+BOARD_DIR=$(dirname $0)
+COMMON_DIR=$BOARD_DIR/../common
+
+export BOARD=$(basename $BOARD_DIR)
+export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
+export UBOOT_BIN=$BOARD_DIR/u-boot-with-spl.bin
+export UBOOT_SEEK=16
+export PART_START=40960
+source $COMMON_DIR/mkimage.sh
+
+
diff --git a/board/nanopineo2/os.conf b/board/nanopineo2/os.conf
new file mode 100644
index 0000000000..dc77b07e6d
--- /dev/null
+++ b/board/nanopineo2/os.conf
@@ -0,0 +1,2 @@
+os_tty_login="ttyS0"
+
diff --git a/board/nanopineo2/overlay/etc/board b/board/nanopineo2/overlay/etc/board
new file mode 100644
index 0000000000..696369869a
--- /dev/null
+++ b/board/nanopineo2/overlay/etc/board
@@ -0,0 +1 @@
+nanopineo2
diff --git a/board/nanopineo2/overlay/etc/init.d/boardsn b/board/nanopineo2/overlay/etc/init.d/boardsn
new file mode 100755
index 0000000000..34ca56a576
--- /dev/null
+++ b/board/nanopineo2/overlay/etc/init.d/boardsn
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sn=$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d ':')
+echo ${sn: -8}
+
diff --git a/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot b/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot
new file mode 100755
index 0000000000..aa419ef61c
--- /dev/null
+++ b/board/nanopineo2/overlay/usr/libexec/fw-prepare-boot
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sed -r -i 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' /boot/uEnv.txt
+
diff --git a/board/nanopineo2/postscript.sh b/board/nanopineo2/postscript.sh
new file mode 100755
index 0000000000..70522ee003
--- /dev/null
+++ b/board/nanopineo2/postscript.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cp $IMG_DIR/Image $BOOT_DIR
+cp $IMG_DIR/boot.scr $BOOT_DIR
+cp $BOARD_DIR/sun50i-h5-nanopi-neo2.dtb $BOOT_DIR
+#cp $BOARD_DIR/fwupdater.img $BOOT_DIR
+
diff --git a/board/nanopineo2/sun50i-h5-nanopi-neo2.dtb b/board/nanopineo2/sun50i-h5-nanopi-neo2.dtb
new file mode 100644
index 0000000000..d700516d5b
Binary files /dev/null and b/board/nanopineo2/sun50i-h5-nanopi-neo2.dtb differ
diff --git a/board/nanopineo2/u-boot-with-spl.bin b/board/nanopineo2/u-boot-with-spl.bin
new file mode 100644
index 0000000000..2c3ef52e55
Binary files /dev/null and b/board/nanopineo2/u-boot-with-spl.bin differ
diff --git a/configs/nanopineo2_defconfig b/configs/nanopineo2_defconfig
new file mode 100644
index 0000000000..2a6de90e97
--- /dev/null
+++ b/configs/nanopineo2_defconfig
@@ -0,0 +1,76 @@
+BR2_aarch64=y
+BR2_ARM_FPU_VFPV4=y
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo2"
+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"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_TARGET_TZ_INFO=y
+BR2_ROOTFS_OVERLAY="board/common/overlay board/nanopineo2/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/friendlyarm/linux/archive/492574d41038623d5a41c623c033a30533a462a7.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi_arm64"
+BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_NTFS_3G=y
+BR2_PACKAGE_B43_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y
+BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y
+BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
+BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
+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_USB_MODESWITCH_DATA=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_LIBFUSE=y
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCAP=y
+BR2_PACKAGE_PCRE=y
+BR2_PACKAGE_PCRE_UCP=y
+BR2_PACKAGE_AUTOSSH=y
+BR2_PACKAGE_CRDA=y
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NTP=y
+BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_PPPD=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_LOGROTATE=y
+BR2_PACKAGE_TAR=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_PARTX=y
+BR2_PACKAGE_NANO=y
+BR2_PACKAGE_HOST_DTC=y
+BR2_PACKAGE_HOST_E2FSPROGS=y