This series of patches is simply updating the software stack to version 1.8, working implementation can be found here [1]
[1] https://git.morello-project.org/pzalewski/meta-morello/-/tree/release-1.8
Pawel Zalewski (9): classes: update llvm class to 14.0.0 v1.8 llvm-morello: update cross and target compilers to v1.8 musl: update version to v1.8 linux-morello: update version to v1.8 board-firmware: update version to v1.8 scp-firmware: update version to v1.8 tfa-firmware: update version to v1.8 fiptool-native: update version to v1.8 config: update to 1.8
.../classes/llvm-morello.bbclass | 2 +- .../recipes-core/musl/musl-morello-common.inc | 4 ++-- .../{musl_morello-1.7.bb => musl_morello-1.8.bb} | 0 ...ative_13.0.bb => llvm-morello-native_14.0.bb} | 0 .../llvm/llvm-morello-runtime-native.bb | 5 +++++ .../recipes-devtools/llvm/llvm-morello.inc | 4 ++-- ...llvm-morello_13.0.bb => llvm-morello_14.0.bb} | 16 ++++++++-------- .../conf/machine/include/morello-common.inc | 6 +++--- ...ello-1.7.bb => board-firmware_morello-1.8.bb} | 4 ++-- .../scp-firmware/scp-firmware_morello-2.12.bb | 4 ++-- .../trusted-firmware-a_morello-2.9.bb | 4 ++-- .../fiptool/fiptool-native_2.7.bb | 4 ++-- .../recipes-kernel/linux/files/netfilter.cfg | 15 +++++++++++++++ .../recipes-kernel/linux/linux-morello.inc | 7 +++---- ...rello-1.7.bb => linux-morello_morello-1.8.bb} | 7 +++---- 15 files changed, 50 insertions(+), 32 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.7.bb => musl_morello-1.8.bb} (100%) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello-native_13.0.bb => llvm-morello-native_14.0.bb} (100%) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello_13.0.bb => llvm-morello_14.0.bb} (79%) rename meta-morello/recipes-bsp/board-firmware/{board-firmware_morello-1.7.bb => board-firmware_morello-1.8.bb} (91%) create mode 100644 meta-morello/recipes-kernel/linux/files/netfilter.cfg rename meta-morello/recipes-kernel/linux/{linux-morello_morello-1.7.bb => linux-morello_morello-1.8.bb} (55%)
Which works with llvm 14.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello-toolchain/classes/llvm-morello.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-morello-toolchain/classes/llvm-morello.bbclass b/meta-morello-toolchain/classes/llvm-morello.bbclass index 72e3bb4..703cd9f 100644 --- a/meta-morello-toolchain/classes/llvm-morello.bbclass +++ b/meta-morello-toolchain/classes/llvm-morello.bbclass @@ -11,7 +11,7 @@ TC_DEPENDS ??= "" # /usr/lib /usr/bin etc. are used here explicitly in case this class # would be combined with other classes that could overwrite these variables
-LLVM_VERSION:toolchain-llvm-morello = "13.0.0" +LLVM_VERSION:toolchain-llvm-morello = "14.0.0" LLVM_PATH:toolchain-llvm-morello = "${STAGING_DIR_NATIVE}/usr/bin"
INHIBIT_DEFAULT_DEPS:toolchain-llvm-morello = "1"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...ative_13.0.bb => llvm-morello-native_14.0.bb} | 0 .../llvm/llvm-morello-runtime-native.bb | 5 +++++ .../recipes-devtools/llvm/llvm-morello.inc | 4 ++-- ...llvm-morello_13.0.bb => llvm-morello_14.0.bb} | 16 ++++++++-------- 4 files changed, 15 insertions(+), 10 deletions(-) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello-native_13.0.bb => llvm-morello-native_14.0.bb} (100%) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello_13.0.bb => llvm-morello_14.0.bb} (79%)
diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_14.0.bb similarity index 100% rename from meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_14.0.bb diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb index 7202ae4..1add426 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb @@ -45,6 +45,8 @@ do_install() {
export CFLAGS=""
+ local llvmversion=$(${CC} --version) + local resourcedir=$(${CC} -print-resource-dir) local destdir="${resourcedir}/lib/${LIB_TRIPLE}" local builddir="${B_COMPILERRT}/${ARCH_TRIPLE}" @@ -54,6 +56,9 @@ do_install() { install -d ${destdir} mkdir -p ${builddir}
+ echo "${llvmversion}" + echo "${resourcedir}" + local ccflags="--target=${target} ${ARCH_FLAGS} -nostdinc -isystem ${sysroot}/include" ${CC} ${ccflags} -c ${S_CRT}/crtbegin.c -o ${destdir}/clang_rt.crtbegin.o ${CC} ${ccflags} -c ${S_CRT}/crtend.c -o ${destdir}/clang_rt.crtend.o diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc index 7cb013a..751b529 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc @@ -8,9 +8,9 @@ OUTPUTS_NAME = "llvm-morello" DEPENDS = "zlib-native ninja-native ${COMPILER}-native"
SRC_URI = "git://git.morello-project.org/morello/llvm-project;protocol=https;branch=${SRCBRANCH}" -SRCREV = "45b95b9c3afe4c049e73c499bfe4708372171fa0" +SRCREV = "ae1b1aad04c1c579db8c09d1049dc0553821fbc2"
-SRCBRANCH = "morello/release-1.7" +SRCBRANCH = "morello/release-1.8" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
S = "${WORKDIR}/git/llvm" diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb similarity index 79% rename from meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb index 17d6fcc..d966931 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb @@ -7,22 +7,22 @@ LICENSE = "Apache-2.0-with-LLVM-exception"
RPROVIDES:${PN} = "llvm-morello" RDEPENDS:${PN} = "zlib" -SRCBRANCH = "morello/linux-aarch64-release-1.7" +SRCBRANCH = "morello/linux-aarch64-release-1.8"
-SRC_URI = "https://git.morello-project.org/morello/llvm-project-releases/-/archive/%24%..." +SRC_URI = "https://git.morello-project.org/morello/llvm-project-releases/-/archive/%24%..."
-SRC_URI[md5sum] = "65230ec5b9aec087afb863092e24990c" -LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=986c03435151a0086b8aaac964939cdd" +SRC_URI[sha256sum] = "ea43c6e72eb00c516223ec7f318cdd17a461eae4a27250b3da74cdf0e390390c" +LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=2524adb3fbc86d9bb9443d92f4b63013"
-S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.7" +S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.8"
FILES:${PN} += "${bindir}" FILES:${PN} += "${libdir} ${libdir}/clang" FILES:${PN} += "${includedir}"
-FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/clang/13.0.0/lib/linux/*.a \ - ${libdir}/clang/13.0.0/lib/aarch64-unknown-linux-musl_purecap/*.a \ - ${libdir}/clang/13.0.0/lib/aarch64-unknown-linux-gnu/*.a \ +FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/clang/14.0.0/lib/linux/*.a \ + ${libdir}/clang/14.0.0/lib/aarch64-unknown-linux-musl_purecap/*.a \ + ${libdir}/clang/14.0.0/lib/aarch64-unknown-linux-gnu/*.a \ " FILES:${PN}-dev += "\ ${datadir} \
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/musl/musl-morello-common.inc | 4 ++-- .../musl/{musl_morello-1.7.bb => musl_morello-1.8.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.7.bb => musl_morello-1.8.bb} (100%)
diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc index 4f46ca4..9889deb 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc @@ -13,8 +13,8 @@ SRC_URI = " \ file://files/compiler_rt.cmake \ "
-# morello-release-1.7 -SRCREV = "acfb827ad04d98ec5c0f558932e29b3c76de3093" +# morello-release-1.8.1 +SRCREV = "e7f332a23c27de93f27653261ce0cf109b780704" SRCBRANCH = "morello/master"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" diff --git a/meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.8.bb similarity index 100% rename from meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb rename to meta-morello-toolchain/recipes-core/musl/musl_morello-1.8.bb
Add .cfg for net modules, modules are needed as otherwise Yocto build fails due to ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel directory not existing.
This corner case was fixed upstream [1] but not backported to kirkstone.
[1] https://github.com/yoctoproject/poky/commit/5533d33d1e3b9be299230530c8e6ac6d...
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-kernel/linux/files/netfilter.cfg | 15 +++++++++++++++ .../recipes-kernel/linux/linux-morello.inc | 7 +++---- ...orello-1.7.bb => linux-morello_morello-1.8.bb} | 7 +++---- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 meta-morello/recipes-kernel/linux/files/netfilter.cfg rename meta-morello/recipes-kernel/linux/{linux-morello_morello-1.7.bb => linux-morello_morello-1.8.bb} (55%)
diff --git a/meta-morello/recipes-kernel/linux/files/netfilter.cfg b/meta-morello/recipes-kernel/linux/files/netfilter.cfg new file mode 100644 index 0000000..ba81642 --- /dev/null +++ b/meta-morello/recipes-kernel/linux/files/netfilter.cfg @@ -0,0 +1,15 @@ +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_CSZ=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_INGRESS=m diff --git a/meta-morello/recipes-kernel/linux/linux-morello.inc b/meta-morello/recipes-kernel/linux/linux-morello.inc index 1822096..1c0a034 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello.inc +++ b/meta-morello/recipes-kernel/linux/linux-morello.inc @@ -18,6 +18,7 @@ RDEPENDS:${PN}:remove:toolchain-llvm-morello = " musl"
SRC_URI = " \ git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1 \ + file://netfilter.cfg \ "
PV = "${LINUX_VERSION}+git${SRCPV}" @@ -39,16 +40,14 @@ KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
KBUILD_DEFCONFIG = "morello_transitional_pcuabi_defconfig"
+KCONFIG_MODE = "--alldefconfig" + do_kernel_configcheck[noexec] = "1" do_kernel_configme[depends] += "llvm-morello-native:do_populate_sysroot"
FILES:${KERNEL_PACKAGE_NAME} += "${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello/include" SYSROOT_DIRS += "${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello/include"
-do_configure:prepend(){ - rm -f ${B}/.config -} - do_install:append() { install -d ${D}${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello oe_runmake headers_install ARCH=arm64 INSTALL_HDR_PATH=${D}${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello diff --git a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb similarity index 55% rename from meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb rename to meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb index 91b75d4..78929f6 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb +++ b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb @@ -2,10 +2,9 @@ require linux-morello.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCREV = "661ebe4f81e2840e5d706c24c36af63bdbc01b3e" +SRCREV = "fa6de65a2f2c6f3ef778e4dd46d1509591585221"
-LINUX_VERSION = "6.4" +LINUX_VERSION = "6.7" LINUX_VERSION_EXTENSION = "-yocto-purecap"
-COMPATIBLE_MACHINE = "morello" - +COMPATIBLE_MACHINE = "morello" \ No newline at end of file
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...-firmware_morello-1.7.bb => board-firmware_morello-1.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-morello/recipes-bsp/board-firmware/{board-firmware_morello-1.7.bb => board-firmware_morello-1.8.bb} (91%)
diff --git a/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.8.bb similarity index 91% rename from meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb rename to meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.8.bb index 938201e..4507bbf 100644 --- a/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb +++ b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.8.bb @@ -11,9 +11,9 @@ PROVIDES += "virtual/${OUTPUTS_NAME}" PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "git://git.morello-project.org/morello/board-firmware;protocol=https;branch=${SRCBRANCH}" -SRCREV = "11cc76c9fad2e81c5529ecd4d09496070b92218f" +SRCREV = "3f0701022efbbd5d245b439688e5d8408fd9dc5a"
-SRCBRANCH = "morello/release-1.7" +SRCBRANCH = "morello/release-1.8" LIC_FILES_CHKSUM = "file://LICENSES/MB/STM.TXT;md5=47185091e44d729bf62ed5c99d7eb9d9 \ file://LICENSES/LIB/sensor.txt;md5=9326703f1725982ef3a268f53ccd1883 \ "
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb b/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb index 339e5e1..95f6970 100644 --- a/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb +++ b/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb @@ -27,10 +27,10 @@ DEPENDS += "virtual/arm-none-eabi-gcc-native virtual/board-firmware" PROVIDES += "virtual/${OUTPUTS_NAME}"
SRC_URI = "gitsm://git.morello-project.org/morello/scp-firmware.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "2713e710f25f6a0fa244cee2fde1d7fdcd78d8ab" +SRCREV = "c0d655b27a50a12faaeaa40589049c2b5c2e52f0" PV = "morello-2.12.0+git${SRCPV}"
-SRCBRANCH = "morello/release-1.7" +SRCBRANCH = "morello/release-1.8"
SCP_BUILD_RELEASE ?= "1" SCP_COMPILER ?= "arm-none-eabi"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../trusted-firmware-a/trusted-firmware-a_morello-2.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb index 1df9754..86e0b96 100644 --- a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb +++ b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb @@ -16,9 +16,9 @@ require ${MACHINE_TFA_REQUIRE} PROVIDES += "virtual/${OUTPUTS_NAME}"
SRC_URI = "gitsm://git.morello-project.org/morello/trusted-firmware-a;protocol=https;name=tfa;branch=${SRCBRANCH}" -SRCREV_tfa = "d8fb838b2fec40f5d3c4f76be26abaef1752ae90" +SRCREV_tfa = "02f8715927a8906a473a43befe82b93bfdd73d9e"
-SRCBRANCH = "morello/release-1.7" +SRCBRANCH = "morello/release-1.8" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
TFA_MBEDTLS = "1"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb b/meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb index 2be2c00..c602593 100644 --- a/meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb +++ b/meta-morello/recipes-devtools/fiptool/fiptool-native_2.7.bb @@ -7,8 +7,8 @@ DEPENDS += "openssl-native" PROVIDES = "virtual/fiptool-native"
SRC_URI = "gitsm://git.morello-project.org/morello/trusted-firmware-a;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "morello/release-1.7" -SRCREV = "d8fb838b2fec40f5d3c4f76be26abaef1752ae90" +SRCBRANCH = "morello/release-1.8" +SRCREV = "02f8715927a8906a473a43befe82b93bfdd73d9e"
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/conf/machine/include/morello-common.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 8e700bf..72e24d9 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -2,16 +2,16 @@ require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
MACHINEOVERRIDES =. "morello"
-PREFERRED_VERSION_board-firmware = "morello-1.7" +PREFERRED_VERSION_board-firmware = "morello-1.8" PREFERRED_VERSION_edk2-firmware = "morello-2.7" PREFERRED_VERSION_scp-firmware = "morello-2.1%"
PREFERRED_VERSION_trusted-firmware-a = "morello-2.9"
PREFERRED_PROVIDER_virtual/kernel = "linux-morello" -PREFERRED_VERSION_virtual/kernel = "morello-1.7" +PREFERRED_VERSION_virtual/kernel = "morello-1.8"
-PREFERRED_VERSION_musl = "morello-1.7" +PREFERRED_VERSION_musl = "morello-1.8"
GDBVERSION = "morello-11.0"
linux-morello-distros@op-lists.linaro.org
-
Pawel Zalewski