[U-Boot] [PATCH 1/3] board/friendlyarm: Add support for friendlyarm nanopi neo4 board
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
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"
This initial support includes: Linux 5.1 Custom U-Boot Arm Trusted Firmware v2.0 Buildroot default packages
Tested-by: Akash Gajjar akash@openedev.com Signed-off-by: Shyam Saini shyam.saini@amarulasolutions.com --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/radxa/rock-pi4/extlinux.conf | 4 +++ board/radxa/rock-pi4/genimage.cfg | 22 +++++++++++++++ board/radxa/rock-pi4/post-build.sh | 9 +++++++ board/radxa/rock-pi4/readme.txt | 51 +++++++++++++++++++++++++++++++++++ configs/radxa_rock_pi4_defconfig | 55 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 144 insertions(+) create mode 100644 board/radxa/rock-pi4/extlinux.conf create mode 100644 board/radxa/rock-pi4/genimage.cfg create mode 100755 board/radxa/rock-pi4/post-build.sh create mode 100644 board/radxa/rock-pi4/readme.txt create mode 100644 configs/radxa_rock_pi4_defconfig
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f41bcf7c6..e290d602ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -250,6 +250,7 @@ qemu_x86_64_defconfig: { extends: .defconfig } qemu_x86_defconfig: { extends: .defconfig } qemu_xtensa_lx60_defconfig: { extends: .defconfig } qemu_xtensa_lx60_nommu_defconfig: { extends: .defconfig } +radxa_rock_pi4_defconfig: { extends: .defconfig } raspberrypi0_defconfig: { extends: .defconfig } raspberrypi0w_defconfig: { extends: .defconfig } raspberrypi2_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 55fb022218..5cbf19fb1f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2047,11 +2047,13 @@ F: board/friendlyarm/nanopi-m4/ F: board/friendlyarm/nanopi-neo4/ F: board/olimex/a33_olinuxino/ F: board/orangepi/orangepi-rk3399/ +F: board/radxa/ 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 +F: configs/radxa_rock_pi4_defconfig
N: Simon Dawson spdawson@gmail.com F: boot/at91bootstrap3/ diff --git a/board/radxa/rock-pi4/extlinux.conf b/board/radxa/rock-pi4/extlinux.conf new file mode 100644 index 0000000000..f939cf5c56 --- /dev/null +++ b/board/radxa/rock-pi4/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock pi4 linux + kernel /boot/Image + devicetree /boot/rk3399-rock-pi-4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/board/radxa/rock-pi4/genimage.cfg b/board/radxa/rock-pi4/genimage.cfg new file mode 100644 index 0000000000..b8c1cd5220 --- /dev/null +++ b/board/radxa/rock-pi4/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/radxa/rock-pi4/post-build.sh b/board/radxa/rock-pi4/post-build.sh new file mode 100755 index 0000000000..e852ba6adf --- /dev/null +++ b/board/radxa/rock-pi4/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/radxa/rock-pi4/readme.txt b/board/radxa/rock-pi4/readme.txt new file mode 100644 index 0000000000..a6c8f10e3c --- /dev/null +++ b/board/radxa/rock-pi4/readme.txt @@ -0,0 +1,51 @@ +Intro +===== + +Radxa Rock Pi4 is a RK3399 SoC based ARM64 board. + +Wiki: https://wiki.radxa.com/Rockpi4 + +Build +===== + +Run Rock Pi 4 configuration + + $ make radxa_rock_pi4_defconfig + +To build, run make comamnd. + + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.bin +├── bl31.elf +├── Image +├── rk3399-rock-pi-4.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/radxa_rock_pi4_defconfig b/configs/radxa_rock_pi4_defconfig new file mode 100644 index 0000000000..1bf7e17909 --- /dev/null +++ b/configs/radxa_rock_pi4_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 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="rock-pi-4-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="5.1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-pi-4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="Rock Pi4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Rock Pi4!" +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/radxa/rock-pi4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock-pi4/post-build.sh"
This initial support includes: Linux 5.1 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/pine64/rockpro64/extlinux.conf | 4 +++ board/pine64/rockpro64/genimage.cfg | 22 +++++++++++++++ board/pine64/rockpro64/post-build.sh | 9 ++++++ board/pine64/rockpro64/readme.txt | 51 +++++++++++++++++++++++++++++++++ configs/pine64_rockpro64_defconfig | 55 ++++++++++++++++++++++++++++++++++++ 7 files changed, 144 insertions(+) create mode 100644 board/pine64/rockpro64/extlinux.conf create mode 100644 board/pine64/rockpro64/genimage.cfg create mode 100755 board/pine64/rockpro64/post-build.sh create mode 100644 board/pine64/rockpro64/readme.txt create mode 100644 configs/pine64_rockpro64_defconfig
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e290d602ad..5c9e344f8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,6 +215,7 @@ pandaboard_defconfig: { extends: .defconfig } pc_x86_64_bios_defconfig: { extends: .defconfig } pc_x86_64_efi_defconfig: { extends: .defconfig } pine64_defconfig: { extends: .defconfig } +pine64_rockpro64_defconfig: { extends: .defconfig } pine64_sopine_defconfig: { extends: .defconfig } qemu_aarch64_virt_defconfig: { extends: .defconfig } qemu_arm_versatile_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 5cbf19fb1f..64b84a06a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2047,12 +2047,14 @@ F: board/friendlyarm/nanopi-m4/ F: board/friendlyarm/nanopi-neo4/ F: board/olimex/a33_olinuxino/ F: board/orangepi/orangepi-rk3399/ +F: board/pine64/rockpro64 F: board/radxa/ 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 +F: configs/pine64_rockpro64_defconfig F: configs/radxa_rock_pi4_defconfig
N: Simon Dawson spdawson@gmail.com diff --git a/board/pine64/rockpro64/extlinux.conf b/board/pine64/rockpro64/extlinux.conf new file mode 100644 index 0000000000..ff196499b0 --- /dev/null +++ b/board/pine64/rockpro64/extlinux.conf @@ -0,0 +1,4 @@ +label RockPro64 linux + kernel /boot/Image + devicetree /boot/rk3399-rockpro64.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg new file mode 100644 index 0000000000..b8c1cd5220 --- /dev/null +++ b/board/pine64/rockpro64/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/pine64/rockpro64/post-build.sh b/board/pine64/rockpro64/post-build.sh new file mode 100755 index 0000000000..e852ba6adf --- /dev/null +++ b/board/pine64/rockpro64/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/pine64/rockpro64/readme.txt b/board/pine64/rockpro64/readme.txt new file mode 100644 index 0000000000..2fa8be362f --- /dev/null +++ b/board/pine64/rockpro64/readme.txt @@ -0,0 +1,51 @@ +Intro +===== + +Pine64 RockPro64 is a RK3399 SoC based ARM64 board. + +Wiki: https://wiki.pine64.org/index.php/ROCKPro64_Main_Page + +Build +===== + +Run Pine64 RockPro64 configuration + + $ make pine64_rockpro64_defconfig + +To build, run make comamnd. + + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.bin +├── bl31.elf +├── Image +├── rk3399-rockpro64.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/pine64_rockpro64_defconfig b/configs/pine64_rockpro64_defconfig new file mode 100644 index 0000000000..283d4331d5 --- /dev/null +++ b/configs/pine64_rockpro64_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 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="rockpro64-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="5.1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="RockPro 64" +BR2_TARGET_GENERIC_ISSUE="Welcome to RockPro64!" +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/pine64/rockpro64/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh"
My sincere apologies, these patches were intended for buildroot mailing list My reverse search did some mistake.
On Tue, Jun 4, 2019 at 2:17 PM Shyam Saini shyam.saini@amarulasolutions.com wrote:
This initial support includes: Linux 5.1 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/pine64/rockpro64/extlinux.conf | 4 +++ board/pine64/rockpro64/genimage.cfg | 22 +++++++++++++++ board/pine64/rockpro64/post-build.sh | 9 ++++++ board/pine64/rockpro64/readme.txt | 51 +++++++++++++++++++++++++++++++++ configs/pine64_rockpro64_defconfig | 55 ++++++++++++++++++++++++++++++++++++ 7 files changed, 144 insertions(+) create mode 100644 board/pine64/rockpro64/extlinux.conf create mode 100644 board/pine64/rockpro64/genimage.cfg create mode 100755 board/pine64/rockpro64/post-build.sh create mode 100644 board/pine64/rockpro64/readme.txt create mode 100644 configs/pine64_rockpro64_defconfig
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e290d602ad..5c9e344f8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,6 +215,7 @@ pandaboard_defconfig: { extends: .defconfig } pc_x86_64_bios_defconfig: { extends: .defconfig } pc_x86_64_efi_defconfig: { extends: .defconfig } pine64_defconfig: { extends: .defconfig } +pine64_rockpro64_defconfig: { extends: .defconfig } pine64_sopine_defconfig: { extends: .defconfig } qemu_aarch64_virt_defconfig: { extends: .defconfig } qemu_arm_versatile_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 5cbf19fb1f..64b84a06a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2047,12 +2047,14 @@ F: board/friendlyarm/nanopi-m4/ F: board/friendlyarm/nanopi-neo4/ F: board/olimex/a33_olinuxino/ F: board/orangepi/orangepi-rk3399/ +F: board/pine64/rockpro64 F: board/radxa/ 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 +F: configs/pine64_rockpro64_defconfig F: configs/radxa_rock_pi4_defconfig
N: Simon Dawson spdawson@gmail.com diff --git a/board/pine64/rockpro64/extlinux.conf b/board/pine64/rockpro64/extlinux.conf new file mode 100644 index 0000000000..ff196499b0 --- /dev/null +++ b/board/pine64/rockpro64/extlinux.conf @@ -0,0 +1,4 @@ +label RockPro64 linux
- kernel /boot/Image
- devicetree /boot/rk3399-rockpro64.dtb
- append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait
diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg new file mode 100644 index 0000000000..b8c1cd5220 --- /dev/null +++ b/board/pine64/rockpro64/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 = 8Msize = 30M}partition rootfs {partition-type = 0x83image = "rootfs.ext4"}+} diff --git a/board/pine64/rockpro64/post-build.sh b/board/pine64/rockpro64/post-build.sh new file mode 100755 index 0000000000..e852ba6adf --- /dev/null +++ b/board/pine64/rockpro64/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/pine64/rockpro64/readme.txt b/board/pine64/rockpro64/readme.txt new file mode 100644 index 0000000000..2fa8be362f --- /dev/null +++ b/board/pine64/rockpro64/readme.txt @@ -0,0 +1,51 @@ +Intro +=====
+Pine64 RockPro64 is a RK3399 SoC based ARM64 board.
+Wiki: https://wiki.pine64.org/index.php/ROCKPro64_Main_Page
+Build +=====
+Run Pine64 RockPro64 configuration
- $ make pine64_rockpro64_defconfig
+To build, run make comamnd.
- $ make
+Files created in output directory +=================================
+output/images
+├── bl31.bin +├── bl31.elf +├── Image +├── rk3399-rockpro64.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/pine64_rockpro64_defconfig b/configs/pine64_rockpro64_defconfig new file mode 100644 index 0000000000..283d4331d5 --- /dev/null +++ b/configs/pine64_rockpro64_defconfig @@ -0,0 +1,55 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y
+# Linux headers same as kernel, a 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="rockpro64-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="5.1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="RockPro 64" +BR2_TARGET_GENERIC_ISSUE="Welcome to RockPro64!" +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/pine64/rockpro64/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh"
2.11.0
On Tue, Jun 04, 2019 at 02:17:03PM +0530, Shyam Saini 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
.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
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 }
We don't have gitlab-ci setup in mainline, so this won't apply as-is. I would however very much like to see what you have as I'd posted elsewhere my gitlab-ci file that converts what we do in travis to gitlab. Thanks!
Hi Tom,
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
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 }
We don't have gitlab-ci setup in mainline, so this won't apply as-is. I would however very much like to see what you have as I'd posted elsewhere my gitlab-ci file that converts what we do in travis to gitlab. Thanks!
These are the buildroot patches which I accidentally sent to u-boot mailing list. Sorry for the confusion and noise.
Thanks!!
participants (2)
-
Shyam Saini -
Tom Rini