This initial support includes:
Linux v5.2-rc1
Custom U-Boot
Arm Trusted Firmware v2.0
Buildroot default packages
Signed-off-by: Shyam Saini
---
.gitlab-ci.yml | 1 +
DEVELOPERS | 2 ++
board/friendlyarm/nanopi-neo4/extlinux.conf | 4 +++
board/friendlyarm/nanopi-neo4/genimage.cfg | 22
board/friendlyarm/nanopi-neo4/post-build.sh | 9 +
board/friendlyarm/nanopi-neo4/readme.txt| 53 +++
configs/nanopi_neo4_defconfig | 55 +
7 files changed, 146 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo4/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo4/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo4/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo4/readme.txt
create mode 100644 configs/nanopi_neo4_defconfig
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ed1b8f4d5..2f41bcf7c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,6 +181,7 @@ nanopi_m1_defconfig: { extends: .defconfig }
nanopi_m1_plus_defconfig: { extends: .defconfig }
nanopi_m4_defconfig: { extends: .defconfig }
nanopi_neo_defconfig: { extends: .defconfig }
+nanopi_neo4_defconfig: { extends: .defconfig }
nexbox_a95x_defconfig: { extends: .defconfig }
nitrogen6sx_defconfig: { extends: .defconfig }
nitrogen6x_defconfig: { extends: .defconfig }
diff --git a/DEVELOPERS b/DEVELOPERS
index e2ea103d83..55fb022218 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2044,10 +2044,12 @@ F: package/wolfssl/
N: Shyam Saini
F: board/friendlyarm/nanopc-t4/
F: board/friendlyarm/nanopi-m4/
+F: board/friendlyarm/nanopi-neo4/
F: board/olimex/a33_olinuxino/
F: board/orangepi/orangepi-rk3399/
F: configs/nanopc_t4_defconfig
F: configs/nanopi_m4_defconfig
+F: configs/nanopi_neo4_defconfig
F: configs/olimex_a33_olinuxino_defconfig
F: configs/orangepi_rk3399_defconfig
diff --git a/board/friendlyarm/nanopi-neo4/extlinux.conf
b/board/friendlyarm/nanopi-neo4/extlinux.conf
new file mode 100644
index 00..91eef67fb9
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo4/extlinux.conf
@@ -0,0 +1,4 @@
+label NanoPi Neo4 linux
+ kernel /boot/Image
+ devicetree /boot/rk3399-nanopi-neo4.dtb
+ append earlycon=uart8250,mmio32,0xff1a root=/dev/mmcblk1p1 rootwait
diff --git a/board/friendlyarm/nanopi-neo4/genimage.cfg
b/board/friendlyarm/nanopi-neo4/genimage.cfg
new file mode 100644
index 00..b8c1cd5220
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo4/genimage.cfg
@@ -0,0 +1,22 @@
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot-tpl-spl-dtb {
+ in-partition-table = "no"
+ image = "u-boot-tpl-spl-dtb.img"
+ offset = 32K
+ }
+
+ partition u-boot-dtb {
+ in-partition-table = "no"
+ image = "u-boot.itb"
+ offset = 8M
+ size = 30M
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo4/post-build.sh
b/board/friendlyarm/nanopi-neo4/post-build.sh
new file mode 100755
index 00..e852ba6adf
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo4/post-build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOARD_DIR="$(dirname $0)"
+
+$MKIMAGE -n rk3399 -T rksd -d $BINARIES_DIR/u-boot-tpl-dtb.bin
$BINARIES_DIR/u-boot-tpl-dtb.img
+cat $BINARIES_DIR/u-boot-tpl-dtb.img $BINARIES_DIR/u-boot-spl-dtb.bin >
$BINARIES_DIR/u-boot-tpl-spl-dtb.img
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf
$TARGET_DIR/boot/extlinux/extlinux.conf
diff --git a/board/friendlyarm/nanopi-neo4/readme.txt
b/board/friendlyarm/nanopi-neo4/readme.txt
new file mode 100644
index 00..07e3491459
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo4/readme.txt
@@ -0,0 +1,53 @@
+Intro
+=
+
+NanoPi Neo4 is a RK3399 SoC based ARM64 board.
+
+
+Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4
+Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html
+
+Build
+=
+
+Run NanoPi Neo4 configuration
+
+ $ make nanopi_neo4_defconfig
+
+To build, run make comamnd.
+
+ $ make
+
+Files created in output directory
+=
+
+output/images
+
+├── bl31.bin
+├── bl31.elf
+├── Image
+├── rk3399-nanopi-neo4.dtb
+├── rootfs.ext2
+├── rootfs.ext4 -> rootfs.ext2
+├── rootfs.tar
+├── sdcard.img
+├── u-boot.bin
+├── u-boot.itb
+├── u-boot-spl-dtb.bin
+├── u-boot-tpl-dtb.bin
+├── u-boot-tpl-dtb.img
+└── u-boot-tpl-spl-dtb.img
+
+Creating bootable SD card:
+=
+
+Simply invoke (as root)
+
+ # dd if=output/images/sdcard.img of=/dev/sdX && sync
+
+Where X is your SD card device
+
+Serial console
+--
+
+Baudrate for this board is 150
diff --git
