From 5b35ed7d4de0d16dbd7dd97454f986e94c1d51ab Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 3 Nov 2020 12:20:47 -0500 Subject: [PATCH] arm-bsp: convert general u-boot bbappend to version specific The generic u-boot bbappend is causing issues upstream when trying to use new or older versions of u-boot, by trying to apply patches from folders that do not exist. Change-Id: I399e3234fba852382fc73ab68f14a7e826bb5a42 Signed-off-by: Jon Mason --- .../0001-arm-Add-corstone700-platform.patch | 0 ...02-boot-add-bootx-command-to-start-XiP-images.patch | 0 ...t-starting-the-XIP-kernel-using-bootx-command.patch | 0 .../0004-arm-enabling-the-arch_timer-driver.patch | 0 .../recipes-bsp/u-boot/u-boot_2020.04.bbappend | 8 ++++++++ .../{u-boot_%.bbappend => u-boot_2020.07.bbappend} | 10 ---------- 6 files changed, 8 insertions(+), 10 deletions(-) rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.04}/corstone700/0001-arm-Add-corstone700-platform.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.04}/corstone700/0002-boot-add-bootx-command-to-start-XiP-images.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.04}/corstone700/0003-boot-starting-the-XIP-kernel-using-bootx-command.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.04}/corstone700/0004-arm-enabling-the-arch_timer-driver.patch (100%) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.04.bbappend rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot_%.bbappend => u-boot_2020.07.bbappend} (66%) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0001-arm-Add-corstone700-platform.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0001-arm-Add-corstone700-platform.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0001-arm-Add-corstone700-platform.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0001-arm-Add-corstone700-platform.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0002-boot-add-bootx-command-to-start-XiP-images.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0002-boot-add-bootx-command-to-start-XiP-images.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0002-boot-add-bootx-command-to-start-XiP-images.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0002-boot-add-bootx-command-to-start-XiP-images.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0003-boot-starting-the-XIP-kernel-using-bootx-command.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0003-boot-starting-the-XIP-kernel-using-bootx-command.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0003-boot-starting-the-XIP-kernel-using-bootx-command.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0003-boot-starting-the-XIP-kernel-using-bootx-command.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0004-arm-enabling-the-arch_timer-driver.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0004-arm-enabling-the-arch_timer-driver.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/files/corstone700/0004-arm-enabling-the-arch_timer-driver.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.04/corstone700/0004-arm-enabling-the-arch_timer-driver.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.04.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.04.bbappend new file mode 100644 index 00000000..00b40e55 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.04.bbappend @@ -0,0 +1,8 @@ +# +# Corstone700 KMACHINE +# +FILESEXTRAPATHS_prepend_corstone700 := "${THISDIR}/${BP}/corstone700:" +SRC_URI_append_corstone700 = " file://0001-arm-Add-corstone700-platform.patch \ + file://0002-boot-add-bootx-command-to-start-XiP-images.patch \ + file://0003-boot-starting-the-XIP-kernel-using-bootx-command.patch \ + file://0004-arm-enabling-the-arch_timer-driver.patch" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend similarity index 66% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend index 303f18e8..c1f8b014 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend @@ -35,13 +35,3 @@ SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch" # Total Compute KMACHINE # SRC_URI_append_tc0 = " file://0001-Add-support-for-Total-Compute.patch" - -# -# Corstone700 KMACHINE -# -FILESEXTRAPATHS_prepend_corstone700 := "${THISDIR}/files/corstone700:" - -SRC_URI_append_corstone700 = " file://0001-arm-Add-corstone700-platform.patch \ - file://0002-boot-add-bootx-command-to-start-XiP-images.patch \ - file://0003-boot-starting-the-XIP-kernel-using-bootx-command.patch \ - file://0004-arm-enabling-the-arch_timer-driver.patch"