Skip to contentSkip to conversation

board/friendlyarm: Add support for RK3399 NanoPi M4 board

PATCH New Shyam Saini 2 participants 4 messages Apr 22, 2019 – Aug 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board/friendlyarm: Add support for RK3399 NanoPi M4 board

This initial support includes:

	Custom u-boot
	Linux v5.1-rc1
	ATF v2.0
	Buildroot default packages

---
Changelog:

V1->V2:
Fix extra white space and extra new line
Remove wrong uboot patch
Rename uboot patch appropriately
Add NanoPi M4 official wiki
Improve commit message

V2->V3: Fix build bl31.elf issue
Use update u-boot repo with build fix patches Remove the patch directory
Use git commit hash instead of branch name

---
 .gitlab-ci.yml                            |  1 +
 DEVELOPERS                                |  4 +++
 board/friendlyarm/nanopi-m4/extlinux.conf |  4 +++
 board/friendlyarm/nanopi-m4/genimage.cfg  | 22 +++++++++++++
 board/friendlyarm/nanopi-m4/post-build.sh |  8 +++++
 board/friendlyarm/nanopi-m4/readme.txt    | 45 +++++++++++++++++++++++++
 configs/nanopi_m4_defconfig               | 55 +++++++++++++++++++++++++++++++
 7 files changed, 139 insertions(+)
 create mode 100644 board/friendlyarm/nanopi-m4/extlinux.conf
 create mode 100644 board/friendlyarm/nanopi-m4/genimage.cfg
 create mode 100755 board/friendlyarm/nanopi-m4/post-build.sh
 create mode 100644 board/friendlyarm/nanopi-m4/readme.txt
 create mode 100644 configs/nanopi_m4_defconfig
.gitlab-ci.yml +1 -0
index 02d6f6c0cc..0ac94059f9 100644
@@ -175,6 +175,7 @@ mx6sx_udoo_neo_defconfig: { extends: .defconfig }
 mx6udoo_defconfig: { extends: .defconfig }
 nanopi_m1_defconfig: { extends: .defconfig }
 nanopi_m1_plus_defconfig: { extends: .defconfig }
+nanopi_m4_defconfig: {extends: .defconfig}
 nanopi_neo_defconfig: { extends: .defconfig }
 nexbox_a95x_defconfig: { extends: .defconfig }
 nitrogen6sx_defconfig: { extends: .defconfig }
DEVELOPERS +4 -0
index f23479703b..c15333ab78 100644
@@ -2001,6 +2001,10 @@ F:	package/tunctl/
 F:	package/ubus/
 F:	package/wolfssl/
 
+N:	Shyam Saini <[email protected]>
+F:	board/friendlyarm/nanopi-m4/
+F:	configs/nanopi_m4_defconfig
+
 N:	Simon Dawson <[email protected]>
 F:	boot/at91bootstrap3/
 F:	package/cppzmq/
board/friendlyarm/nanopi-m4/extlinux.conf new file +4 -0
new file mode 100644
index 0000000000..e5861cdcbe
@@ -0,0 +1,4 @@
+label NanoPi M4 5.1-rc1
+  kernel /boot/Image
+  devicetree /boot/rk3399-nanopi-m4.dtb
+  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait
board/friendlyarm/nanopi-m4/genimage.cfg new file +22 -0
new file mode 100644
index 0000000000..6404b0ad3b
@@ -0,0 +1,22 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot-spl-dtb {
+		in-partition-table = "no"
+		image = "u-boot-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"
+	}
+}
board/friendlyarm/nanopi-m4/post-build.sh new file +8 -0
new file mode 100755
index 0000000000..9b0c4ecc83
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOARD_DIR="$(dirname $0)"
+
+$MKIMAGE -n rk3399 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
board/friendlyarm/nanopi-m4/readme.txt new file +45 -0

45 lines not on this page · raw message

configs/nanopi_m4_defconfig new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 board/orangepi: Add support for OrangePi Rk3399 board

This initial support includes:
Custom u-boot
Linux next
ATF v2.0
Buildroot default packages

---
 .gitlab-ci.yml                               |  1 +
 DEVELOPERS                                   |  2 +
 board/orangepi/orangepi-rk3399/extlinux.conf |  4 ++
 board/orangepi/orangepi-rk3399/genimage.cfg  | 22 +++++++++++
 board/orangepi/orangepi-rk3399/post-build.sh |  8 ++++
 board/orangepi/orangepi-rk3399/readme.txt    | 49 ++++++++++++++++++++++++
 configs/orangepi_rk3399_defconfig            | 56 ++++++++++++++++++++++++++++
 7 files changed, 142 insertions(+)
 create mode 100644 board/orangepi/orangepi-rk3399/extlinux.conf
 create mode 100644 board/orangepi/orangepi-rk3399/genimage.cfg
 create mode 100755 board/orangepi/orangepi-rk3399/post-build.sh
 create mode 100644 board/orangepi/orangepi-rk3399/readme.txt
 create mode 100644 configs/orangepi_rk3399_defconfig
.gitlab-ci.yml +1 -0
index 0ac94059f9..966c1417fc 100644
@@ -202,6 +202,7 @@ orangepi_pc_defconfig: { extends: .defconfig }
 orangepi_pc_plus_defconfig: { extends: .defconfig }
 orangepi_plus_defconfig: { extends: .defconfig }
 orangepi_prime_defconfig: { extends: .defconfig }
+orangepi_rk3399_defconfig: { extends: .defconfig }
 orangepi_win_defconfig: { extends: .defconfig }
 orangepi_zero_defconfig: { extends: .defconfig }
 orangepi_zero_plus2_defconfig: { extends: .defconfig }
DEVELOPERS +2 -0
index c15333ab78..b72733734d 100644
@@ -2004,6 +2004,8 @@ F:	package/wolfssl/
 N:	Shyam Saini <[email protected]>
 F:	board/friendlyarm/nanopi-m4/
 F:	configs/nanopi_m4_defconfig
+F:	board/orangepi/orangepi-rk3399/
+F:	configs/orangepi_rk3399_defconfig
 
 N:	Simon Dawson <[email protected]>
 F:	boot/at91bootstrap3/
board/orangepi/orangepi-rk3399/extlinux.conf new file +4 -0
new file mode 100644
index 0000000000..fb6c015c4b
@@ -0,0 +1,4 @@
+label OrangePi RK3399
+  kernel /boot/Image
+  devicetree /boot/rk3399-orangepi.dtb
+  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait
board/orangepi/orangepi-rk3399/genimage.cfg new file +22 -0
new file mode 100644
index 0000000000..6404b0ad3b
@@ -0,0 +1,22 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot-spl-dtb {
+		in-partition-table = "no"
+		image = "u-boot-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"
+	}
+}
board/orangepi/orangepi-rk3399/post-build.sh new file +8 -0
new file mode 100755
index 0000000000..9b0c4ecc83
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOARD_DIR="$(dirname $0)"
+
+$MKIMAGE -n rk3399 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
board/orangepi/orangepi-rk3399/readme.txt new file +49 -0

49 lines not on this page · raw message

configs/orangepi_rk3399_defconfig new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/2 board/orangepi: Add support for OrangePi Rk3399 board

Hello,

For this one, there is a need of a change on your side, which requires a respin. See my comments below.

Quoted 3 lines · On Mon, 22 Apr 2019 23:34:33 +0530 Shyam Saini…

This initial support includes:
Custom u-boot
Linux next

Could you send a new iteration with a final Linux kernel, as I believe this platform is now supported in a Linux kernel official release.

Quoted 4 lines

ATF v2.0
Buildroot default packages

Also, fix the commit title to:

configs/orangepi_rk3399: new defconfig

configs/orangepi_rk3399_defconfig line 6

Quoted 2 lines
configs/orangepi_rk3399_defconfig new file +2 -0
+# Linux headers same as kernel, a 5.0 series
+BR2_KERNEL_HEADERS_5_0=y

Use the "Same as kernel" functionality for the kernel headers.

configs/orangepi_rk3399_defconfig line 49

Quoted 6 lines
configs/orangepi_rk3399_defconfig new file +6 -0
+# Filesystem
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi RK3399"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OrangePi RK3399!"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="512M"

Use the default ext2 filesystem size.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 board/friendlyarm: Add support for RK3399 NanoPi M4 board

In reply to Shyam Saini

Hello Shyam,

Quoted 8 lines · On Mon, 22 Apr 2019 23:34:32 +0530 Shyam Saini…

This initial support includes:

	Custom u-boot
	Linux v5.1-rc1
	ATF v2.0
	Buildroot default packages

I fixed the commit title, switched to using the final 5.1 kernel, used BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1, and the default ext2 filesystem size. Patch applied with those changes. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com