Move the variables to meta-toolchain, refactor the alias for purecap sysroot.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello-toolchain/conf/layer.conf | 15 +++++++++++++++ meta-morello/conf/machine/morello-fvp.conf | 1 - meta-morello/conf/machine/morello-soc.conf | 1 - 3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/meta-morello-toolchain/conf/layer.conf b/meta-morello-toolchain/conf/layer.conf index e40e76d..cb4c909 100644 --- a/meta-morello-toolchain/conf/layer.conf +++ b/meta-morello-toolchain/conf/layer.conf @@ -12,6 +12,21 @@ LAYERDEPENDS_meta-morello-toolchain = " \ " LAYERSERIES_COMPAT_meta-morello-toolchain = "kirkstone"
+PURECAP_SYSROOT_DIR ??= "${libdir}/${GLOBAL_ARCH_TRIPLE}" + +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}" + MORELLO_ARCH ??= "c64" TOOLCHAIN ??= "gnu" MORELLO_TOOLCHAIN ??= "gcc-morello" diff --git a/meta-morello/conf/machine/morello-fvp.conf b/meta-morello/conf/machine/morello-fvp.conf index 61f05d9..1c415f5 100644 --- a/meta-morello/conf/machine/morello-fvp.conf +++ b/meta-morello/conf/machine/morello-fvp.conf @@ -12,7 +12,6 @@ BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-fvp" TMPDIR = "${TOPDIR}/tmp-fvp"
MORELLO_TOOLCHAIN = "llvm-morello" -MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"
IMAGE_BASENAME = "usb-image"
diff --git a/meta-morello/conf/machine/morello-soc.conf b/meta-morello/conf/machine/morello-soc.conf index 5f17d43..d2d43e7 100644 --- a/meta-morello/conf/machine/morello-soc.conf +++ b/meta-morello/conf/machine/morello-soc.conf @@ -12,7 +12,6 @@ BSP_DTB_DIR ?= "${TMPDIR}/deploy/images/morello-soc" TMPDIR = "${TOPDIR}/tmp-soc"
MORELLO_TOOLCHAIN = "llvm-morello" -MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"
IMAGE_BASENAME = "usb-image"