From 9eeeda7169da41725f8eb3a042886de7542aa25e Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Thu, 25 Feb 2021 16:20:24 +0000 Subject: [PATCH] arm-bsp/fvp-base*: move to u-boot 2021.01 Move both FVP platforms to u-boot 2021.01 Change-Id: I764ff964025bb1a0266f4c91469372ed5ffffde2 Signed-off-by: Anders Dellien Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-common.inc | 2 +- .../0001-Add-vexpress_aemv8a_aarch32-variant.patch | 0 .../fvp-base/u-boot_vexpress_fvp.patch | 0 .../u-boot/{u-boot_2020.10.bbappend => u-boot_2021.01.bbappend} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2020.10 => u-boot-2021.01}/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2020.10 => u-boot-2021.01}/fvp-base/u-boot_vexpress_fvp.patch (100%) rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot_2020.10.bbappend => u-boot_2021.01.bbappend} (100%) diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 94aa2bfe..c4a5f6b3 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -31,7 +31,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "5.10%" -PREFERRED_VERSION_u-boot ?= "2020.10" +PREFERRED_VERSION_u-boot ?= "2021.01" PREFERRED_VERSION_trusted-firmware-a ?= "2.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/u-boot_vexpress_fvp.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base/u-boot_vexpress_fvp.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/u-boot_vexpress_fvp.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.01.bbappend similarity index 100% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.01.bbappend