Revert "configs/nanopi_neo4: remove defconfig"
PATCH 1/2 Revert "configs/nanopi_neo4: remove defconfig"
This reverts commit 8af7b11bd8a95bc41e4de46f727f3b0afde465a4.
# Conflicts:
# .gitlab-ci.yml
# DEVELOPERS
--- 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 | 54 +++++++++++++++++++++++++++++ 5 files changed, 142 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
board/friendlyarm/nanopi-neo4/extlinux.conf new file +4 -0
@@ -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
board/friendlyarm/nanopi-neo4/genimage.cfg new file +22 -0
@@ -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" + } +}
board/friendlyarm/nanopi-neo4/post-build.sh new file +9 -0
@@ -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
board/friendlyarm/nanopi-neo4/readme.txt new file +53 -0
53 lines not on this page · raw message
configs/nanopi_neo4_defconfig new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 2/2 nanpi_neo4_config: Enable BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN option
--- configs/nanopi_neo4_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/nanopi_neo4_defconfig +1 -0
@@ -11,6 +11,7 @@ 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_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader
Signature · 1 line
2.7.4
PATCH 2/2 nanpi_neo4_config: Enable BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN optiony
Quoted 10 lines
Signed-off-by Marek Belisko <[email protected]>--- configs/nanopi_neo4_defconfig | 1 + 1 file changed, 1 insertion(+)configs/nanopi_neo4_defconfig +0
-0
configs/nanopi_neo4_defconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y · line 15
Quoted 5 lines
configs/nanopi_neo4_defconfig +1
-0@@ -11,6 +11,7 @@ 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_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
I would suggest to write proper commit messages for these two patches.
Otherwise neo4 build looks good:
Regards,
Sergey
PATCH 2/2 nanpi_neo4_config: Enable BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN optiony
Quoted 6 lines · Sergey Matyukevich
Quoted 6 lines
Signed-off-by Marek Belisko <[email protected]>--- configs/nanopi_neo4_defconfig | 1 + 1 file changed, 1 insertion(+)
Quoted 12 lines
configs/nanopi_neo4_defconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y · line 15
Quoted 10 lines
configs/nanopi_neo4_defconfig +1
-0@@ -11,6 +11,7 @@ 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_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=yI would suggest to write proper commit messages for these two patches.
OK fine. I have in queue also patch for bumping kernel to 5.4 will test and post updated version. Thanks.
Quoted 6 lines
Otherwise neo4 build looks good:
Tested-by Sergey Matyukevich <[email protected]>Regards,
Sergey
BR,
marek