diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index 08eac251f90e546b9ce062d9fdcbc4b0724de92f..83d60c749ba019a1fe71419c55a2cd3835005423 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -1,12 +1,15 @@
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 +
board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 40 ++
- board/friendlyarm/nanopi-neo-plus2/linux.patch | 385 ++++++++++++
- board/friendlyarm/nanopi-neo-plus2/linux_defconfig | 693 +++++++++++++++++++++
+ board/friendlyarm/nanopi-neo-plus2/linux.patch | 382 ++++++++++++
+ board/friendlyarm/nanopi-neo-plus2/linux_defconfig | 681 +++++++++++++++++++++
+ board/friendlyarm/nanopi-neo-plus2/my.dts | 12 +
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 | 72 +++
- 8 files changed, 1273 insertions(+)
+ configs/nanopi_neo_plus2_defconfig | 84 +++
+ package/dropbear/S50dropbear | 2 +-
+ package/openssh/S50sshd | 3 +
+ 11 files changed, 1286 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
@@ -68,23 +71,23 @@ index 0000000000..9072d815b3
+}
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux.patch b/board/friendlyarm/nanopi-neo-plus2/linux.patch
new file mode 100644
-index 0000000000..e921c2927c
+index 0000000000..81dab72ca1
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo-plus2/linux.patch
-@@ -0,0 +1,385 @@
+@@ -0,0 +1,382 @@
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 20 ++
+ .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 +-
-+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 18 +-
++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 15 +-
+ drivers/thermal/Kconfig | 7 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/sun8i_ths.c | 239 +++++++++++++++++++++
-+ 6 files changed, 284 insertions(+), 4 deletions(-)
++ 6 files changed, 281 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-+index c3bff1105e5d..4364546956ba 100644
++index d74a6cbbfdf4..06144aace59b 100644
+--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
++++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-+@@ -488,6 +488,18 @@
++@@ -483,6 +483,18 @@
+ };
+ };
+
@@ -103,7 +106,7 @@ index 0000000000..e921c2927c
+ timer@1c20c00 {
+ compatible = "allwinner,sun4i-a10-timer";
+ reg = <0x01c20c00 0xa0>;
-+@@ -857,4 +869,12 @@
++@@ -866,4 +878,12 @@
+ };
+ };
+ };
@@ -138,7 +141,7 @@ index 0000000000..e921c2927c
+
+ reg_gmac_3v3: gmac-3v3 {
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-+index 62d646baac3c..4b33aefc975e 100644
++index 96acafd3a852..690420d926b6 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+@@ -54,21 +54,21 @@
@@ -147,7 +150,7 @@ index 0000000000..e921c2927c
+
+- cpu@1 {
++ cpu1: cpu@1 {
-+ compatible = "arm,cortex-a53", "arm,armv8";
++ compatible = "arm,cortex-a53";
+ device_type = "cpu";
+ reg = <1>;
+ enable-method = "psci";
@@ -155,7 +158,7 @@ index 0000000000..e921c2927c
+
+- cpu@2 {
++ cpu2: cpu@2 {
-+ compatible = "arm,cortex-a53", "arm,armv8";
++ compatible = "arm,cortex-a53";
+ device_type = "cpu";
+ reg = <2>;
+ enable-method = "psci";
@@ -163,10 +166,10 @@ index 0000000000..e921c2927c
+
+- cpu@3 {
++ cpu3: cpu@3 {
-+ compatible = "arm,cortex-a53", "arm,armv8";
++ compatible = "arm,cortex-a53";
+ device_type = "cpu";
+ reg = <3>;
-+@@ -76,6 +76,18 @@
++@@ -76,6 +76,15 @@
+ };
+ };
+
@@ -176,20 +179,17 @@ index 0000000000..e921c2927c
++ <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
++ <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
++ <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
-++ interrupt-affinity = <&cpu0>,
-++ <&cpu1>,
-++ <&cpu2>,
-++ <&cpu3>;
+++ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
++ };
++
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
-+index 82979880f985..9f8d8bbc6ff3 100644
++index 653aa27a25a4..6cb1a6dd69d6 100644
+--- a/drivers/thermal/Kconfig
++++ b/drivers/thermal/Kconfig
-+@@ -420,6 +420,13 @@ depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
++@@ -349,6 +349,13 @@ depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM_IPROC || \
+ source "drivers/thermal/broadcom/Kconfig"
+ endmenu
+
@@ -204,10 +204,10 @@ index 0000000000..e921c2927c
+ depends on ARCH_HAS_BANDGAP || COMPILE_TEST
+ depends on HAS_IOMEM
+diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
-+index 610344eb3e03..dc8a24fddba9 100644
++index 486d682be047..76cc16097a90 100644
+--- a/drivers/thermal/Makefile
++++ b/drivers/thermal/Makefile
-+@@ -61,3 +61,4 @@ obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o
++@@ -53,3 +53,4 @@ obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o
+ obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o
+ obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o
+ obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
@@ -459,15 +459,16 @@ index 0000000000..e921c2927c
++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..b69419a154
+index 0000000000..57311c69ff
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo-plus2/linux_defconfig
-@@ -0,0 +1,693 @@
+@@ -0,0 +1,681 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
++CONFIG_PREEMPT=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -493,9 +494,6 @@ index 0000000000..b69419a154
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_PROFILING=y
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_ALPINE=y
+CONFIG_ARCH_BCM2835=y
@@ -510,17 +508,11 @@ index 0000000000..b69419a154
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_QCOM=y
++CONFIG_ARCH_RENESAS=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
-+CONFIG_ARCH_SYNQUACER=y
-+CONFIG_ARCH_RENESAS=y
-+CONFIG_ARCH_R8A7795=y
-+CONFIG_ARCH_R8A7796=y
-+CONFIG_ARCH_R8A77965=y
-+CONFIG_ARCH_R8A77970=y
-+CONFIG_ARCH_R8A77980=y
-+CONFIG_ARCH_R8A77995=y
+CONFIG_ARCH_STRATIX10=y
++CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_SPRD=y
+CONFIG_ARCH_THUNDER=y
@@ -530,35 +522,13 @@ index 0000000000..b69419a154
+CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_ZX=y
+CONFIG_ARCH_ZYNQMP=y
-+CONFIG_PCI=y
-+CONFIG_PCI_IOV=y
-+CONFIG_HOTPLUG_PCI=y
-+CONFIG_HOTPLUG_PCI_ACPI=y
-+CONFIG_PCI_AARDVARK=y
-+CONFIG_PCI_TEGRA=y
-+CONFIG_PCIE_RCAR=y
-+CONFIG_PCI_HOST_GENERIC=y
-+CONFIG_PCI_XGENE=y
-+CONFIG_PCI_HOST_THUNDER_PEM=y
-+CONFIG_PCI_HOST_THUNDER_ECAM=y
-+CONFIG_PCI_LAYERSCAPE=y
-+CONFIG_PCI_HISI=y
-+CONFIG_PCIE_QCOM=y
-+CONFIG_PCIE_ARMADA_8K=y
-+CONFIG_PCIE_KIRIN=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_NUMA=y
-+CONFIG_PREEMPT=y
-+CONFIG_KSM=y
-+CONFIG_MEMORY_FAILURE=y
-+CONFIG_TRANSPARENT_HUGEPAGE=y
-+CONFIG_CMA=y
+CONFIG_SECCOMP=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_XEN=y
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_COMPAT=y
+CONFIG_HIBERNATION=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
@@ -573,9 +543,38 @@ index 0000000000..b69419a154
+CONFIG_CPUFREQ_DT=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
-+CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
+CONFIG_ARM_SCPI_CPUFREQ=y
+CONFIG_ARM_TEGRA186_CPUFREQ=y
++CONFIG_ARM_SCPI_PROTOCOL=y
++# CONFIG_DMIID is not set
++CONFIG_EFI_CAPSULE_LOADER=y
++CONFIG_ACPI=y
++CONFIG_ACPI_APEI=y
++CONFIG_ACPI_APEI_GHES=y
++CONFIG_ACPI_APEI_MEMORY_FAILURE=y
++CONFIG_ACPI_APEI_EINJ=y
++CONFIG_VIRTUALIZATION=y
++CONFIG_KVM=y
++CONFIG_ARM64_CRYPTO=y
++CONFIG_CRYPTO_SHA1_ARM64_CE=y
++CONFIG_CRYPTO_SHA2_ARM64_CE=y
++CONFIG_CRYPTO_SHA512_ARM64_CE=m
++CONFIG_CRYPTO_SHA3_ARM64=m
++CONFIG_CRYPTO_SM3_ARM64_CE=m
++CONFIG_CRYPTO_GHASH_ARM64_CE=y
++CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
++CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
++CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
++CONFIG_CRYPTO_CHACHA20_NEON=m
++CONFIG_CRYPTO_AES_ARM64_BS=m
++CONFIG_JUMP_LABEL=y
++CONFIG_MODULES=y
++CONFIG_MODULE_UNLOAD=y
++# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
++CONFIG_KSM=y
++CONFIG_MEMORY_FAILURE=y
++CONFIG_TRANSPARENT_HUGEPAGE=y
++CONFIG_CMA=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
@@ -597,14 +596,12 @@ index 0000000000..b69419a154
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_MANGLE=m
-+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
@@ -634,10 +631,25 @@ index 0000000000..b69419a154
+CONFIG_RFKILL=m
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
++CONFIG_PCI=y
++CONFIG_PCI_IOV=y
++CONFIG_HOTPLUG_PCI=y
++CONFIG_HOTPLUG_PCI_ACPI=y
++CONFIG_PCI_AARDVARK=y
++CONFIG_PCI_TEGRA=y
++CONFIG_PCIE_RCAR=y
++CONFIG_PCI_HOST_GENERIC=y
++CONFIG_PCI_XGENE=y
++CONFIG_PCI_HOST_THUNDER_PEM=y
++CONFIG_PCI_HOST_THUNDER_ECAM=y
++CONFIG_PCI_LAYERSCAPE=y
++CONFIG_PCI_HISI=y
++CONFIG_PCIE_QCOM=y
++CONFIG_PCIE_ARMADA_8K=y
++CONFIG_PCIE_KIRIN=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_DMA_CMA=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
@@ -692,7 +704,6 @@ index 0000000000..b69419a154
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
-+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
@@ -706,7 +717,6 @@ index 0000000000..b69419a154
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_INTEL is not set
-+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
@@ -717,7 +727,6 @@ index 0000000000..b69419a154
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
-+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
@@ -832,7 +841,6 @@ index 0000000000..b69419a154
+CONFIG_PINCTRL_MSM8996=y
+CONFIG_PINCTRL_QDF2XXX=y
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
-+CONFIG_PINCTRL_MT7622=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_BRCMSTB is not set
+CONFIG_GPIO_DWAPB=y
@@ -852,7 +860,6 @@ index 0000000000..b69419a154
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
-+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_RCAR_GEN3_THERMAL=y
+CONFIG_BRCMSTB_THERMAL=m
+CONFIG_SUN8I_THS=y
@@ -869,8 +876,6 @@ index 0000000000..b69419a154
+CONFIG_BCM2835_WDT=y
+CONFIG_MFD_AXP20X_RSB=y
+CONFIG_MFD_CROS_EC=y
-+CONFIG_MFD_CROS_EC_I2C=y
-+CONFIG_MFD_CROS_EC_SPI=y
+CONFIG_MFD_EXYNOS_LPASS=m
+CONFIG_MFD_HI6421_PMIC=y
+CONFIG_MFD_HI655X_PMIC=y
@@ -923,7 +928,6 @@ index 0000000000..b69419a154
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_DRM_RCAR_DU=m
-+CONFIG_DRM_RCAR_LVDS=m
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_I2C_ADV7511=m
@@ -1065,6 +1069,12 @@ index 0000000000..b69419a154
+CONFIG_QCOM_SMD_RPM=y
+CONFIG_QCOM_SMP2P=y
+CONFIG_QCOM_SMSM=y
++CONFIG_ARCH_R8A7795=y
++CONFIG_ARCH_R8A7796=y
++CONFIG_ARCH_R8A77965=y
++CONFIG_ARCH_R8A77970=y
++CONFIG_ARCH_R8A77980=y
++CONFIG_ARCH_R8A77995=y
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
@@ -1101,14 +1111,6 @@ index 0000000000..b69419a154
+CONFIG_MESON_EFUSE=m
+CONFIG_TEE=y
+CONFIG_OPTEE=y
-+CONFIG_ARM_SCPI_PROTOCOL=y
-+# CONFIG_DMIID is not set
-+CONFIG_EFI_CAPSULE_LOADER=y
-+CONFIG_ACPI=y
-+CONFIG_ACPI_APEI=y
-+CONFIG_ACPI_APEI_GHES=y
-+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-+CONFIG_ACPI_APEI_EINJ=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
@@ -1129,8 +1131,10 @@ index 0000000000..b69419a154
+CONFIG_9P_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
-+CONFIG_VIRTUALIZATION=y
-+CONFIG_KVM=y
++CONFIG_SECURITY=y
++CONFIG_CRYPTO_ECHAINIV=y
++CONFIG_CRYPTO_ANSI_CPRNG=y
++CONFIG_DMA_CMA=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_FS=y
@@ -1140,22 +1144,24 @@ index 0000000000..b69419a154
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_FTRACE is not set
+CONFIG_MEMTEST=y
-+CONFIG_SECURITY=y
-+CONFIG_CRYPTO_ECHAINIV=y
-+CONFIG_CRYPTO_ANSI_CPRNG=y
-+CONFIG_ARM64_CRYPTO=y
-+CONFIG_CRYPTO_SHA1_ARM64_CE=y
-+CONFIG_CRYPTO_SHA2_ARM64_CE=y
-+CONFIG_CRYPTO_SHA512_ARM64_CE=m
-+CONFIG_CRYPTO_SHA3_ARM64=m
-+CONFIG_CRYPTO_SM3_ARM64_CE=m
-+CONFIG_CRYPTO_GHASH_ARM64_CE=y
-+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-+CONFIG_CRYPTO_CRC32_ARM64_CE=m
-+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-+CONFIG_CRYPTO_CHACHA20_NEON=m
-+CONFIG_CRYPTO_AES_ARM64_BS=m
+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
+--- /dev/null
++++ b/board/friendlyarm/nanopi-neo-plus2/my.dts
+@@ -0,0 +1,12 @@
++/dts-v1/;
++
++#include "sun50i-h5-nanopi-neo-plus2.dts"
++
++/ {
++ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
++
++ mymodule2 {
++ compatible = "mymodule2";
++ alpha2 = "on";
++ };
++};
diff --git a/board/friendlyarm/nanopi-neo-plus2/readme.txt b/board/friendlyarm/nanopi-neo-plus2/readme.txt
new file mode 100644
index 0000000000..0f445e2bea
@@ -1253,26 +1259,26 @@ 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..d44e8690a8
+index 0000000000..33ca9b4aa8
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,84 @@
+BR2_aarch64=y
+BR2_ARM_FPU_VFPV4=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_PACKAGE_HOST_GDB=y
-+BR2_GDB_VERSION_8_0=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"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg"
+BR2_LINUX_KERNEL=y
-+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.5"
+BR2_LINUX_KERNEL_PATCH="board/friendlyarm/nanopi-neo-plus2/linux.patch"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-neo-plus2/linux_defconfig"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2"
++BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
@@ -1284,13 +1290,25 @@ index 0000000000..d44e8690a8
+BR2_PACKAGE_GDB_SERVER=y
+BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_LSOF=y
++BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_OPROFILE=y
+BR2_PACKAGE_STRACE=y
++BR2_PACKAGE_TRACE_CMD=y
+BR2_PACKAGE_VALGRIND=y
++BR2_PACKAGE_BINUTILS_TARGET=y
++BR2_PACKAGE_QT5=y
++BR2_PACKAGE_XORG7=y
+BR2_PACKAGE_I2C_TOOLS=y
++BR2_PACKAGE_MEMTOOL=y
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_MICROPYTHON=y
+BR2_PACKAGE_MICROPYTHON_LIB=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_IPUTILS=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_PROCPS_NG=y
@@ -1307,7 +1325,7 @@ index 0000000000..d44e8690a8
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
++BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
+BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo-plus2/uboot.patch"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-neo-plus2/uboot_defconfig"
@@ -1329,3 +1347,30 @@ index 0000000000..d44e8690a8
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
+diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
+index 9474eaafaa..bb8e75850e 100644
+--- a/package/dropbear/S50dropbear
++++ b/package/dropbear/S50dropbear
+@@ -7,7 +7,7 @@
+ test -r /etc/default/dropbear && . /etc/default/dropbear
+
+ start() {
+- DROPBEAR_ARGS="$DROPBEAR_ARGS -R"
++ DROPBEAR_ARGS="$DROPBEAR_ARGS -R -B"
+
+ # If /etc/dropbear is a symlink to /var/run/dropbear, and
+ # - the filesystem is RO (i.e. we can not rm the symlink),
+diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd
+index 22da41d1ca..d4d2def008 100644
+--- a/package/openssh/S50sshd
++++ b/package/openssh/S50sshd
+@@ -3,6 +3,9 @@
+ # sshd Starts sshd.
+ #
+
++# Exit if dropbear start script exists
++[ -f /etc/init.d/S50dropbear ] && exit 0
++
+ # Make sure the ssh-keygen progam exists
+ [ -f /usr/bin/ssh-keygen ] || exit 0
+
diff --git a/nano-env b/nano-env
index d1fc85d110a6e6c09835d79be4e1198ccb55d8c8..fa8eb2d205a220e5d3fc7e5bc8d10236cac67336 100755
--- a/nano-env
+++ b/nano-env
@@ -10,6 +10,6 @@ mkdir -p ~/workspace/nano
cd ~/workspace/nano
git clone git://git.buildroot.net/buildroot
cd buildroot
-git checkout -b nano 2018.05.2
+git checkout -b nano 2019.05.1
patch -p1 < ${SCRIPTDIR}/config/buildroot_nano.patch
make nanopi_neo_plus2_defconfig