From fb045c90194be87bbb12de8f2265c4faccb76513 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 23 Nov 2020 16:29:58 +0000 Subject: [PATCH] arm-bsp: remove foundation-armv8 machine The Foundation FVP machine is no longer relevant now that meta-arm has Base FVP machines and the Base FVPs are freely available. Change-Id: Ia7043d98e2bcd8433c8c3d2661cd28484f691276 Signed-off-by: Ross Burton --- .../conf/machine/foundation-armv8.conf | 17 ------- .../documentation/foundation-armv8.md | 51 ------------------- .../trusted-firmware-a-fvp.inc | 5 +- .../trusted-firmware-a_2.3.bbappend | 1 - .../u-boot/u-boot_2020.07.bbappend | 6 --- .../linux/linux-arm-platforms.inc | 7 --- 6 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 meta-arm-bsp/conf/machine/foundation-armv8.conf delete mode 100644 meta-arm-bsp/documentation/foundation-armv8.md diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf deleted file mode 100644 index 0ec6ecd1..00000000 --- a/meta-arm-bsp/conf/machine/foundation-armv8.conf +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Armv8-A Foundation - -#@TYPE: Machine -#@NAME: Armv8-A Foundation Platform machine -#@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model - -require conf/machine/fvp-common.inc -require conf/machine/include/arm/arch-armv8a.inc - -TUNE_FEATURES = "aarch64" - -# FVP u-boot configuration -UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" - -KERNEL_IMAGETYPE = "Image" - -KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb" diff --git a/meta-arm-bsp/documentation/foundation-armv8.md b/meta-arm-bsp/documentation/foundation-armv8.md deleted file mode 100644 index 72f9f66b..00000000 --- a/meta-arm-bsp/documentation/foundation-armv8.md +++ /dev/null @@ -1,51 +0,0 @@ -# Armv8-A Base Platform Support in meta-arm-bsp - -## Howto Build and Run - -### Configuration: -In the local.conf file, MACHINE should be set as follow: -MACHINE ?= "foundation-armv8" - -### Build: -```bash$ bitbake core-image-minimal``` - -### Run: -To Run the Fixed Virtual Platform simulation tool you must download "Armv8-A -Foundation Platform" from Arm developer (This might require the user to -register) from this address: -https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms -and install it on your host PC. - -Fast Models Fixed Virtual Platforms (FVP) Reference Guide: -https://developer.arm.com/docs/100966/latest - -Armv8‑A Foundation Platform User Guide: -https://developer.arm.com/docs/100961/latest/ - - -Once done, do the following to build and run an image: -```bash$ bitbake core-image-minimal``` -```bash$ export YOCTO_DEPLOY_IMGS_DIR=""``` -```bash$ cd ``` -``` -bash$ ./Foundation_Platform --cores=4 --no-sve --gicv3 \ - --data=${YOCTO_DEPLOY_IMGS_DIR}/bl1-fvp.bin@0x0 \ - --data=${YOCTO_DEPLOY_IMGS_DIR}/fip-fvp.bin@0x8000000 \ - --data=${YOCTO_DEPLOY_IMGS_DIR}/Image@0x80080000 \ - --data=${YOCTO_DEPLOY_IMGS_DIR}/foundation-v8-gicv3-psci.dtb@0x83000000 \ - --block-device=${YOCTO_DEPLOY_IMGS_DIR}/core-image-minimal-foundation-armv8.disk.img -``` - -If you have built a configuration without a ramdisk, you can use the following -command in U-boot to start Linux: -```VExpress64# booti 0x80080000 - 0x83000000``` - -## Devices supported in the kernel -- serial -- virtio disk -- network -- watchdog -- rtc - -## Devices not supported or not functional -None diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc index 27031ebc..43340cdc 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc @@ -1,11 +1,10 @@ # FVP specific TFA parameters # -# Armv8-A Base Platform FVP and Armv8-A Foundation Platform uses the same -# TFAs. +# Armv8-A Base Platform FVP # -COMPATIBLE_MACHINE = "fvp-base|foundation-armv8" +COMPATIBLE_MACHINE = "fvp-base" TFA_PLATFORM = "fvp" TFA_DEBUG = "1" TFA_MBEDTLS = "1" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend index 02e69a87..039acf57 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend @@ -3,7 +3,6 @@ MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc" MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc" -MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc" MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc" MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend index 1a1df270..8facc312 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend @@ -3,7 +3,6 @@ THIS_DIR := "${THISDIR}" FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:" FILESEXTRAPATHS_prepend_fvp-base = "${THIS_DIR}/${BP}/fvp-common:" -FILESEXTRAPATHS_prepend_foundation-armv8 = "${THIS_DIR}/${BP}/fvp-common:" # # Corstone-500 MACHINE @@ -12,11 +11,6 @@ SRC_URI_append_corstone500 = " \ file://0001-armv7-adding-generic-timer-access-through-MMIO.patch \ file://0002-board-arm-add-corstone500-board.patch" -# -# FVP FOUNDATION KMACHINE -# -SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" - # # FVP BASE KMACHINE # diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 5d71babd..b28a082d 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -9,7 +9,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" # Arm platforms kmeta SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" -SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}" SRC_URI_append_fvp-base-arm32 = " ${SRC_URI_KMETA}" SRC_URI_append_juno = " ${SRC_URI_KMETA}" @@ -22,12 +21,6 @@ SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" # COMPATIBLE_MACHINE_corstone500 = "corstone500" -# -# FVP FOUNDATION KMACHINE -# -COMPATIBLE_MACHINE_foundation-armv8 = "foundation-armv8" -KMACHINE_foundation-armv8 = "fvp" - # # FVP BASE KMACHINE #