| Message ID | 20220318165422.1711512-4-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] arm/oeqa/fvp: show more log from the FVP on failure | expand |
diff --git a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf index acaadbaf..b6fe6f77 100644 --- a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf +++ b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf @@ -8,6 +8,7 @@ require conf/machine/fvp-common.inc require conf/machine/include/arm/arch-armv7a.inc # FVP u-boot configuration +PREFERRED_VERSION_u-boot ?= "2021.10" UBOOT_MACHINE = "vexpress_aemv8a_aarch32_defconfig" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 3da1ef0b..b0aeb81f 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -14,8 +14,6 @@ SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_u-boot ?= "2021.10" - EXTRA_IMAGEDEPENDS += "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/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg index b7510f48..716600f4 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg @@ -1 +1,3 @@ CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda1 rw rootwait" +# Our FVP support CRC instructions +CONFIG_ARM64_CRC32=y
Explicitly enable use of CRC instructions: we configure fvp-base to have armv8.4 cores, but the default uboot config disables crc (see uboot 51d8367d8). Keep fvp-base-arm32 on 2021.10 as the arm32-specific patches need rebasing, and a trivial rebase doesn't boot successfully. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/machine/fvp-base-arm32.conf | 1 + meta-arm-bsp/conf/machine/fvp-common.inc | 2 -- meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/bootargs.cfg | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-)