From c2fb4c1179e3cf09347d198d7d42ea53b614832f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 18 May 2021 12:02:17 -0400 Subject: [PATCH] arm-bsp/u-boot: free float the u-boot bbappend Since the u-boot recipe will be updated in the near future, decouple the bbappend from the current version to allow for it to work on both versions (and keep backward compatible with hardknott). Change-Id: Ia2447a80868f2e5011bf53fafb939b6a4566b662 Signed-off-by: Jon Mason --- .../0001-Add-vexpress_aemv8a_aarch32-variant.patch | 0 ...1-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch | 0 .../fvp-base/u-boot_vexpress_fvp.patch | 0 .../u-boot/{u-boot_2021.01.bbappend => u-boot_%.bbappend} | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2021.01 => u-boot}/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2021.01 => u-boot}/fvp-base/0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2021.01 => u-boot}/fvp-base/u-boot_vexpress_fvp.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot_2021.01.bbappend => u-boot_%.bbappend} (88%) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64_fvp-Set-DRAM-to-4G-to-match-with-kernel-d.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/u-boot_vexpress_fvp.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/u-boot_vexpress_fvp.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.01.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend similarity index 88% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.01.bbappend rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index fb4f192a..df9fdfbe 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.01.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,6 +1,6 @@ # Machine specific u-boot -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # # FVP BASE