Use the new versioning scheme. SOC and FVP will use the same versions anyway so move it to the include file.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/conf/machine/include/morello-common.inc | 10 +++++++++- meta-morello/conf/machine/morello-fvp.conf | 4 ---- meta-morello/conf/machine/morello-soc.conf | 4 ---- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 51b4db7..4e5779d 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -2,8 +2,16 @@ require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
MACHINEOVERRIDES =. "morello"
+PREFERRED_VERSION_board-firmware = "morello-1.4" +PREFERRED_VERSION_edk2-firmware = "morello-2.4" +PREFERRED_VERSION_scp-firmware = "morello-2.1%" + +PREFERRED_VERSION_trusted-firmware-a = "morello-2.7" + PREFERRED_PROVIDER_virtual/kernel = "linux-morello" -PREFERRED_VERSION_virtual/kernel = "1.5" +PREFERRED_VERSION_virtual/kernel = "morello-1.5" + +GDBVERSION = "morello-11.0"
MUSL_INSTALL_DIR ??="" MORELLO_TOOLCHAIN ??= "llvm-morello" diff --git a/meta-morello/conf/machine/morello-fvp.conf b/meta-morello/conf/machine/morello-fvp.conf index 0aa78f6..1872118 100644 --- a/meta-morello/conf/machine/morello-fvp.conf +++ b/meta-morello/conf/machine/morello-fvp.conf @@ -2,10 +2,6 @@ require conf/machine/include/morello-common.inc
MACHINEOVERRIDES =. "morello-fvp:"
-PREFERRED_VERSION_scp-firmware = "2.10%" -PREFERRED_VERSION_trusted-firmware-a = "2.7%" -PREFERRED_VERSION_board-firmware = "1.4" - TCLIBCAPPEND = ""
BSP_GRUB_DIR ?= "${TMPDIR}/deploy/images/morello-fvp/grub-efi" diff --git a/meta-morello/conf/machine/morello-soc.conf b/meta-morello/conf/machine/morello-soc.conf index cafdcc9..9f4ff11 100644 --- a/meta-morello/conf/machine/morello-soc.conf +++ b/meta-morello/conf/machine/morello-soc.conf @@ -2,10 +2,6 @@ require conf/machine/include/morello-common.inc
MACHINEOVERRIDES =. "morello-soc:"
-PREFERRED_VERSION_scp-firmware = "2.10%" -PREFERRED_VERSION_trusted-firmware-a = "2.7%" -PREFERRED_VERSION_board-firmware = "1.4" - TCLIBCAPPEND = ""
BSP_GRUB_DIR ?= "${TMPDIR}/deploy/images/morello-soc/grub-efi"