This series of patches is updating the software stack to version 1.7. It was tested on the hardware and via FVP.
The current implementation can be found here [1]
[1] https://git.morello-project.org/pzalewski/meta-morello/-/tree/release-1.7?re...
Pawel Zalewski (15): llvm-morello: update recipes to 1.7 classes: modify llvm musl: update recipe to 1.7 board-firmware: update recipes to 1.7 scp-firmware: update the recipes to 1.7 tf-a: update recipe to 1.7 fiptool-native: update recipe to 1.7 edk2: update recipe to 1.7 linux-morello: update recipe to 1.7 busybox-morello: update to latest commit gdb: update to latest commit purecap-app: update compiler flags for 1.7 machine: update config to 1.7 gitlab-ci: fix the log path gitlab-ci: add libc++-13
.gitlab-ci.yml | 3 +- .../classes/llvm-morello.bbclass | 19 ++++---- .../recipes-core/musl/musl-morello-c64-so.inc | 5 +++ .../recipes-core/musl/musl-morello-c64.inc | 2 +- .../recipes-core/musl/musl-morello-common.inc | 6 +-- ...usl_morello-1.6.bb => musl_morello-1.7.bb} | 0 .../recipes-devtools/llvm/llvm-morello.inc | 4 +- .../llvm/llvm-morello_13.0.bb | 8 ++-- .../conf/machine/include/morello-common.inc | 10 ++--- ...o-1.6.bb => board-firmware_morello-1.7.bb} | 6 +-- ...o-2.10.bb => scp-firmware_morello-2.12.bb} | 6 +-- ...7.bb => trusted-firmware-a_morello-2.9.bb} | 4 +- ...lo-2.4.bb => edk2-firmware_morello-2.7.bb} | 23 ++++------ ...Basetools-remove-brotli-build-errors.patch | 45 ------------------- .../busybox/busybox-morello_morello-1.5.bb | 2 +- ...-append-toolchain-with-relative-path.patch | 2 +- .../fiptool/fiptool-native_2.7.bb | 8 +++- meta-morello/recipes-devtools/gdb/gdb.inc | 2 +- ...lo-1.6.bb => linux-morello_morello-1.7.bb} | 6 +-- .../applications/files/Makefile | 2 +- 20 files changed, 63 insertions(+), 100 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.6.bb => musl_morello-1.7.bb} (100%) rename meta-morello/recipes-bsp/board-firmware/{board-firmware_morello-1.6.bb => board-firmware_morello-1.7.bb} (83%) rename meta-morello/recipes-bsp/scp-firmware/{scp-firmware_morello-2.10.bb => scp-firmware_morello-2.12.bb} (94%) rename meta-morello/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_morello-2.7.bb => trusted-firmware-a_morello-2.9.bb} (95%) rename meta-morello/recipes-bsp/uefi/{edk2-firmware_morello-2.4.bb => edk2-firmware_morello-2.7.bb} (67%) delete mode 100644 meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch rename meta-morello/recipes-kernel/linux/{linux-morello_morello-1.6.bb => linux-morello_morello-1.7.bb} (51%)
Update the host and target compilers to 1.7
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-devtools/llvm/llvm-morello.inc | 4 ++-- .../recipes-devtools/llvm/llvm-morello_13.0.bb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc index 05e932e..7cb013a 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 = "5428a0ace510daf62972fffa5ae7baf4f1e7ec4c" +SRCREV = "45b95b9c3afe4c049e73c499bfe4708372171fa0"
-SRCBRANCH = "morello/release-1.6.1" +SRCBRANCH = "morello/release-1.7" 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_13.0.bb index 61bc9bd..17d6fcc 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb @@ -7,14 +7,14 @@ LICENSE = "Apache-2.0-with-LLVM-exception"
RPROVIDES:${PN} = "llvm-morello" RDEPENDS:${PN} = "zlib" -SRCBRANCH = "morello/linux-aarch64-release-1.5" +SRCBRANCH = "morello/linux-aarch64-release-1.7"
-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] = "bc5ba415eccea9b2280586aa6f74519d" +SRC_URI[md5sum] = "65230ec5b9aec087afb863092e24990c" LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=986c03435151a0086b8aaac964939cdd"
-S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.5" +S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.7"
FILES:${PN} += "${bindir}" FILES:${PN} += "${libdir} ${libdir}/clang"
Update compiler flags for 1.7, drop the c64.
Add more CHERI error flags and add INHIBIT_PACKAGE_STRIP to the class.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../classes/llvm-morello.bbclass | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/meta-morello-toolchain/classes/llvm-morello.bbclass b/meta-morello-toolchain/classes/llvm-morello.bbclass index fde61ed..ee5d872 100644 --- a/meta-morello-toolchain/classes/llvm-morello.bbclass +++ b/meta-morello-toolchain/classes/llvm-morello.bbclass @@ -11,7 +11,8 @@ TC_DEPENDS ??= "" LLVM_VERSION:toolchain-llvm-morello = "13.0.0" LLVM_PATH:toolchain-llvm-morello = "${STAGING_DIR_NATIVE}/usr/bin"
-INHIBIT_DEFAULT_DEPS:toolchain-llvm-morello = "1" +INHIBIT_DEFAULT_DEPS:toolchain-llvm-morello = "1" +INHIBIT_PACKAGE_STRIP:toolchain-llvm-morello = "1"
TC_DEPENDS:append:toolchain-llvm-morello = " virtual/llvm-morello-native" TC_DEPENDS:append:toolchain-llvm-morello:class-target = " virtual/llvm-morello-runtime-native virtual/musl-morello" @@ -38,14 +39,16 @@ LLVM_CONFIG:toolchain-llvm-morello ??= "${LLVM_PATH}/llvm-config"
export ${LLVM_CONFIG}
-CC_PURECAP_FLAGS = "--target=${GLOBAL_ARCH_TRIPLE} --sysroot ${STAGING_DIR_TARGET}${PURECAP_SYSROOT_DIR} -march=morello+c64" +CC_PURECAP_FLAGS = "--target=${GLOBAL_ARCH_TRIPLE} --sysroot ${STAGING_DIR_TARGET}${PURECAP_SYSROOT_DIR} -march=morello -mabi=purecap"
-CC_PURECAP_FLAGS += "-Werror=implicit-function-declaration \ - -Werror=format \ - -Werror=undefined-internal \ - -Werror=incompatible-pointer-types \ - -Werror=cheri-capability-misuse \ - " +CC_PURECAP_FLAGS += "\ + -Werror=implicit-function-declaration \ + -Werror=format \ + -Werror=undefined-internal \ + -Werror=incompatible-pointer-types \ + -Werror=cheri-capability-misuse \ + -Werror=cheri-bitwise-operations \ + "
CC_PURECAP_FLAGS += "-isystem ${STAGING_DIR_TARGET}${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello/include"
Create additional symbolic link in the purecap-base-libdir (on top of actual base libdir) to the C library that lives in the purecap- /usr/lib. This is done to cover a purecap chroot.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/musl/musl-morello-c64-so.inc | 5 +++++ .../recipes-core/musl/musl-morello-c64.inc | 2 +- .../recipes-core/musl/musl-morello-common.inc | 6 +++--- .../musl/{musl_morello-1.6.bb => musl_morello-1.7.bb} | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.6.bb => musl_morello-1.7.bb} (100%)
diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc index b6c8c75..4dbc3c6 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc @@ -4,4 +4,9 @@ do_install:append() { install -d ${D}${nonarch_base_libdir} ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${D}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 rm -f ${TARGET_INSTALL_DIR}${nonarch_base_libdir}/ld-musl-morello.so.1 +} + +do_install:append() { + install -d ${TARGET_INSTALL_DIR}${nonarch_base_libdir} + ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${TARGET_INSTALL_DIR}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 } \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc index 761b9d2..bb9955d 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc @@ -4,4 +4,4 @@ EXTRA_CONFIGUREOPTS = "--enable-morello"
ARCH_TRIPLE = "${C64_ARCH_TRIPLE}" LIB_TRIPLE = "${C64_LIB_TRIPLE}" -ARCH_FLAGS = "-march=morello+c64 -mabi=purecap" \ No newline at end of file +ARCH_FLAGS = "-march=morello -mabi=purecap" \ No newline at end of file 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 5cb03df..516bd18 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.6.1 -SRCREV = "b82b5af221072d68e18fad82bae6d2ab308e3985" +# morello-release-1.7 +SRCREV = "f712fa4d03821e9fba9c3e3afd9fb570efdecedd" SRCBRANCH = "morello/master"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" @@ -64,7 +64,7 @@ do_configure() { local config="${CONFIGUREOPTS}" echo "Install dir ${TARGET_INSTALL_DIR} with ${TCLIBC} MACHINE_INC ${MACHINE_INC}" config="${config} --target=${ARCH_TRIPLE} ${EXTRA_CONFIGUREOPTS} --disable-shared" - ${S}/configure ${config} + ${S}/configure ${config} }
do_compile() { diff --git a/meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb similarity index 100% rename from meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb rename to meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...irmware_morello-1.6.bb => board-firmware_morello-1.7.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-morello/recipes-bsp/board-firmware/{board-firmware_morello-1.6.bb => board-firmware_morello-1.7.bb} (83%)
diff --git a/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.6.bb b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb similarity index 83% rename from meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.6.bb rename to meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb index 75ac6ab..938201e 100644 --- a/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.6.bb +++ b/meta-morello/recipes-bsp/board-firmware/board-firmware_morello-1.7.bb @@ -11,11 +11,11 @@ PROVIDES += "virtual/${OUTPUTS_NAME}" PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "git://git.morello-project.org/morello/board-firmware;protocol=https;branch=${SRCBRANCH}" -SRCREV = "ff064c26d02db37018941061742fd655ac40fc18" +SRCREV = "11cc76c9fad2e81c5529ecd4d09496070b92218f"
-SRCBRANCH = "morello/release-1.6.1" +SRCBRANCH = "morello/release-1.7" LIC_FILES_CHKSUM = "file://LICENSES/MB/STM.TXT;md5=47185091e44d729bf62ed5c99d7eb9d9 \ - file://LICENSES/LIB/sensor.txt;md5=7ba201f1f1e4959d3505d9c59c6cfdfa \ + file://LICENSES/LIB/sensor.txt;md5=9326703f1725982ef3a268f53ccd1883 \ "
S = "${WORKDIR}/git"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...irmware_morello-2.10.bb => scp-firmware_morello-2.12.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-morello/recipes-bsp/scp-firmware/{scp-firmware_morello-2.10.bb => scp-firmware_morello-2.12.bb} (94%)
diff --git a/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.10.bb b/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb similarity index 94% rename from meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.10.bb rename to meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.12.bb index f0faeae..339e5e1 100644 --- a/meta-morello/recipes-bsp/scp-firmware/scp-firmware_morello-2.10.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 = "6a5a79a4e51178483530f7161b1583a75029635e" -PV = "morello-2.10.0+git${SRCPV}" +SRCREV = "2713e710f25f6a0fa244cee2fde1d7fdcd78d8ab" +PV = "morello-2.12.0+git${SRCPV}"
-SRCBRANCH = "morello/release-1.6" +SRCBRANCH = "morello/release-1.7"
SCP_BUILD_RELEASE ?= "1" SCP_COMPILER ?= "arm-none-eabi"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...are-a_morello-2.7.bb => trusted-firmware-a_morello-2.9.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-morello/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_morello-2.7.bb => trusted-firmware-a_morello-2.9.bb} (95%)
diff --git a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.7.bb b/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb similarity index 95% rename from meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.7.bb rename to meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.9.bb index 8b45929..1df9754 100644 --- a/meta-morello/recipes-bsp/trusted-firmware-a/trusted-firmware-a_morello-2.7.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 = "67b92446415f3532445b8a851e5adc18d0d1bf0f" +SRCREV_tfa = "d8fb838b2fec40f5d3c4f76be26abaef1752ae90"
-SRCBRANCH = "morello/release-1.6" +SRCBRANCH = "morello/release-1.7" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
TFA_MBEDTLS = "1"
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-devtools/fiptool/fiptool-native_2.7.bb | 8 ++++++-- 1 file changed, 6 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 d6bce92..2be2c00 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.6" -SRCREV = "67b92446415f3532445b8a851e5adc18d0d1bf0f" +SRCBRANCH = "morello/release-1.7" +SRCREV = "d8fb838b2fec40f5d3c4f76be26abaef1752ae90"
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
@@ -16,6 +16,10 @@ EXTRA_OEMAKE = "HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}${prefix_n
S = "${WORKDIR}/git"
+EXTRA_OEMAKE += "\ + ENABLE_MORELLO_CAP=0 \ + " + do_compile() { sed -i '/^LDLIBS/ s,$, ${BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile sed -i '/^INCLUDE_PATHS/ s,$, ${BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
NB: CLANG_35/38 are now replaced with CLANGDWARF.
Patches for brotli enc/dec are no longer required as they were merged upstream.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...lo-2.4.bb => edk2-firmware_morello-2.7.bb} | 23 ++++------ ...Basetools-remove-brotli-build-errors.patch | 45 ------------------- 2 files changed, 9 insertions(+), 59 deletions(-) rename meta-morello/recipes-bsp/uefi/{edk2-firmware_morello-2.4.bb => edk2-firmware_morello-2.7.bb} (67%) delete mode 100644 meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch
diff --git a/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb b/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb similarity index 67% rename from meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb rename to meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb index 3f421b6..1555e2d 100644 --- a/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.4.bb +++ b/meta-morello/recipes-bsp/uefi/edk2-firmware_morello-2.7.bb @@ -21,29 +21,24 @@ SRC_URI = "\ ${EDK2_SRC_URI};name=edk2;destsuffix=edk2 \ ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms \ ${EDK2_NON_OSI_SRC_URI};name=edk2-non-osi;destsuffix=edk2-non-osi \ - file://files/0001-Basetools-remove-brotli-build-errors.patch \ "
-EDK2_SRC_URI = "gitsm://git.morello-project.org/morello/edk2;branch=morello/release-1.6;protocol=https" -EDK2_PLATFORMS_SRC_URI = "gitsm://git.morello-project.org/morello/edk2-platforms;branch=morello/release-1.6;protocol=https" +EDK2_SRC_URI = "gitsm://git.morello-project.org/morello/edk2;branch=morello/release-1.7;protocol=https" +EDK2_PLATFORMS_SRC_URI = "gitsm://git.morello-project.org/morello/edk2-platforms;branch=morello/release-1.7;protocol=https" EDK2_NON_OSI_SRC_URI = "git://github.com/tianocore/edk2-non-osi;branch=master;protocol=https" SRCREV_edk2-non-osi = "0320db977fb27e63424b0953a3020bb81c89e8f0" -SRCREV_edk2 = "ce510c33dfc354e262ccd71619add069876d6a08" -SRCREV_edk2-platforms = "a5e30111ce700fbd71415bc3b22bbe2561fe5c58" +SRCREV_edk2 = "3bf9a278b7d3ffdde0a40a039a9157f02989e6ba" +SRCREV_edk2-platforms = "dc71a37b1bf6c0ffb3eb1d35dd2dcfb07fba5648"
EDK2_BUILD_RELEASE = "0"
EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_ARCH = "AARCH64" -EDK2_BUILD_FLAGS += "-D ENABLE_MORELLO_CAP=1" -EDK_COMPILER = "CLANG35" - -export CLANG35_AARCH64_PREFIX = "${TARGET_PREFIX}" -export CLANG35_BIN = "${LLVM_PATH}/" -export CLANG35_AARCH64_PREFIX = "${LLVM_PATH}/llvm-" -export PACKAGES_PATH = "${S}:${S}/edk2-platforms:${WORKDIR}/edk2-non-osi" -export CC_PATH = "${LLVM_PATH}/clang" -export LLVM_PATH_35 = "${LLVM_PATH}" +EDK2_EXTRA_BUILD += "-D ENABLE_MORELLO_CAP=1" +EDK_COMPILER = "CLANGDWARF" + +export CLANGDWARF_BIN = "${LLVM_PATH}/" +export PACKAGES_PATH = "${S}:${S}/edk2-platforms:${WORKDIR}/edk2-non-osi"
CC:remove = "${CC_PURECAP_FLAGS}" CXX:remove = "${CC_PURECAP_FLAGS}" diff --git a/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch b/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch deleted file mode 100644 index 53d16ad..0000000 --- a/meta-morello/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 27dd7265403d8e8fed99a854b9c3e1db7d79525f Mon Sep 17 00:00:00 2001 -From: Jeremy Maitin-Shepard jbms@google.com -Date: Tue, 14 Sep 2021 12:27:45 -0700 -Subject: [PATCH 09/22] Fix -Werror=vla-parameter errors with GCC 11.2.0 - ---- - BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c | 6 ++++-- - BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c | 5 +++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/c/dec/decode.c -index 114c505..4c89a73 100644 ---- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c -+++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c -@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands( - } - - BrotliDecoderResult BrotliDecoderDecompress( -- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, -- uint8_t* decoded_buffer) { -+ size_t encoded_size, -+ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], -+ size_t* decoded_size, -+ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { - BrotliDecoderState s; - BrotliDecoderResult result; - size_t total_out = 0; -diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/c/enc/encode.c -index 68548ef..dc3704e 100644 ---- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c -+++ b/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c -@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( - - BROTLI_BOOL BrotliEncoderCompress( - int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, -- const uint8_t* input_buffer, size_t* encoded_size, -- uint8_t* encoded_buffer) { -+ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], -+ size_t* encoded_size, -+ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { - BrotliEncoderState* s; - size_t out_size = *encoded_size; - const uint8_t* input_start = input_buffer; --- -2.34.1 \ No newline at end of file
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...-morello_morello-1.6.bb => linux-morello_morello-1.7.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-morello/recipes-kernel/linux/{linux-morello_morello-1.6.bb => linux-morello_morello-1.7.bb} (51%)
diff --git a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb similarity index 51% rename from meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb rename to meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb index 5836a3a..91b75d4 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.6.bb +++ b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb @@ -2,10 +2,10 @@ require linux-morello.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCREV = "bf6680a3b8b63bc3d16553538c987f3ed5c53804" +SRCREV = "661ebe4f81e2840e5d706c24c36af63bdbc01b3e"
-LINUX_VERSION = "6.4" -LINUX_VERSION_EXTENSION= "-yocto-purecap" +LINUX_VERSION = "6.4" +LINUX_VERSION_EXTENSION = "-yocto-purecap"
COMPATIBLE_MACHINE = "morello"
Modify the patch for 1.7 compiler flags.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/busybox/busybox-morello_morello-1.5.bb | 2 +- ...1-Remove-elf-patch-append-toolchain-with-relative-path.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb b/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb index 0fdc60c..6f3002e 100644 --- a/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb +++ b/meta-morello/recipes-core/busybox/busybox-morello_morello-1.5.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \ file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"
SRCBRANCH = "morello/master" -SRCREV = "0f2436d16ddbca4467808735b1357b46e67aeddf" +SRCREV = "424ea869b9445be4bbb0ccd9d4007c39d82e4992" diff --git a/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch b/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch index ebac784..ee70cbe 100644 --- a/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch +++ b/meta-morello/recipes-core/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch @@ -15,7 +15,7 @@ index f9d916f98..4c95c8d56 100644 @@ -142,10 +142,9 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) # Morello Settings MORELLO_TARGET := aarch64-linux-musl_purecap - MORELLO_FLAGS := -Wno-cheri-inefficient -march=morello+c64 + MORELLO_FLAGS := -Wno-cheri-inefficient -march=morello -mabi=purecap -ELF_PATCH := morello_elf MUSL_HOME := ../../musl-bin KHEADERS := ../morello-linux-headers/usr/include/
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/recipes-devtools/gdb/gdb.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-morello/recipes-devtools/gdb/gdb.inc b/meta-morello/recipes-devtools/gdb/gdb.inc index 149e5c5..5f35ea5 100644 --- a/meta-morello/recipes-devtools/gdb/gdb.inc +++ b/meta-morello/recipes-devtools/gdb/gdb.inc @@ -17,4 +17,4 @@ SRC_URI = "git://git.morello-project.org/morello/binutils-gdb.git;protocol=htt "
SRCBRANCH = "users/ARM/morello-binutils-gdb-master" -SRCREV = "690199d5d4180f287074f2976a12d2df1e415d67" \ No newline at end of file +SRCREV = "70d0d9f04a51b8c441334f42cd5dfb1f9215be53" \ No newline at end of file
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/recipes-morello-apps/applications/files/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-morello/recipes-morello-apps/applications/files/Makefile b/meta-morello/recipes-morello-apps/applications/files/Makefile index a8464a3..1d0f43c 100644 --- a/meta-morello/recipes-morello-apps/applications/files/Makefile +++ b/meta-morello/recipes-morello-apps/applications/files/Makefile @@ -2,7 +2,7 @@ NAME=$(OUTPUTS_NAME) CC=$(LLVM_PATH)/clang
TARGET=aarch64-linux-musl_purecap -ARCH=-march=morello+c64 -mabi=purecap +ARCH=-march=morello -mabi=purecap CLANG_RESOURCE_DIR=$(shell ${CC} -print-resource-dir) CLANG_LIB=$(CLANG_RESOURCE_DIR)/lib/aarch64-unknown-linux-musl_purecap COMPILER_INC=$(CLANG_RESOURCE_DIR)/include
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello/conf/machine/include/morello-common.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 6784341..8e700bf 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.6" -PREFERRED_VERSION_edk2-firmware = "morello-2.4" +PREFERRED_VERSION_board-firmware = "morello-1.7" +PREFERRED_VERSION_edk2-firmware = "morello-2.7" PREFERRED_VERSION_scp-firmware = "morello-2.1%"
-PREFERRED_VERSION_trusted-firmware-a = "morello-2.7" +PREFERRED_VERSION_trusted-firmware-a = "morello-2.9"
PREFERRED_PROVIDER_virtual/kernel = "linux-morello" -PREFERRED_VERSION_virtual/kernel = "morello-1.6" +PREFERRED_VERSION_virtual/kernel = "morello-1.7"
-PREFERRED_VERSION_musl = "morello-1.6" +PREFERRED_VERSION_musl = "morello-1.7"
GDBVERSION = "morello-11.0"
It shall be tmp-xyz not just tmp.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 555b96f..6c4add4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ stages: name: "logs" when: on_failure paths: - - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.* + - $CI_PROJECT_DIR/work/build/tmp*/work*/**/temp/log.do_*.*
# # Prep stage, update repositories once
The library is required for edk2 vfrcompile basetool which is compiled for the host.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c4add4..08ceaba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ stages: - rm -rf $KAS_WORK_DIR - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR - sudo apt-get update && sudo apt install -y libtinfo5 + - sudo apt install -y libc++-13-dev libc++abi-13-dev
# Generalised fragment to do a Kas build .build:
This is now applied on the release-1.7 branch and shall be merged into kirkstone/master.
Pawel
linux-morello-distros@op-lists.linaro.org
-
Pawel Zalewski