[Buildroot] [git commit] configs/pine64_rockpro64: remove defconfig
Peter Korsgaard
peter at korsgaard.com
Sun Sep 1 09:36:49 UTC 2019
commit: https://git.buildroot.net/buildroot/commit/?id=10f49213b7e2837ae6ed63fc16fbdaa954ecd87f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This defconfig tries to build an ARM Trusted Firmware version that
needs an ARM32 toolchain, which is not available as the platform is an
ARM64 one. The correct solution for this is to have a package in
Buildroot for an ARM32 bare-metal toolchain, but this wasn't done in
time for the 2019.08 release.
In order to not release 2019.08 with a broken defconfig, let's remove
it. It can be re-added later once the ARM32 bare-metal toolchain
problem has been resolved.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/278489367
Cc: Shyam Saini <shyam.saini at amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.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 | 54 ------------------------------------
7 files changed, 143 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 311a3a742b..85dfe95376 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -246,7 +246,6 @@ 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 b12cb13ec9..15994ceb2d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2095,10 +2095,8 @@ F: package/wolfssl/
N: Shyam Saini <shyam.saini at amarulasolutions.com>
F: board/olimex/a33_olinuxino/
-F: board/pine64/rockpro64/
F: board/radxa/rock-pi4/
F: configs/olimex_a33_olinuxino_defconfig
-F: configs/pine64_rockpro64_defconfig
F: configs/radxa_rock_pi4_defconfig
N: Simon Dawson <spdawson at gmail.com>
diff --git a/board/pine64/rockpro64/extlinux.conf b/board/pine64/rockpro64/extlinux.conf
deleted file mode 100644
index ff196499b0..0000000000
--- a/board/pine64/rockpro64/extlinux.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index b8c1cd5220..0000000000
--- a/board/pine64/rockpro64/genimage.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100755
index e852ba6adf..0000000000
--- a/board/pine64/rockpro64/post-build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
deleted file mode 100644
index 2fa8be362f..0000000000
--- a/board/pine64/rockpro64/readme.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 7b52712560..0000000000
--- a/configs/pine64_rockpro64_defconfig
+++ /dev/null
@@ -1,54 +0,0 @@
-# Architecture
-BR2_aarch64=y
-BR2_cortex_a72_a53=y
-
-# Linux headers same as kernel, a 5.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_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_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"
More information about the buildroot
mailing list