[meta-arm] arm-bsp: convert general u-boot bbappend to version specific

Submitted by Jon Mason on Nov. 3, 2020, 5:20 p.m. | Patch ID: 178073

Details

Message ID 20201103172047.18147-2-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason Nov. 3, 2020, 5:20 p.m.
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 <jon.mason@arm.com>

---
 .../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%)

-- 
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1328): https://lists.yoctoproject.org/g/meta-arm/message/1328
Mute This Topic: https://lists.yoctoproject.org/mt/78011382/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

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 0000000..00b40e5
--- /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 303f18e..c1f8b01 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"

Comments

Richard Purdie Nov. 7, 2020, 9:47 a.m.
On Tue, 2020-11-03 at 12:20 -0500, Jon Mason wrote:
> 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 <jon.mason@arm.com>

> ---

>  .../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 ++++++++


Thanks for this, it did resolve an error we were seeing on the
autobuilder. Unfortunately it is still generating a warning:

https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/427

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1341): https://lists.yoctoproject.org/g/meta-arm/message/1341
Mute This Topic: https://lists.yoctoproject.org/mt/78011382/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason Nov. 9, 2020, 3:05 p.m.
On Sat, Nov 07, 2020 at 09:47:28AM +0000, Richard Purdie wrote:
> On Tue, 2020-11-03 at 12:20 -0500, Jon Mason wrote:

> > 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 <jon.mason@arm.com>

> > ---

> >  .../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 ++++++++

> 

> Thanks for this, it did resolve an error we were seeing on the

> autobuilder. Unfortunately it is still generating a warning:

> 

> https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/427


I've traded one u-boot problem for another.  I think the best way to
handle this is to create a recipe in master for 2020.07.  This will
fix master, but have redundant recipes on gatesgarth.  So, I'll wait to
push this until after we fork the gatesgarth branch, which I am
hopeful will be this week (as we are waiting on patches that were
promised last week to fix a bug).  This would be a temporary solution,
as I want meta-arm-bsp off of that 2020.07 u-boot ASAP.  Also, I'll do
the patch now so that it can be staged to go in as soon as the branch
is forked.

Thanks,
Jon

> 

> Cheers,

> 

> Richard

> 

> 


> 

> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1347): https://lists.yoctoproject.org/g/meta-arm/message/1347
Mute This Topic: https://lists.yoctoproject.org/mt/78011382/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-