diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index 5622a80e5f66b60285e42c8d7e9bbd2b89c3ef56..9af2f2266ab4c8bd55eb33e1039b23775febd0b3 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -1,17 +1,17 @@
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 +
- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 40 ++
- board/friendlyarm/nanopi-neo-plus2/linux.patch | 382 ++++++++++++
- board/friendlyarm/nanopi-neo-plus2/linux_defconfig | 679 +++++++++++++++++++++
+ board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 45 ++
+ board/friendlyarm/nanopi-neo-plus2/linux.patch | 382 +++++++++++
+ board/friendlyarm/nanopi-neo-plus2/linux_defconfig | 728 +++++++++++++++++++++
board/friendlyarm/nanopi-neo-plus2/my.dts | 12 +
.../friendlyarm/nanopi-neo-plus2/overlay/etc/fstab | 9 +
.../overlay/etc/network/interfaces | 10 +
board/friendlyarm/nanopi-neo-plus2/readme.txt | 37 ++
board/friendlyarm/nanopi-neo-plus2/uboot.patch | 24 +
board/friendlyarm/nanopi-neo-plus2/uboot_defconfig | 16 +
- configs/nanopi_neo_plus2_defconfig | 86 +++
+ configs/nanopi_neo_plus2_defconfig | 103 +++
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
- 13 files changed, 1305 insertions(+), 1 deletion(-)
+ 13 files changed, 1376 insertions(+), 1 deletion(-)
diff --git a/board/friendlyarm/nanopi-neo-plus2/boot.cmd b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
new file mode 100644
@@ -27,10 +27,10 @@ index 0000000000..227604a23d
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
new file mode 100644
-index 0000000000..9072d815b3
+index 0000000000..8b2e674e37
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,45 @@
+image boot.vfat {
+ vfat {
+ files = {
@@ -65,10 +65,15 @@ index 0000000000..9072d815b3
+ image = "boot.vfat"
+ }
+
++ partition squashfs {
++ partition-type = 0x83
++ image = "rootfs.squashfs"
++ }
++
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
-+ size = 1G
++ size = 2G
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux.patch b/board/friendlyarm/nanopi-neo-plus2/linux.patch
@@ -461,10 +466,10 @@ index 0000000000..81dab72ca1
++MODULE_LICENSE("GPL v2");
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux_defconfig b/board/friendlyarm/nanopi-neo-plus2/linux_defconfig
new file mode 100644
-index 0000000000..fc65b2cbeb
+index 0000000000..878f31d303
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo-plus2/linux_defconfig
-@@ -0,0 +1,679 @@
+@@ -0,0 +1,728 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
@@ -592,14 +597,64 @@ index 0000000000..fc65b2cbeb
+CONFIG_IP_MROUTE=y
+CONFIG_IPV6=m
+CONFIG_NETFILTER=y
-+CONFIG_NF_CONNTRACK=m
++CONFIG_NETFILTER_NETLINK_ACCT=y
++CONFIG_NETFILTER_NETLINK_QUEUE=y
++CONFIG_NETFILTER_NETLINK_LOG=y
++CONFIG_NETFILTER_NETLINK_OSF=y
++CONFIG_NF_CONNTRACK=y
++CONFIG_NF_LOG_NETDEV=y
++CONFIG_NF_CONNTRACK_MARK=y
++CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
++CONFIG_NF_CONNTRACK_TIMEOUT=y
++CONFIG_NF_CONNTRACK_TIMESTAMP=y
++CONFIG_NF_CONNTRACK_LABELS=y
++CONFIG_NF_CONNTRACK_AMANDA=y
++CONFIG_NF_CONNTRACK_FTP=y
++CONFIG_NF_CONNTRACK_IRC=y
++CONFIG_NF_CONNTRACK_NETBIOS_NS=y
++CONFIG_NF_CONNTRACK_SNMP=y
++CONFIG_NF_CONNTRACK_PPTP=y
++CONFIG_NF_CONNTRACK_SANE=y
++CONFIG_NF_CONNTRACK_SIP=y
++CONFIG_NF_CONNTRACK_TFTP=y
++CONFIG_NF_CT_NETLINK=y
++CONFIG_NF_CT_NETLINK_TIMEOUT=y
++CONFIG_NF_CT_NETLINK_HELPER=m
++CONFIG_NETFILTER_NETLINK_GLUE_CT=y
++CONFIG_NF_TABLES=y
++CONFIG_NF_TABLES_SET=y
++CONFIG_NF_TABLES_INET=y
++CONFIG_NF_TABLES_NETDEV=y
++CONFIG_NFT_NUMGEN=y
++CONFIG_NFT_CT=y
++CONFIG_NFT_COUNTER=y
++CONFIG_NFT_CONNLIMIT=y
++CONFIG_NFT_LOG=y
++CONFIG_NFT_LIMIT=y
++CONFIG_NFT_MASQ=m
++CONFIG_NFT_REDIR=m
++CONFIG_NFT_NAT=y
++CONFIG_NFT_TUNNEL=y
++CONFIG_NFT_OBJREF=y
++CONFIG_NFT_QUEUE=y
++CONFIG_NFT_QUOTA=y
++CONFIG_NFT_REJECT=m
++CONFIG_NFT_COMPAT=m
++CONFIG_NFT_HASH=y
++CONFIG_NFT_XFRM=y
++CONFIG_NFT_SOCKET=m
++CONFIG_NFT_OSF=m
++CONFIG_NFT_TPROXY=m
++CONFIG_NFT_DUP_NETDEV=y
++CONFIG_NFT_FWD_NETDEV=y
++CONFIG_NF_FLOW_TABLE=y
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_IPTABLES=y
++CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1143,7 +1198,6 @@ index 0000000000..fc65b2cbeb
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_MEMTEST=y
-+
diff --git a/board/friendlyarm/nanopi-neo-plus2/my.dts b/board/friendlyarm/nanopi-neo-plus2/my.dts
new file mode 100644
index 0000000000..354d4ad530
@@ -1290,15 +1344,14 @@ index 0000000000..f1c64ba55e
+CONFIG_USB_EHCI_HCD=y
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
-index 0000000000..be6f2b0424
+index 0000000000..67e02d726b
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,103 @@
+BR2_aarch64=y
+BR2_ARM_FPU_VFPV4=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_PACKAGE_HOST_GDB=y
-+BR2_GDB_VERSION_8_2=y
+BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
@@ -1336,11 +1389,28 @@ index 0000000000..be6f2b0424
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_MICROPYTHON=y
+BR2_PACKAGE_MICROPYTHON_LIB=y
++BR2_PACKAGE_SQLITE=y
++BR2_PACKAGE_SQLITE_STAT3=y
++BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA=y
++BR2_PACKAGE_SQLITE_ENABLE_FTS3=y
++BR2_PACKAGE_SQLITE_ENABLE_JSON1=y
++BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y
++BR2_PACKAGE_SQLITE_SECURE_DELETE=y
++BR2_PACKAGE_SQLITE_NO_SYNC=y
++BR2_PACKAGE_LIBNETFILTER_ACCT=y
++BR2_PACKAGE_LIBNETFILTER_CONNTRACK=y
++BR2_PACKAGE_LIBNETFILTER_CTHELPER=y
++BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT=y
++BR2_PACKAGE_LIBNETFILTER_LOG=y
++BR2_PACKAGE_LIBNETFILTER_QUEUE=y
+BR2_PACKAGE_ELFUTILS_PROGS=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_NCURSES_TARGET_PROGS=y
+BR2_PACKAGE_HAVEGED=y
+BR2_PACKAGE_DROPBEAR=y
++BR2_PACKAGE_IPTABLES=y
++BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y
++BR2_PACKAGE_IPTABLES_NFTABLES=y
+BR2_PACKAGE_IPUTILS=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_HTOP=y
@@ -1350,6 +1420,7 @@ index 0000000000..be6f2b0424
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs"
+BR2_TARGET_ROOTFS_EXT2_SIZE="160M"
++BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"