[PATCH v2] board: Add nanopi-m1 Support

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2] board: Add nanopi-m1 Support

Chakra Divi
Add initial support for nanopi-m1 board
with below features
- U-Boot 2017.07-rc1
- Linux 4.11.5
- Default packages from buildroot

Created a vendor folder friendly arm under
buildroot board; Added nanopi-m1 board
other friendlyarm boards can be added here

Signed-off-by: Chakra Divi <[hidden email]>
---
Changes for v2:
- created a new vendor folder friendlyarm
- moved nanopi-m1 board changes to friendlyarm
- modified kernel version from 4.11 to 4.11.5
- used genimage.sh instead of post-image.sh
- deleted nanopi folder

 .gitlab-ci.yml                            |    1 +
 DEVELOPERS                                |    2 ++
 board/friendlyarm/nanopi-m1/boot.cmd      |    8 ++++++
 board/friendlyarm/nanopi-m1/genimage.cfg  |   36 ++++++++++++++++++++++++
 board/friendlyarm/nanopi-m1/post-build.sh |    1 +
 board/friendlyarm/nanopi-m1/readme.txt    |   29 +++++++++++++++++++
 board/friendlyarm/post-build.sh           |    9 ++++++
 configs/nanopi_m1_defconfig               |   43 +++++++++++++++++++++++++++++
 8 files changed, 129 insertions(+)
 create mode 100644 board/friendlyarm/nanopi-m1/boot.cmd
 create mode 100644 board/friendlyarm/nanopi-m1/genimage.cfg
 create mode 120000 board/friendlyarm/nanopi-m1/post-build.sh
 create mode 100644 board/friendlyarm/nanopi-m1/readme.txt
 create mode 100755 board/friendlyarm/post-build.sh
 create mode 100644 configs/nanopi_m1_defconfig

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe2c7fe..216b8ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,7 @@ mx53loco_defconfig: *defconfig
 mx6cubox_defconfig: *defconfig
 mx6sx_udoo_neo_defconfig: *defconfig
 mx6udoo_defconfig: *defconfig
+nanopi_m1_defconfig: *defconfig
 nanopi_neo_defconfig: *defconfig
 nexbox_a95x_defconfig: *defconfig
 nitrogen6sx_defconfig: *defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 61a53e7..8eca922 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -329,7 +329,9 @@ F: package/libsvg/
 F: package/libsvg-cairo/
 
 N: Chakra <[hidden email]>
+F: board/friendlyarm/nanopi-m1
 F: board/olimex/a13_olinuxino
+F: configs/nanopi_m1_defconfig
 F: configs/olimex_a13_olinuxino_defconfig
 
 N: Chris Packham <[hidden email]>
diff --git a/board/friendlyarm/nanopi-m1/boot.cmd b/board/friendlyarm/nanopi-m1/boot.cmd
new file mode 100644
index 0000000..b4d612e
--- /dev/null
+++ b/board/friendlyarm/nanopi-m1/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/board/friendlyarm/nanopi-m1/genimage.cfg b/board/friendlyarm/nanopi-m1/genimage.cfg
new file mode 100644
index 0000000..23c9c7d
--- /dev/null
+++ b/board/friendlyarm/nanopi-m1/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the NanoPi M1
+#
+image boot.vfat {
+ vfat {
+ files = {
+ "zImage",
+ "sun8i-h3-nanopi-m1.dtb",
+ "boot.scr"
+ }
+ }
+ size = 10M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8192
+ size = 1040384 # 1MB - 8192
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ size = 512M
+ }
+}
diff --git a/board/friendlyarm/nanopi-m1/post-build.sh b/board/friendlyarm/nanopi-m1/post-build.sh
new file mode 120000
index 0000000..cd7f116
--- /dev/null
+++ b/board/friendlyarm/nanopi-m1/post-build.sh
@@ -0,0 +1 @@
+../post-build.sh
\ No newline at end of file
diff --git a/board/friendlyarm/nanopi-m1/readme.txt b/board/friendlyarm/nanopi-m1/readme.txt
new file mode 100644
index 0000000..8b10e4b
--- /dev/null
+++ b/board/friendlyarm/nanopi-m1/readme.txt
@@ -0,0 +1,29 @@
+NanoPi M1
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the NanoPi M1. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make nanopi_m1_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/board/friendlyarm/post-build.sh b/board/friendlyarm/post-build.sh
new file mode 100755
index 0000000..ac3a110
--- /dev/null
+++ b/board/friendlyarm/post-build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
new file mode 100644
index 0000000..0ee1f57
--- /dev/null
+++ b/configs/nanopi_m1_defconfig
@@ -0,0 +1,43 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m1/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg board/friendlyarm/nanopi-m1/boot.cmd"
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Additional tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
--
1.7.9.5

_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2] board: Add nanopi-m1 Support

Thomas Petazzoni-2
Hello,

On Sun, 18 Jun 2017 23:02:34 +0530, Chakra Divi wrote:

> Add initial support for nanopi-m1 board
> with below features
> - U-Boot 2017.07-rc1
> - Linux 4.11.5
> - Default packages from buildroot
>
> Created a vendor folder friendly arm under
> buildroot board; Added nanopi-m1 board
> other friendlyarm boards can be added here
>
> Signed-off-by: Chakra Divi <[hidden email]>

I was about to apply this... but it doesn't build. It fails to build
during the U-Boot build process:

  CC      net/arp.o
  LD      test/dm/built-in.o
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ImportError: No module named libfdt

  CC      lib/efi_loader/efi_disk.o
*** binman needs the Python libfdt library.
*** Either install it on your system, or try:
***
*** sudo apt-get install swig libpython-dev
***
*** to have U-Boot build its own version.
Makefile:1359: recipe for target 'checkbinman' failed
make[2]: *** [checkbinman] Error 1
make[2]: *** Waiting for unfinished jobs....

This is a build issue not really specific to this defconfig: any
defconfig using the binman too will fail this way. I guess we need to
package the Python libfdt library for the host, and provide a U-Boot
sub-option that allows the user to say "my defconfig needs the Python
libfdt library".

A few other comments below.

>  N: Chakra <[hidden email]>

Please refresh on the latest master, where I've changed to use your full nemae.

> diff --git a/board/friendlyarm/nanopi-m1/post-build.sh b/board/friendlyarm/nanopi-m1/post-build.sh
> new file mode 120000
> index 0000000..cd7f116
> --- /dev/null
> +++ b/board/friendlyarm/nanopi-m1/post-build.sh
> @@ -0,0 +1 @@
> +../post-build.sh
> \ No newline at end of file

Please drop the post-build.sh script, it is not needed: use
BR2_TARGET_UBOOT_BOOT_SCRIPT instead.

> +# Bootloaders
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1"
> +BR2_TARGET_UBOOT_NEEDS_DTC=y
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"

As said above: use BR2_TARGET_UBOOT_BOOT_SCRIPT.

> +
> +# Kernel
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
> +BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1"
> +
> +# Filesystem
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m1/post-build.sh"

You can drop.

> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg board/friendlyarm/nanopi-m1/boot.cmd"

Drop the last argument here.

> +# BR2_TARGET_ROOTFS_TAR is not set
> +
> +# Additional tools
> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
> +BR2_PACKAGE_HOST_MTOOLS=y
> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y

And drop this last line.

Could you fix these issues, especially the build issue, and send an
updated version?

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot