| Message ID | 20241023193949.59449-2-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-bsp/fvp-base: remove backported u-boot patches | expand |
diff --git a/meta-arm-bsp/recipes-bsp/hafnium/hafnium_%.bbappend b/meta-arm-bsp/recipes-bsp/hafnium/hafnium_%.bbappend index bfc2c464a1a1..79096bf1175d 100644 --- a/meta-arm-bsp/recipes-bsp/hafnium/hafnium_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/hafnium/hafnium_%.bbappend @@ -1,6 +1,5 @@ # Machine specific configurations MACHINE_HAFNIUM_REQUIRE ?= "" -MACHINE_HAFNIUM_REQUIRE:tc = "hafnium-tc.inc" require ${MACHINE_HAFNIUM_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend index 4421e79c8d51..bf0af54a671b 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_%.bbappend @@ -4,6 +4,5 @@ MACHINE_SCP_REQUIRE ?= "" MACHINE_SCP_REQUIRE:juno = "scp-firmware-juno.inc" MACHINE_SCP_REQUIRE:sgi575 = "scp-firmware-sgi575.inc" -MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc" require ${MACHINE_SCP_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 444d66cdc91c..01ce095ef225 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -8,6 +8,5 @@ MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp-base.inc" MACHINE_TFA_REQUIRE:juno = "trusted-firmware-a-juno.inc" MACHINE_TFA_REQUIRE:sbsa-ref = "trusted-firmware-a-sbsa-ref.inc" MACHINE_TFA_REQUIRE:sgi575 = "trusted-firmware-a-sgi575.inc" -MACHINE_TFA_REQUIRE:tc = "trusted-firmware-a-tc.inc" require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index 11f332ad3975..0bb60e6bd6f6 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -4,7 +4,6 @@ MACHINE_U-BOOT_REQUIRE ?= "" MACHINE_U-BOOT_REQUIRE:corstone1000 = "u-boot-corstone1000.inc" MACHINE_U-BOOT_REQUIRE:fvp-base = "u-boot-fvp-base.inc" MACHINE_U-BOOT_REQUIRE:juno = "u-boot-juno.inc" -MACHINE_U-BOOT_REQUIRE:tc = "u-boot-tc.inc" require ${MACHINE_U-BOOT_REQUIRE} 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 01803ba20561..8e964e17df60 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -90,13 +90,6 @@ COMPATIBLE_MACHINE:sgi575 = "sgi575" KBUILD_DEFCONFIG:sgi575 = "defconfig" KCONFIG_MODE:sgi575 = "--alldefconfig" -# -# Total Compute (TC0/TC1) KMACHINE -# -COMPATIBLE_MACHINE:tc = "(tc0|tc1)" -KBUILD_DEFCONFIG:tc = "defconfig" -KCONFIG_MODE:tc = "--alldefconfig" - # # sbsa-ref KMACHINE #
The tc files were removed some time ago, but there are still entries in the bbappends trying to reference those files. Remove them. Signed-off-by: Jon Mason <jon.mason@arm.com> Fixes: 0af53c645348 ("arm-bsp: Remove tc1") --- meta-arm-bsp/recipes-bsp/hafnium/hafnium_%.bbappend | 1 - .../recipes-bsp/scp-firmware/scp-firmware_%.bbappend | 1 - .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 1 - meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend | 1 - meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 7 ------- 5 files changed, 11 deletions(-)