From 84f7dd6243395f6fc045ff34682fdbc2f5188482 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 14 Jun 2022 13:15:12 -0400 Subject: [PATCH] arm-bsp/fvp-base: get v2022.04 u-boot working Recent modifications in u-boot moved the default location of the FDT. Update the runfvp parameters to match this new location. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-base.conf | 2 +- meta-arm-bsp/conf/machine/fvp-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 91b3f443..434812b3 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -9,7 +9,7 @@ require conf/machine/include/arm/arch-armv8a.inc TUNE_FEATURES = "aarch64" -PREFERRED_VERSION_u-boot ?= "2022.01" +PREFERRED_VERSION_u-boot ?= "2022.04" # FVP u-boot configuration UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig" diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index f8328cf4..c834f24d 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -40,7 +40,7 @@ FVP_CONFIG[cluster0.has_arm_v8-4] = "1" FVP_CONFIG[cluster1.has_arm_v8-4] = "1" FVP_CONSOLE ?= "terminal_0" FVP_DATA ?= "cluster0.cpu0=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}@0x80080000 \ - cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-revc.dtb@0x83000000" + cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-revc.dtb@0x8fc00000" FVP_TERMINALS[bp.terminal_0] ?= "Console" FVP_TERMINALS[bp.terminal_1] ?= "" FVP_TERMINALS[bp.terminal_2] ?= ""