* [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
@ 2023-10-31 8:49 Scott Fan
2023-10-31 21:14 ` Yann E. MORIN
2023-11-01 1:34 ` Scott Fan
0 siblings, 2 replies; 8+ messages in thread
From: Scott Fan @ 2023-10-31 8:49 UTC (permalink / raw)
To: buildroot; +Cc: Scott Fan
Add support for the FriendlyARM NanoPi NEO2 with mainline components:
- U-Boot 2023.10
- Linux 6.1.60
Board's wiki page:
- https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++
board/friendlyarm/nanopi-neo2/genimage.cfg | 40 ++++++++++++++++
board/friendlyarm/nanopi-neo2/post-build.sh | 8 ++++
board/friendlyarm/nanopi-neo2/readme.txt | 34 +++++++++++++
.../nanopi-neo2/uboot/fit_spl.fragment | 1 +
.../nanopi-neo2/uboot/fit_spl_atf_its.patch | 48 +++++++++++++++++++
configs/friendlyarm_nanopi_neo2_defconfig | 48 +++++++++++++++++++
7 files changed, 183 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig
diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf
new file mode 100644
index 0000000000..04aea276a2
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/extlinux.conf
@@ -0,0 +1,4 @@
+label friendlyarm-nanopi-buildroot
+ kernel /Image
+ devicetree /sun50i-h5-nanopi-neo2.dtb
+ append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 0000000000..54465ca7fe
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,40 @@
+image boot.vfat {
+ vfat {
+ files = {
+ "Image",
+ "sun50i-h5-nanopi-neo2.dtb",
+ "extlinux"
+ }
+ }
+
+ size = 64M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition spl {
+ in-partition-table = "no"
+ image = "sunxi-spl.bin"
+ offset = 8K
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot.itb"
+ offset = 40K
+ size = 1M # 1MB - 40KB
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
new file mode 100755
index 0000000000..0ee47013f1
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/post-build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+# Parse BINARIES_DIR variable from arguments while missing in environment variable
+[ -n "${BINARIES_DIR}" ] || BINARIES_DIR="$1"
+
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux/extlinux.conf"
diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 0000000000..50795a1cfb
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,34 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Nanopi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Wiki link:
+https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+ $ make friendlyarm_nanopi_neo2_defconfig
+ $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+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
+ $ sudo sync
+
+Insert the micro SDcard in your Nanopi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
new file mode 100644
index 0000000000..50447d0dff
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
@@ -0,0 +1 @@
+CONFIG_SPL_FIT_SOURCE="board/friendlyarm/nanopi-neo2/fit_spl_atf.its"
diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
new file mode 100644
index 0000000000..b2edd9fb37
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
@@ -0,0 +1,48 @@
+diff --git a/board/friendlyarm/nanopi-neo2/fit_spl_atf.its b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+new file mode 100644
+index 0000000000..7447d23988
+--- /dev/null
++++ b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+@@ -0,0 +1,42 @@
++/dts-v1/;
++
++/ {
++ description = "Configuration to load ATF before U-Boot";
++ #address-cells = <1>;
++
++ images {
++ uboot {
++ description = "U-Boot (64-bit)";
++ data = /incbin/("u-boot-nodtb.bin");
++ type = "standalone";
++ arch = "arm64";
++ compression = "none";
++ load = <0x4a000000>;
++ };
++ atf {
++ description = "ARM Trusted Firmware";
++ data = /incbin/("bl31.bin");
++ type = "firmware";
++ arch = "arm64";
++ compression = "none";
++ load = <0x44000>;
++ entry = <0x44000>;
++ };
++ fdt_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ data = /incbin/("arch/arm/dts/sun50i-h5-nanopi-neo2.dtb");
++ type = "flat_dt";
++ compression = "none";
++ };
++ };
++ configurations {
++ default = "config_1";
++
++ config_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ firmware = "uboot";
++ loadables = "atf";
++ fdt = "fdt_1";
++ };
++ };
++};
diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 0000000000..a88bf8957c
--- /dev/null
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,48 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_ITB=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-10-31 8:49 [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board Scott Fan
@ 2023-10-31 21:14 ` Yann E. MORIN
2023-10-31 21:27 ` Yann E. MORIN
2023-11-01 0:53 ` Scott Fan
2023-11-01 1:34 ` Scott Fan
1 sibling, 2 replies; 8+ messages in thread
From: Yann E. MORIN @ 2023-10-31 21:14 UTC (permalink / raw)
To: Scott Fan; +Cc: buildroot
Scott, All,
On 2023-10-31 16:49 +0800, Scott Fan spake thusly:
> Add support for the FriendlyARM NanoPi NEO2 with mainline components:
> - U-Boot 2023.10
> - Linux 6.1.60
Funny, we removed a defconfig for that board a year ago, almost
day-for-day:
24bb61071269 configs/friendlyarm_nanopi_neo2: remove defconfig
It's OK to re-add a new, fixed defconfig, though!
> Board's wiki page:
> - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
>
> Signed-off-by: Scott Fan <fancp2007@gmail.com>
> ---
[--SNIP--]
> diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
> new file mode 100755
> index 0000000000..0ee47013f1
> --- /dev/null
> +++ b/board/friendlyarm/nanopi-neo2/post-build.sh
> @@ -0,0 +1,8 @@
> +#!/bin/sh
> +
> +BOARD_DIR="$(dirname $0)"
$ ./utils-docker-run make check-package
board/friendlyarm/nanopi-neo2/post-build.sh:0: run 'shellcheck' and fix the warnings
$ ./utils/docker-run shellcheck board/friendlyarm/nanopi-neo2/post-build.sh
In board/friendlyarm/nanopi-neo2/post-build.sh line 3:
BOARD_DIR="$(dirname $0)"
^-- SC2086: Double quote to prevent globbing and word splitting.
> diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
> new file mode 100644
> index 0000000000..50795a1cfb
> --- /dev/null
> +++ b/board/friendlyarm/nanopi-neo2/readme.txt
> @@ -0,0 +1,34 @@
[--SNIP--]
> + $ sudo dd if=output/images/sdcard.img of=/dev/sdX
> + $ sudo sync
No need for sudo to run sync
[--SNIP--]
> diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
> new file mode 100644
> index 0000000000..b2edd9fb37
> --- /dev/null
> +++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
$ ./utils-docker-run make check-package
board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: use name <number>-<description>.patch (http://nightly.buildroot.org/#_providing_patches)
board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches)
board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation)
Also, you need to provide a git-formatted patch, with a proper subject,
a proper commit log, and as reported above, your signed-off, and the
upstream status of this patch.
[--SNIP--]
> diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
> new file mode 100644
> index 0000000000..a88bf8957c
> --- /dev/null
> +++ b/configs/friendlyarm_nanopi_neo2_defconfig
> @@ -0,0 +1,48 @@
> +BR2_aarch64=y
> +BR2_cortex_a53=y
> +BR2_ARM_FPU_VFPV4=y
> +
> +# Linux headers same as kernel, a 6.1 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
> +
> +# Firmware
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
ATF is a bootloader, and as such, we want to use a pinned version, not
the latest one, so as for uboot:
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=v2.7
Care to fix all of those, and respin, please?
Regards,
Yann E. MORIN.
> +# Bootloader
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
> +BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
> +BR2_TARGET_UBOOT_NEEDS_DTC=y
> +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> +BR2_TARGET_UBOOT_FORMAT_ITB=y
> +BR2_TARGET_UBOOT_SPL=y
> +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
> +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
> +
> +# Kernel
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
> +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> +
> +# Filesystem
> +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
> +BR2_PACKAGE_HOST_MTOOLS=y
> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-10-31 21:14 ` Yann E. MORIN
@ 2023-10-31 21:27 ` Yann E. MORIN
2023-11-01 0:53 ` Scott Fan
1 sibling, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2023-10-31 21:27 UTC (permalink / raw)
To: Scott Fan; +Cc: buildroot
Scott, All,
On 2023-10-31 22:14 +0100, Yann E. MORIN spake thusly:
> On 2023-10-31 16:49 +0800, Scott Fan spake thusly:
> > Add support for the FriendlyARM NanoPi NEO2 with mainline components:
> $ ./utils-docker-run make check-package
That should have been: ./utils/docker-run
Sorry for the noise...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-10-31 21:14 ` Yann E. MORIN
2023-10-31 21:27 ` Yann E. MORIN
@ 2023-11-01 0:53 ` Scott Fan
2023-11-01 10:36 ` Yann E. MORIN
1 sibling, 1 reply; 8+ messages in thread
From: Scott Fan @ 2023-11-01 0:53 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: buildroot
Yann,
I can fix those above questions, but there is one thing that might be
a little troublesome,
the fit_spl_atf_its.patch file was made from me, not from upstream.
Should i submit the change to upstream first, then re-make patch with the
upstream status of it?
Scott Fan
On Wed, Nov 1, 2023 at 5:14 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Scott, All,
>
> On 2023-10-31 16:49 +0800, Scott Fan spake thusly:
> > Add support for the FriendlyARM NanoPi NEO2 with mainline components:
> > - U-Boot 2023.10
> > - Linux 6.1.60
>
> Funny, we removed a defconfig for that board a year ago, almost
> day-for-day:
> 24bb61071269 configs/friendlyarm_nanopi_neo2: remove defconfig
>
> It's OK to re-add a new, fixed defconfig, though!
>
> > Board's wiki page:
> > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
> >
> > Signed-off-by: Scott Fan <fancp2007@gmail.com>
> > ---
> [--SNIP--]
> > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
> > new file mode 100755
> > index 0000000000..0ee47013f1
> > --- /dev/null
> > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh
> > @@ -0,0 +1,8 @@
> > +#!/bin/sh
> > +
> > +BOARD_DIR="$(dirname $0)"
>
> $ ./utils-docker-run make check-package
> board/friendlyarm/nanopi-neo2/post-build.sh:0: run 'shellcheck' and fix the warnings
>
> $ ./utils/docker-run shellcheck board/friendlyarm/nanopi-neo2/post-build.sh
> In board/friendlyarm/nanopi-neo2/post-build.sh line 3:
> BOARD_DIR="$(dirname $0)"
> ^-- SC2086: Double quote to prevent globbing and word splitting.
>
> > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
> > new file mode 100644
> > index 0000000000..50795a1cfb
> > --- /dev/null
> > +++ b/board/friendlyarm/nanopi-neo2/readme.txt
> > @@ -0,0 +1,34 @@
> [--SNIP--]
> > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX
> > + $ sudo sync
>
> No need for sudo to run sync
>
> [--SNIP--]
> > diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
> > new file mode 100644
> > index 0000000000..b2edd9fb37
> > --- /dev/null
> > +++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
>
> $ ./utils-docker-run make check-package
> board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: use name <number>-<description>.patch (http://nightly.buildroot.org/#_providing_patches)
> board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches)
> board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation)
>
> Also, you need to provide a git-formatted patch, with a proper subject,
> a proper commit log, and as reported above, your signed-off, and the
> upstream status of this patch.
>
> [--SNIP--]
> > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
> > new file mode 100644
> > index 0000000000..a88bf8957c
> > --- /dev/null
> > +++ b/configs/friendlyarm_nanopi_neo2_defconfig
> > @@ -0,0 +1,48 @@
> > +BR2_aarch64=y
> > +BR2_cortex_a53=y
> > +BR2_ARM_FPU_VFPV4=y
> > +
> > +# Linux headers same as kernel, a 6.1 series
> > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
> > +
> > +# Firmware
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
>
> ATF is a bootloader, and as such, we want to use a pinned version, not
> the latest one, so as for uboot:
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=v2.7
>
> Care to fix all of those, and respin, please?
>
> Regards,
> Yann E. MORIN.
>
> > +# Bootloader
> > +BR2_TARGET_UBOOT=y
> > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
> > +BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch"
> > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
> > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
> > +BR2_TARGET_UBOOT_NEEDS_DTC=y
> > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> > +BR2_TARGET_UBOOT_FORMAT_ITB=y
> > +BR2_TARGET_UBOOT_SPL=y
> > +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
> > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
> > +
> > +# Kernel
> > +BR2_LINUX_KERNEL=y
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
> > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> > +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
> > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> > +
> > +# Filesystem
> > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
> > +BR2_TARGET_ROOTFS_EXT2=y
> > +BR2_TARGET_ROOTFS_EXT2_4=y
> > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> > +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> > +BR2_PACKAGE_HOST_GENIMAGE=y
> > +BR2_PACKAGE_HOST_MTOOLS=y
> > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
> > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
> > --
> > 2.25.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-11-01 0:53 ` Scott Fan
@ 2023-11-01 10:36 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2023-11-01 10:36 UTC (permalink / raw)
To: Scott Fan; +Cc: buildroot
Scott, All,
On 2023-11-01 08:53 +0800, Scott Fan spake thusly:
> I can fix those above questions, but there is one thing that might be
> a little troublesome,
> the fit_spl_atf_its.patch file was made from me, not from upstream.
The "Upstream:" tag is meant to represent the status of the patch,
whether you backported an upstream commit, or grabbed a pending patch
(from upstream mailing list, pull-request...), or whether you wrote and
submitted the patch; see the manual (as reported by check-package) for
the details:
https://buildroot.org/downloads/manual/manual.html#_additional_patch_documentation
> Should i submit the change to upstream first, then re-make patch with the
> upstream status of it?
It would indeed be nice to upstream this change, because it is not
specific to Buildroot. In which case, the Upstream tag would point to
the upstream PR or mailing list post.
Regards,
Yann E. MORIN.
> Scott Fan
>
> On Wed, Nov 1, 2023 at 5:14 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> >
> > Scott, All,
> >
> > On 2023-10-31 16:49 +0800, Scott Fan spake thusly:
> > > Add support for the FriendlyARM NanoPi NEO2 with mainline components:
> > > - U-Boot 2023.10
> > > - Linux 6.1.60
> >
> > Funny, we removed a defconfig for that board a year ago, almost
> > day-for-day:
> > 24bb61071269 configs/friendlyarm_nanopi_neo2: remove defconfig
> >
> > It's OK to re-add a new, fixed defconfig, though!
> >
> > > Board's wiki page:
> > > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
> > >
> > > Signed-off-by: Scott Fan <fancp2007@gmail.com>
> > > ---
> > [--SNIP--]
> > > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
> > > new file mode 100755
> > > index 0000000000..0ee47013f1
> > > --- /dev/null
> > > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh
> > > @@ -0,0 +1,8 @@
> > > +#!/bin/sh
> > > +
> > > +BOARD_DIR="$(dirname $0)"
> >
> > $ ./utils-docker-run make check-package
> > board/friendlyarm/nanopi-neo2/post-build.sh:0: run 'shellcheck' and fix the warnings
> >
> > $ ./utils/docker-run shellcheck board/friendlyarm/nanopi-neo2/post-build.sh
> > In board/friendlyarm/nanopi-neo2/post-build.sh line 3:
> > BOARD_DIR="$(dirname $0)"
> > ^-- SC2086: Double quote to prevent globbing and word splitting.
> >
> > > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
> > > new file mode 100644
> > > index 0000000000..50795a1cfb
> > > --- /dev/null
> > > +++ b/board/friendlyarm/nanopi-neo2/readme.txt
> > > @@ -0,0 +1,34 @@
> > [--SNIP--]
> > > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX
> > > + $ sudo sync
> >
> > No need for sudo to run sync
> >
> > [--SNIP--]
> > > diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
> > > new file mode 100644
> > > index 0000000000..b2edd9fb37
> > > --- /dev/null
> > > +++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch
> >
> > $ ./utils-docker-run make check-package
> > board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: use name <number>-<description>.patch (http://nightly.buildroot.org/#_providing_patches)
> > board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches)
> > board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation)
> >
> > Also, you need to provide a git-formatted patch, with a proper subject,
> > a proper commit log, and as reported above, your signed-off, and the
> > upstream status of this patch.
> >
> > [--SNIP--]
> > > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
> > > new file mode 100644
> > > index 0000000000..a88bf8957c
> > > --- /dev/null
> > > +++ b/configs/friendlyarm_nanopi_neo2_defconfig
> > > @@ -0,0 +1,48 @@
> > > +BR2_aarch64=y
> > > +BR2_cortex_a53=y
> > > +BR2_ARM_FPU_VFPV4=y
> > > +
> > > +# Linux headers same as kernel, a 6.1 series
> > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
> > > +
> > > +# Firmware
> > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
> > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> >
> > ATF is a bootloader, and as such, we want to use a pinned version, not
> > the latest one, so as for uboot:
> > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=v2.7
> >
> > Care to fix all of those, and respin, please?
> >
> > Regards,
> > Yann E. MORIN.
> >
> > > +# Bootloader
> > > +BR2_TARGET_UBOOT=y
> > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
> > > +BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot/fit_spl_atf_its.patch"
> > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
> > > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
> > > +BR2_TARGET_UBOOT_NEEDS_DTC=y
> > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> > > +BR2_TARGET_UBOOT_FORMAT_ITB=y
> > > +BR2_TARGET_UBOOT_SPL=y
> > > +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
> > > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
> > > +
> > > +# Kernel
> > > +BR2_LINUX_KERNEL=y
> > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
> > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
> > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> > > +
> > > +# Filesystem
> > > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
> > > +BR2_TARGET_ROOTFS_EXT2=y
> > > +BR2_TARGET_ROOTFS_EXT2_4=y
> > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> > > +BR2_PACKAGE_HOST_GENIMAGE=y
> > > +BR2_PACKAGE_HOST_MTOOLS=y
> > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
> > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
> > > --
> > > 2.25.1
> > >
> > > _______________________________________________
> > > buildroot mailing list
> > > buildroot@buildroot.org
> > > https://lists.buildroot.org/mailman/listinfo/buildroot
> >
> > --
> > .-----------------.--------------------.------------------.--------------------.
> > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> > '------------------------------^-------^------------------^--------------------'
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-10-31 8:49 [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board Scott Fan
2023-10-31 21:14 ` Yann E. MORIN
@ 2023-11-01 1:34 ` Scott Fan
1 sibling, 0 replies; 8+ messages in thread
From: Scott Fan @ 2023-11-01 1:34 UTC (permalink / raw)
To: buildroot; +Cc: Scott Fan
Add support for the FriendlyARM NanoPi NEO2 with mainline components:
- U-Boot 2023.10
- Linux 6.1.60
Board's wiki page:
- https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
Changes v1 -> v2:
- Fix issues from 'utils/docker-run make check-package'
- Add atf custom version in the defconfig
- No need for sudo to run sync
---
board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++
board/friendlyarm/nanopi-neo2/genimage.cfg | 40 ++++++++++++
board/friendlyarm/nanopi-neo2/post-build.sh | 8 +++
board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++
...fitImage-source-file-for-NanoPi-NEO2.patch | 62 +++++++++++++++++++
.../nanopi-neo2/uboot/fit_spl.fragment | 1 +
configs/friendlyarm_nanopi_neo2_defconfig | 50 +++++++++++++++
7 files changed, 199 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig
diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf
new file mode 100644
index 0000000000..04aea276a2
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/extlinux.conf
@@ -0,0 +1,4 @@
+label friendlyarm-nanopi-buildroot
+ kernel /Image
+ devicetree /sun50i-h5-nanopi-neo2.dtb
+ append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 0000000000..54465ca7fe
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,40 @@
+image boot.vfat {
+ vfat {
+ files = {
+ "Image",
+ "sun50i-h5-nanopi-neo2.dtb",
+ "extlinux"
+ }
+ }
+
+ size = 64M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition spl {
+ in-partition-table = "no"
+ image = "sunxi-spl.bin"
+ offset = 8K
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot.itb"
+ offset = 40K
+ size = 1M # 1MB - 40KB
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
new file mode 100755
index 0000000000..9cb196ac8d
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/post-build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname "$0")"
+
+# Parse BINARIES_DIR variable from arguments while missing in environment variable
+[ -n "${BINARIES_DIR}" ] || BINARIES_DIR="$1"
+
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux/extlinux.conf"
diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 0000000000..607547442a
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,34 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Nanopi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Wiki link:
+https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+ $ make friendlyarm_nanopi_neo2_defconfig
+ $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+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
+ $ sync
+
+Insert the micro SDcard in your Nanopi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch b/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
new file mode 100644
index 0000000000..c4396c506a
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
@@ -0,0 +1,62 @@
+From a58df11b8676009ef951de3cfba0e1495f1cd551 Mon Sep 17 00:00:00 2001
+From: Scott Fan <fancp2007@gmail.com>
+Date: Wed, 1 Nov 2023 09:03:44 +0800
+Subject: [PATCH] ARM: Add default fitImage source file for NanoPi NEO2 board
+
+Signed-off-by: Scott Fan <fancp2007@gmail.com>
+---
+ board/friendlyarm/nanopi-neo2/fit_spl_atf.its | 42 +++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+
+diff --git a/board/friendlyarm/nanopi-neo2/fit_spl_atf.its b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+new file mode 100644
+index 0000000000..18b5d0d681
+--- /dev/null
++++ b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+@@ -0,0 +1,42 @@
++/dts-v1/;
++
++/ {
++ description = "Configuration to load ATF before U-Boot";
++ #address-cells = <1>;
++
++ images {
++ uboot {
++ description = "U-Boot (64-bit)";
++ data = /incbin/("u-boot-nodtb.bin");
++ type = "standalone";
++ arch = "arm64";
++ compression = "none";
++ load = <0x4a000000>;
++ };
++ atf {
++ description = "ARM Trusted Firmware";
++ data = /incbin/("bl31.bin");
++ type = "firmware";
++ arch = "arm64";
++ compression = "none";
++ load = <0x44000>;
++ entry = <0x44000>;
++ };
++ fdt_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ data = /incbin/("arch/arm/dts/sun50i-h5-nanopi-neo2.dtb");
++ type = "flat_dt";
++ compression = "none";
++ };
++ };
++ configurations {
++ default = "config_1";
++
++ config_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ firmware = "uboot";
++ loadables = "atf";
++ fdt = "fdt_1";
++ };
++ };
++};
+--
+2.25.1
+
diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
new file mode 100644
index 0000000000..50447d0dff
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
@@ -0,0 +1 @@
+CONFIG_SPL_FIT_SOURCE="board/friendlyarm/nanopi-neo2/fit_spl_atf.its"
diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 0000000000..b9cd8547ef
--- /dev/null
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,50 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=v2.7
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_ITB=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
@ 2023-11-01 1:31 Scott Fan
0 siblings, 0 replies; 8+ messages in thread
From: Scott Fan @ 2023-11-01 1:31 UTC (permalink / raw)
To: buildroot; +Cc: Scott Fan
Add support for the FriendlyARM NanoPi NEO2 with mainline components:
- U-Boot 2023.10
- Linux 6.1.60
Board's wiki page:
- https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
Changes v1 -> v2:
- Fix issues from 'utils/docker-run make check-package'
- Add atf custom version in the defconfig
- No need for sudo to run sync
---
board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++
board/friendlyarm/nanopi-neo2/genimage.cfg | 40 ++++++++++++
board/friendlyarm/nanopi-neo2/post-build.sh | 8 +++
board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++
...fitImage-source-file-for-NanoPi-NEO2.patch | 62 +++++++++++++++++++
.../nanopi-neo2/uboot/fit_spl.fragment | 1 +
configs/friendlyarm_nanopi_neo2_defconfig | 50 +++++++++++++++
7 files changed, 199 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
create mode 100644 board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig
diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf
new file mode 100644
index 0000000000..04aea276a2
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/extlinux.conf
@@ -0,0 +1,4 @@
+label friendlyarm-nanopi-buildroot
+ kernel /Image
+ devicetree /sun50i-h5-nanopi-neo2.dtb
+ append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 0000000000..54465ca7fe
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,40 @@
+image boot.vfat {
+ vfat {
+ files = {
+ "Image",
+ "sun50i-h5-nanopi-neo2.dtb",
+ "extlinux"
+ }
+ }
+
+ size = 64M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition spl {
+ in-partition-table = "no"
+ image = "sunxi-spl.bin"
+ offset = 8K
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot.itb"
+ offset = 40K
+ size = 1M # 1MB - 40KB
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
new file mode 100755
index 0000000000..9cb196ac8d
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/post-build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname "$0")"
+
+# Parse BINARIES_DIR variable from arguments while missing in environment variable
+[ -n "${BINARIES_DIR}" ] || BINARIES_DIR="$1"
+
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux/extlinux.conf"
diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 0000000000..607547442a
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,34 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Nanopi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Wiki link:
+https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+ $ make friendlyarm_nanopi_neo2_defconfig
+ $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+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
+ $ sync
+
+Insert the micro SDcard in your Nanopi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch b/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
new file mode 100644
index 0000000000..c4396c506a
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/0001-ARM-Add-default-fitImage-source-file-for-NanoPi-NEO2.patch
@@ -0,0 +1,62 @@
+From a58df11b8676009ef951de3cfba0e1495f1cd551 Mon Sep 17 00:00:00 2001
+From: Scott Fan <fancp2007@gmail.com>
+Date: Wed, 1 Nov 2023 09:03:44 +0800
+Subject: [PATCH] ARM: Add default fitImage source file for NanoPi NEO2 board
+
+Signed-off-by: Scott Fan <fancp2007@gmail.com>
+---
+ board/friendlyarm/nanopi-neo2/fit_spl_atf.its | 42 +++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+
+diff --git a/board/friendlyarm/nanopi-neo2/fit_spl_atf.its b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+new file mode 100644
+index 0000000000..18b5d0d681
+--- /dev/null
++++ b/board/friendlyarm/nanopi-neo2/fit_spl_atf.its
+@@ -0,0 +1,42 @@
++/dts-v1/;
++
++/ {
++ description = "Configuration to load ATF before U-Boot";
++ #address-cells = <1>;
++
++ images {
++ uboot {
++ description = "U-Boot (64-bit)";
++ data = /incbin/("u-boot-nodtb.bin");
++ type = "standalone";
++ arch = "arm64";
++ compression = "none";
++ load = <0x4a000000>;
++ };
++ atf {
++ description = "ARM Trusted Firmware";
++ data = /incbin/("bl31.bin");
++ type = "firmware";
++ arch = "arm64";
++ compression = "none";
++ load = <0x44000>;
++ entry = <0x44000>;
++ };
++ fdt_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ data = /incbin/("arch/arm/dts/sun50i-h5-nanopi-neo2.dtb");
++ type = "flat_dt";
++ compression = "none";
++ };
++ };
++ configurations {
++ default = "config_1";
++
++ config_1 {
++ description = "sun50i-h5-nanopi-neo2";
++ firmware = "uboot";
++ loadables = "atf";
++ fdt = "fdt_1";
++ };
++ };
++};
+--
+2.25.1
+
diff --git a/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
new file mode 100644
index 0000000000..50447d0dff
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment
@@ -0,0 +1 @@
+CONFIG_SPL_FIT_SOURCE="board/friendlyarm/nanopi-neo2/fit_spl_atf.its"
diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 0000000000..b9cd8547ef
--- /dev/null
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,50 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=v2.7
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+BR2_TARGET_UBOOT_PATCH="board/friendlyarm/nanopi-neo2/uboot"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo2/uboot/fit_spl.fragment"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_ITB=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH v4] configs/friendlyarm_nanopi_neo2_defconfig: new board
@ 2023-11-04 19:23 Scott Fan
2023-12-08 0:34 ` [Buildroot] [PATCH] " Scott Fan
0 siblings, 1 reply; 8+ messages in thread
From: Scott Fan @ 2023-11-04 19:23 UTC (permalink / raw)
To: buildroot; +Cc: Scott Fan
Add support for the FriendlyARM NanoPi NEO2 with mainline components:
- U-Boot 2023.10
- Linux 6.1.61
Board's wiki page:
- https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
Changes v1 -> v2:
- Fix issues from 'utils/docker-run make check-package'
- Add atf custom version in the defconfig
- No need for sudo to run sync
Changes v2 -> v3:
- Update patch file, add the upstream tag
Changes v3 -> v4:
- Use a single integrated image file (u-boot-sunxi-with-spl.bin)
- Remove patch file for uboot, switch to binman
- Merge boot partition into rootfs partition
- Bump kernel version to 6.1.61
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++
board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++
board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++
board/friendlyarm/nanopi-neo2/readme.txt | 34 +++++++++++++++
configs/friendlyarm_nanopi_neo2_defconfig | 48 +++++++++++++++++++++
5 files changed, 107 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt
create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig
diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf
new file mode 100644
index 0000000000..482a069f74
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/extlinux.conf
@@ -0,0 +1,4 @@
+label friendlyarm-nanopi-buildroot
+ kernel /boot/Image
+ devicetree /boot/sun50i-h5-nanopi-neo2.dtb
+ append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait
diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 0000000000..67e4e5efdb
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,16 @@
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot-tpl-spl-dtb {
+ in-partition-table = "no"
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8K
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ offset = 1M
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
new file mode 100755
index 0000000000..c7ec875068
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/post-build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname "$0")"
+
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf"
diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 0000000000..c896a57525
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,34 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the NanoPi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Wiki link:
+https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+ $ make friendlyarm_nanopi_neo2_defconfig
+ $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+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
+ $ sync
+
+Insert the micro SDcard in your NanoPi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 0000000000..9eaacbb192
--- /dev/null
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,48 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.61"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board
2023-11-04 19:23 [Buildroot] [PATCH v4] " Scott Fan
@ 2023-12-08 0:34 ` Scott Fan
0 siblings, 0 replies; 8+ messages in thread
From: Scott Fan @ 2023-12-08 0:34 UTC (permalink / raw)
To: buildroot; +Cc: Scott Fan
Add support for the FriendlyARM NanoPi NEO2 with mainline components:
- U-Boot 2023.10
- Linux 6.1.65
Board's wiki page:
- https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
Signed-off-by: Scott Fan <fancp2007@gmail.com>
---
Changes v1 -> v2:
- Fix issues from 'utils/docker-run make check-package'
- Add atf custom version in the defconfig
- No need for sudo to run sync
Changes v2 -> v3:
- Update patch file, add the upstream tag
Changes v3 -> v4:
- Use a single integrated image file (u-boot-sunxi-with-spl.bin)
- Remove patch file for uboot, switch to binman
- Merge boot partition into rootfs partition
- Bump kernel version to 6.1.61
Changes v4 -> v5:
- Bump kernel version to 6.1.65
---
board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++
board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++
board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++
board/friendlyarm/nanopi-neo2/readme.txt | 34 +++++++++++++++
configs/friendlyarm_nanopi_neo2_defconfig | 48 +++++++++++++++++++++
5 files changed, 107 insertions(+)
create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf
create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg
create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh
create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt
create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig
diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf
new file mode 100644
index 0000000000..482a069f74
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/extlinux.conf
@@ -0,0 +1,4 @@
+label friendlyarm-nanopi-buildroot
+ kernel /boot/Image
+ devicetree /boot/sun50i-h5-nanopi-neo2.dtb
+ append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait
diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 0000000000..67e4e5efdb
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,16 @@
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot-tpl-spl-dtb {
+ in-partition-table = "no"
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8K
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ offset = 1M
+ }
+}
diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh
new file mode 100755
index 0000000000..c7ec875068
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/post-build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname "$0")"
+
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf"
diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 0000000000..c896a57525
--- /dev/null
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,34 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the NanoPi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Wiki link:
+https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+ $ make friendlyarm_nanopi_neo2_defconfig
+ $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+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
+ $ sync
+
+Insert the micro SDcard in your NanoPi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 0000000000..a955ec323a
--- /dev/null
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,48 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-08 0:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-31 8:49 [Buildroot] [PATCH] configs/friendlyarm_nanopi_neo2_defconfig: new board Scott Fan
2023-10-31 21:14 ` Yann E. MORIN
2023-10-31 21:27 ` Yann E. MORIN
2023-11-01 0:53 ` Scott Fan
2023-11-01 10:36 ` Yann E. MORIN
2023-11-01 1:34 ` Scott Fan
-- strict thread matches above, loose matches on Subject: below --
2023-11-01 1:31 Scott Fan
2023-11-04 19:23 [Buildroot] [PATCH v4] " Scott Fan
2023-12-08 0:34 ` [Buildroot] [PATCH] " Scott Fan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox