wip

config/buildroot_nano.patch

@@ -2,17 +2,10 @@
  board/friendlyarm/nanopi-neo-plus2/genimage.cfg    |  5 +-
  .../nanopi-neo-plus2/linux-extras.config           | 11 +++
  .../nanopi-neo-plus2/nanopi-neo-plus2.dts          |  7 ++
-<<<<<<< HEAD
- configs/friendlyarm_nanopi_neo_plus2_defconfig     | 97 +++++++++++++---------
+ configs/friendlyarm_nanopi_neo_plus2_defconfig     | 98 +++++++++++++---------
  package/dropbear/S50dropbear                       |  2 +-
  package/openssh/S50sshd                            |  3 +
- 7 files changed, 87 insertions(+), 43 deletions(-)
-=======
- configs/friendlyarm_nanopi_neo_plus2_defconfig     | 94 +++++++++++++---------
- package/dropbear/S50dropbear                       |  2 +-
- package/openssh/S50sshd                            |  3 +
- 7 files changed, 85 insertions(+), 43 deletions(-)
->>>>>>> aad1196baf300c08bae4d467324a8e857a207196
+ 7 files changed, 89 insertions(+), 43 deletions(-)
 
 diff --git a/board/friendlyarm/nanopi-neo-plus2/boot.cmd b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
 new file mode 100644
@@ -81,10 +74,10 @@ index 0000000000..f80383b0ff
 +        /delete-node/ leds;
 +};
 diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig
-index 461e468cb6..23ed244b7e 100644
+index 461e468cb6..69e549f56b 100644
 --- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
 +++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig
-@@ -1,24 +1,69 @@
+@@ -1,24 +1,70 @@
  BR2_aarch64=y
 -BR2_cortex_a53=y
  BR2_ARM_FPU_VFPV4=y
@@ -108,6 +101,7 @@ index 461e468cb6..23ed244b7e 100644
 +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-neo-plus2/nanopi-neo-plus2.dts"
 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 +BR2_PACKAGE_LINUX_TOOLS_PERF=y
++BR2_PACKAGE_LINUX_TOOLS_PERF_TUI=y
 +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 +BR2_PACKAGE_GDB=y
 +BR2_PACKAGE_GDB_SERVER=y
@@ -164,7 +158,7 @@ index 461e468cb6..23ed244b7e 100644
  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2"
  BR2_TARGET_UBOOT_NEEDS_DTC=y
  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-@@ -27,36 +72,8 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+@@ -27,36 +73,8 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
  BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
  BR2_TARGET_UBOOT_SPL=y
  BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"