Use 1.6 versions of the software stack. Remove duplicate variables that live now in meta-morello-toolchain.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../conf/machine/include/morello-common.inc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 1c29774..8cc7992 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -9,28 +9,14 @@ 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 = "morello-1.5" +PREFERRED_VERSION_virtual/kernel = "morello-1.6"
-PREFERRED_VERSION_musl = "morello-1.5" +PREFERRED_VERSION_musl = "morello-1.6"
GDBVERSION = "morello-11.0"
-MUSL_INSTALL_DIR ??="" MORELLO_TOOLCHAIN ??= "llvm-morello"
-C64_ARCH_TRIPLE = "aarch64-linux-musl_purecap" -A64_ARCH_TRIPLE = "aarch64-linux-gnu" - -A64_LIB_TRIPLE = "aarch64-unknown-linux-gnu" -C64_LIB_TRIPLE = "aarch64-unknown-linux-musl_purecap" - -A64_ARCH_FLAGS = "-march=armv8" -C64_ARCH_FLAGS = "-march=morello+c64 -mabi=purecap" - -GLOBAL_ARCH_TRIPLE ?= "${C64_ARCH_TRIPLE}" -GLOBAL_LIB_TRIPLE ?= "${C64_LIB_TRIPLE}" -GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}" - APP_DIR ?= "pure-cap-apps"
KERNEL_IMAGETYPE = "Image"