arm-bsp: Fix u-boot 2020.07 recipe
PATCH 1/1 arm-bsp: Fix u-boot 2020.07 recipe
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 <[email protected]>
--- 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(-)
meta-arm-bsp/conf/machine/a5ds.conf +1 -0
@@ -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"
meta-arm-bsp/conf/machine/fvp-common.inc +2 -0
@@ -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
meta-arm-bsp/conf/machine/juno.conf +1 -0
@@ -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"
meta-arm-bsp/conf/machine/tc0.conf +1 -0
@@ -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"
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb +0 -2
@@ -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"
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 6 lines · Jon Mason
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 I5b99e92f3f440812ebc1fc550e6b860e6530e9b7Signed-off-by Jon Mason <[email protected]>
Applied to master.
Thanks,
Jon
Quoted 77 lines
--- 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(-)meta-arm-bsp/conf/machine/a5ds.conf +1
-0@@ -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"meta-arm-bsp/conf/machine/fvp-common.inc +2
-0@@ -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 ismeta-arm-bsp/conf/machine/juno.conf +1
-0@@ -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"meta-arm-bsp/conf/machine/tc0.conf +1
-0@@ -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"meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bb +0
-2@@ -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"Signature · 1 line
2.17.1