diff mbox series

[1/3] board/friendlyarm: Add support for friendlyarm nanopi neo4 board

Message ID 20190604085307.15756-1-shyam.saini@amarulasolutions.com
State Accepted
Headers show
Series [1/3] board/friendlyarm: Add support for friendlyarm nanopi neo4 board | expand

Commit Message

Shyam Saini June 4, 2019, 8:53 a.m. UTC 
This initial support includes:
        Linux v5.2-rc1
        Custom U-Boot
        Arm Trusted Firmware v2.0
        Buildroot default packages

Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
---
 .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

Comments

Thomas Petazzoni Aug. 3, 2019, 5:55 a.m. UTC | #1 
Hello Shyam,

On Tue,  4 Jun 2019 14:23:05 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> This initial support includes:
>         Linux v5.2-rc1
>         Custom U-Boot
>         Arm Trusted Firmware v2.0
>         Buildroot default packages
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>

I have finally applied this series. There were a few things to adjust
though, which were identical in all three patches, so I'll only comment
on this one, but it also applied to the 2 other patches in this series.

First, the commit title should be:

	configs/nanopi_neo4: new defconfig



> diff --git a/configs/nanopi_neo4_defconfig b/configs/nanopi_neo4_defconfig
> new file mode 100644
> index 0000000000..f75f4367a9
> --- /dev/null
> +++ b/configs/nanopi_neo4_defconfig
> @@ -0,0 +1,55 @@
> +# Architecture
> +BR2_aarch64=y
> +BR2_cortex_a72_a53=y
> +
> +# Linux headers 5.1 series
> +BR2_KERNEL_HEADERS_5_1=y

All defconfigs that build their own kernel should use the "Same as
kernel" mechanism for kernel headers. So this should have been:

# Linux headers same as kernel, a 5.2 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y


> +# Kernel
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="v5.2-rc1"

I switched to using the final 5.2 kernel.

> +BR2_TARGET_ROOTFS_EXT2_SIZE="512M"

And dropped this one, to simply use the default ext4 filesystem size.

As I said, I fixed those details on all three defconfigs, and applied
all of them.

Thanks!

Thomas
Shyam Saini Aug. 12, 2019, 6:50 a.m. UTC | #2 
Hi Thomas,


Sorry for the late reply.

> Hello Shyam,
>
> On Tue,  4 Jun 2019 14:23:05 +0530
> Shyam Saini <shyam.saini@amarulasolutions.com> wrote:
>
> > This initial support includes:
> >         Linux v5.2-rc1
> >         Custom U-Boot
> >         Arm Trusted Firmware v2.0
> >         Buildroot default packages
> >
> > Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
>
> I have finally applied this series. There were a few things to adjust
> though, which were identical in all three patches, so I'll only comment
> on this one, but it also applied to the 2 other patches in this series.
>
> First, the commit title should be:
>
>         configs/nanopi_neo4: new defconfig

Will take care of these things next time for sure.

>
>
>
> > diff --git a/configs/nanopi_neo4_defconfig b/configs/nanopi_neo4_defconfig
> > new file mode 100644
> > index 0000000000..f75f4367a9
> > --- /dev/null
> > +++ b/configs/nanopi_neo4_defconfig
> > @@ -0,0 +1,55 @@
> > +# Architecture
> > +BR2_aarch64=y
> > +BR2_cortex_a72_a53=y
> > +
> > +# Linux headers 5.1 series
> > +BR2_KERNEL_HEADERS_5_1=y
>
> All defconfigs that build their own kernel should use the "Same as
> kernel" mechanism for kernel headers. So this should have been:
>
> # Linux headers same as kernel, a 5.2 series
> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y

>
>
> > +# Kernel
> > +BR2_LINUX_KERNEL=y
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="v5.2-rc1"
>
> I switched to using the final 5.2 kernel.
>
> > +BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
>
> And dropped this one, to simply use the default ext4 filesystem size.
>
> As I said, I fixed those details on all three defconfigs, and applied
> all of them.
>

I have noted all your feedback for the future patches.

Thanks a lot for making these changes on your own and the feedback.
diff mbox series

Patch

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 <shyam.saini@amarulasolutions.com>
 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 0000000000..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,0xff1a0000 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 0000000000..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 0000000000..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 0000000000..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 1500000
diff --git a/configs/nanopi_neo4_defconfig b/configs/nanopi_neo4_defconfig
new file mode 100644
index 0000000000..f75f4367a9
--- /dev/null
+++ b/configs/nanopi_neo4_defconfig
@@ -0,0 +1,55 @@ 
+# Architecture
+BR2_aarch64=y
+BR2_cortex_a72_a53=y
+
+# Linux headers 5.1 series
+BR2_KERNEL_HEADERS_5_1=y
+
+# Firmware
+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/ARM-software/arm-trusted-firmware"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.0"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd2b180c457d35de195707dfa0b57a83b97fb275"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
+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/u-boot-spl-dtb.bin tpl/u-boot-tpl-dtb.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="v5.2-rc1"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4"
+BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh"