[meta-arm] arm-bsp: Fix u-boot 2020.07 recipe

Submitted by Jon Mason on Nov. 12, 2020, 7:06 p.m. | Patch ID: 178075

Details

Message ID 20201112190611.16494-1-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason Nov. 12, 2020, 7:06 p.m.
The u-boot 2020.07 temporary recipe is a copy of 2020.04, and brought
with it a limitation in the recipe to only be used on certain hardware.
Remove this limitation so that it can be used where needed.

Change-Id: I5b99e92f3f440812ebc1fc550e6b860e6530e9b7
Signed-off-by: Jon Mason <jon.mason@arm.com>

---
 meta-arm-bsp/conf/machine/a5ds.conf               | 1 +
 meta-arm-bsp/conf/machine/fvp-common.inc          | 2 ++
 meta-arm-bsp/conf/machine/juno.conf               | 1 +
 meta-arm-bsp/conf/machine/tc0.conf                | 1 +
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb | 2 --
 5 files changed, 5 insertions(+), 2 deletions(-)

-- 
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1363): https://lists.yoctoproject.org/g/meta-arm/message/1363
Mute This Topic: https://lists.yoctoproject.org/mt/78213839/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/conf/machine/a5ds.conf b/meta-arm-bsp/conf/machine/a5ds.conf
index f7d35e7..5aadae5 100644
--- a/meta-arm-bsp/conf/machine/a5ds.conf
+++ b/meta-arm-bsp/conf/machine/a5ds.conf
@@ -17,6 +17,7 @@  SERIAL_CONSOLES = "115200;ttyAMA0"
 IMAGE_FSTYPES += "tar.bz2 cpio.gz"
 
 # Cortex-a5 u-boot configuration
+PREFERRED_VERSION_u-boot ?= "2020.07"
 UBOOT_MACHINE = "designstart_ca5_defconfig"
 UBOOT_IMAGE_ENTRYPOINT = "0x84000000"
 UBOOT_IMAGE_LOADADDRESS = "0x84000000"
diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc
index da45026..ad08c0e 100644
--- a/meta-arm-bsp/conf/machine/fvp-common.inc
+++ b/meta-arm-bsp/conf/machine/fvp-common.inc
@@ -31,6 +31,8 @@  SERIAL_CONSOLES = "115200;ttyAMA0"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
 
+PREFERRED_VERSION_u-boot ?= "2020.07"
+
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
 # As this is a virtual target that will not be used in the real world there is
diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf
index 50c9d2f..2f42dea 100644
--- a/meta-arm-bsp/conf/machine/juno.conf
+++ b/meta-arm-bsp/conf/machine/juno.conf
@@ -21,6 +21,7 @@  SERIAL_CONSOLES = "115200;ttyAMA0"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
+PREFERRED_VERSION_u-boot ?= "2020.07"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
 
diff --git a/meta-arm-bsp/conf/machine/tc0.conf b/meta-arm-bsp/conf/machine/tc0.conf
index 1eb3d87..7776dde 100644
--- a/meta-arm-bsp/conf/machine/tc0.conf
+++ b/meta-arm-bsp/conf/machine/tc0.conf
@@ -10,6 +10,7 @@  require conf/machine/include/arm/arch-armv8a.inc
 
 # Das U-boot
 UBOOT_MACHINE ?= "total_compute_defconfig"
+PREFERRED_VERSION_u-boot ?= "2020.07"
 
 # Trusted firmware A v2.3
 PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb
index 1a9721a..fa99a3a 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb
@@ -6,8 +6,6 @@  application code."
 SECTION = "bootloaders"
 DEPENDS += "flex-native bison-native"
 
-COMPATIBLE_MACHINE = "(corstone700-*)"
-
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"

Comments

Jon Mason Nov. 16, 2020, 2:26 p.m.
On Thu, Nov 12, 2020 at 02:06:11PM -0500, Jon Mason wrote:
> The u-boot 2020.07 temporary recipe is a copy of 2020.04, and brought

> with it a limitation in the recipe to only be used on certain hardware.

> Remove this limitation so that it can be used where needed.

> 

> Change-Id: I5b99e92f3f440812ebc1fc550e6b860e6530e9b7

> Signed-off-by: Jon Mason <jon.mason@arm.com>


Applied to master.

Thanks,
Jon

> ---

>  meta-arm-bsp/conf/machine/a5ds.conf               | 1 +

>  meta-arm-bsp/conf/machine/fvp-common.inc          | 2 ++

>  meta-arm-bsp/conf/machine/juno.conf               | 1 +

>  meta-arm-bsp/conf/machine/tc0.conf                | 1 +

>  meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb | 2 --

>  5 files changed, 5 insertions(+), 2 deletions(-)

> 

> diff --git a/meta-arm-bsp/conf/machine/a5ds.conf b/meta-arm-bsp/conf/machine/a5ds.conf

> index f7d35e7..5aadae5 100644

> --- a/meta-arm-bsp/conf/machine/a5ds.conf

> +++ b/meta-arm-bsp/conf/machine/a5ds.conf

> @@ -17,6 +17,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"

>  IMAGE_FSTYPES += "tar.bz2 cpio.gz"

>  

>  # Cortex-a5 u-boot configuration

> +PREFERRED_VERSION_u-boot ?= "2020.07"

>  UBOOT_MACHINE = "designstart_ca5_defconfig"

>  UBOOT_IMAGE_ENTRYPOINT = "0x84000000"

>  UBOOT_IMAGE_LOADADDRESS = "0x84000000"

> diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc

> index da45026..ad08c0e 100644

> --- a/meta-arm-bsp/conf/machine/fvp-common.inc

> +++ b/meta-arm-bsp/conf/machine/fvp-common.inc

> @@ -31,6 +31,8 @@ SERIAL_CONSOLES = "115200;ttyAMA0"

>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"

>  PREFERRED_VERSION_linux-yocto ?= "5.4%"

>  

> +PREFERRED_VERSION_u-boot ?= "2020.07"

> +

>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"

>  

>  # As this is a virtual target that will not be used in the real world there is

> diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf

> index 50c9d2f..2f42dea 100644

> --- a/meta-arm-bsp/conf/machine/juno.conf

> +++ b/meta-arm-bsp/conf/machine/juno.conf

> @@ -21,6 +21,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"

>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"

>  PREFERRED_VERSION_linux-yocto ?= "5.4%"

>  PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"

> +PREFERRED_VERSION_u-boot ?= "2020.07"

>  

>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"

>  

> diff --git a/meta-arm-bsp/conf/machine/tc0.conf b/meta-arm-bsp/conf/machine/tc0.conf

> index 1eb3d87..7776dde 100644

> --- a/meta-arm-bsp/conf/machine/tc0.conf

> +++ b/meta-arm-bsp/conf/machine/tc0.conf

> @@ -10,6 +10,7 @@ require conf/machine/include/arm/arch-armv8a.inc

>  

>  # Das U-boot

>  UBOOT_MACHINE ?= "total_compute_defconfig"

> +PREFERRED_VERSION_u-boot ?= "2020.07"

>  

>  # Trusted firmware A v2.3

>  PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"

> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb

> index 1a9721a..fa99a3a 100644

> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb

> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb

> @@ -6,8 +6,6 @@ application code."

>  SECTION = "bootloaders"

>  DEPENDS += "flex-native bison-native"

>  

> -COMPATIBLE_MACHINE = "(corstone700-*)"

> -

>  LICENSE = "GPLv2+"

>  LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"

>  PE = "1"

> -- 

> 2.17.1

> 


> 

> 

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