CI: use canonical git.yoctoproject.org URLs

The canonical repository URLs don't use /git/. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
arm/linux-yocto: disable CONFIG_MTD_NAND_FSL_IFC
2026-07-18 04:27:08 +00:00 · 2025-04-04 13:55:32 -04:00 · 2024-10-21 12:00:10 -04:00 · 2024-10-02 08:58:50 -04:00 · 2024-05-08 10:47:03 -04:00 · 2024-05-08 10:45:37 -04:00
16 changed files with 69 additions and 22 deletions
@@ -15,7 +15,7 @@ repos:
      meta-arm-toolchain:

  poky:
-    url: https://git.yoctoproject.org/git/poky
+    url: https://git.yoctoproject.org/poky
    layers:
      meta:
      meta-poky:
@@ -5,7 +5,7 @@ header:

 repos:
  meta-zephyr:
-    url: https://git.yoctoproject.org/git/meta-zephyr
+    url: https://git.yoctoproject.org/meta-zephyr
    layers:
      meta-zephyr-core:

@@ -19,10 +19,10 @@ def repo_shortname(url):
            .replace('*', '.'))

 repositories = (
-    "https://git.yoctoproject.org/git/poky",
+    "https://git.yoctoproject.org/poky",
    "https://git.openembedded.org/meta-openembedded",
-    "https://git.yoctoproject.org/git/meta-virtualization",
-    "https://git.yoctoproject.org/git/meta-zephyr",
+    "https://git.yoctoproject.org/meta-virtualization",
+    "https://git.yoctoproject.org/meta-zephyr",
    "https://github.com/kraj/meta-clang",
 )

@@ -11,10 +11,11 @@ INHIBIT_DEFAULT_DEPS = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "n1sdp"

-SRC_URI = "https://git.linaro.org/landing-teams/working/arm/n1sdp-board-firmware.git/snapshot/${BPN}-N1SDP-${PV}.tar.gz"
-SRC_URI[sha256sum] = "57feba404026f2d6d49c167d63e0e84653ad8b808b13e2244b81fea9e0d58d66"
+SRC_URI = "git://git.linaro.org/landing-teams/working/arm/n1sdp-board-firmware.git;protocol=https;branch=master"

-S = "${WORKDIR}/${BPN}-N1SDP-${PV}"
+SRCREV  = "9a095cbdf8ef59a7433e2769e4e2e92782b68c50"
+
+S = "${WORKDIR}/git"

 INSTALL_DIR = "/n1sdp-board-firmware_source"

@@ -0,0 +1 @@
+CONFIG_MTD_NAND_FSL_IFC=n
@@ -91,7 +91,10 @@ COMPATIBLE_MACHINE:juno = "juno"
 KBUILD_DEFCONFIG:juno = "defconfig"
 KCONFIG_MODE:juno = "--alldefconfig"
 FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}"
-SRC_URI:append:juno = " file://juno-dts-mhu-doorbell.patch"
+SRC_URI:append:juno = " \
+    file://juno-dts-mhu-doorbell.patch \
+    file://no-fsl-ifc-nand.cfg \
+    "

 #
 # Musca B1/S2 can't run Linux
@@ -116,6 +119,7 @@ SRC_URI:append:n1sdp = " \
    file://enable-realtek-R8169.cfg \
    file://enable-usb_conn_gpio.cfg \
    file://usb_xhci_pci_renesas.cfg \
+    file://no-fsl-ifc-nand.cfg \
    "
 # Since we use the intree defconfig and the preempt-rt turns off some configs
 # do_kernel_configcheck will display warnings. So, lets disable it.
@@ -53,7 +53,7 @@ new file mode 100644
 index 0000000..840683a
 --- /dev/null
 +++ b/deployments/se-proxy/opteesp/lse.S
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,28 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
@@ -61,18 +61,27 @@ index 0000000..840683a
 +
 +.text
 +.globl __aarch64_cas4_acq_rel
+.globl __aarch64_cas4_sync
 +
 +__aarch64_cas4_acq_rel:
-+	mov	w16, w0
-+	ldaxr	w0, [x2]
-+	cmp	w0, w16
-+0:	bne	1f
+       mov     w16, w0
+       ldaxr   w0, [x2]
+       cmp     w0, w16
+0:     bne     1f
 +
-+	stlxr	w17, w1, [x2]
-+	cbnz	w17, 0b
-+1:	ret
+       stlxr   w17, w1, [x2]
+       cbnz    w17, 0b
+1:     ret
 +
+__aarch64_cas4_sync:
+       mov     w16, w0
+       ldxr    w0, [x2]
+       cmp     w0, w16
+0:     bne     1f
 +
+       stlxr   w17, w1, [x2]
+       cbnz    w17, 0b
+1:     ret
 diff --git a/external/openamp/libmetal.cmake b/external/openamp/libmetal.cmake
 new file mode 100644
 index 0000000..3a647e6
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause"

 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c"

-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git;branch=master"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git;branch=master;protocol=https"
 SRCREV = "1044c77062573985f7c994c3b6cef5695f57e955"

 PV = "git${SRCPV}"
@@ -101,9 +101,9 @@ def remove_options_tail (in_string):
    from itertools import takewhile
    return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' ')))

-EXTRA_OEMAKE += "LD=${@remove_options_tail(d.getVar('LD'))}"
+EXTRA_OEMAKE += "LD='${@remove_options_tail(d.getVar('LD'))}'"

-EXTRA_OEMAKE += "CC=${@remove_options_tail(d.getVar('CC'))}"
+EXTRA_OEMAKE += "CC='${@remove_options_tail(d.getVar('CC'))}'"

 # Verbose builds, no -Werror
 EXTRA_OEMAKE += "V=1 E=0"
@@ -77,9 +77,14 @@ export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike"

 EDK_COMPILER ?= "GCC5"
 export GCC5_AARCH64_PREFIX = "${TARGET_PREFIX}"
+export GCC5_ARM_PREFIX = "${TARGET_PREFIX}"

 EDK_COMPILER:toolchain-clang = "CLANG38"
 export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}"
+export CLANG38_ARM_PREFIX = "${TARGET_PREFIX}"
+
+#FIXME - arm32 doesn't work with clang due to a linker issue
+TOOLCHAIN:arm = "gcc"

 do_configure:prepend() {
    sed -i -e "s#-target ${HOST_ARCH}-linux-gnu*#-target ${HOST_SYS}#" ${S}/BaseTools/Conf/tools_def.template
@@ -3,6 +3,15 @@ EDK2_PLATFORM:qemuarm64-secureboot      = "ArmVirtQemu-AARCH64"
 EDK2_PLATFORM_DSC:qemuarm64-secureboot  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm64-secureboot      = "QEMU_EFI.fd"

+COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
+EDK2_PLATFORM:qemuarm64      = "ArmVirtQemu-AARCH64"
+EDK2_PLATFORM_DSC:qemuarm64  = "ArmVirtPkg/ArmVirtQemu.dsc"
+EDK2_BIN_NAME:qemuarm64      = "QEMU_EFI.fd"
+
+COMPATIBLE_MACHINE:qemuarm = "qemuarm"
+EDK2_PLATFORM:qemuarm      = "ArmVirtQemu-ARM"
+EDK2_PLATFORM_DSC:qemuarm  = "ArmVirtPkg/ArmVirtQemu.dsc"
+EDK2_BIN_NAME:qemuarm      = "QEMU_EFI.fd"

 COMPATIBLE_MACHINE:qemu-generic-arm64   = "qemu-generic-arm64"
 DEPENDS:append:qemu-generic-arm64       = " trusted-firmware-a coreutils-native"
@@ -21,3 +30,11 @@ do_install:append:qemu-generic-arm64() {
    # QEMU requires that the images be minimum of 256M in size
    truncate -s 256M ${D}/firmware/SBSA_FLASH*.fd
 }
+
+do_install:append:qemuarm64() {
+    install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
+}
+
+do_install:append:qemuarm() {
+    install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
+}
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"

 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "dac554d62d514b202174506995afc0e109ef3fea"
+SRCREV = "539fea3eabd4ce7574494981cd3d0906cfdc5f18"

 S = "${WORKDIR}/git"

@@ -0,0 +1,2 @@
+CONFIG_ACPI=y
+CONFIG_EFI=y
@@ -0,0 +1 @@
+CONFIG_MTD_NAND_FSL_IFC=n
@@ -4,6 +4,7 @@ COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
 FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
 SRC_URI:append:generic-arm64 = " \
    file://tcpci.cfg \
+    file://no-fsl-ifc-nand.cfg \
    "

 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
@@ -11,3 +12,9 @@ SRC_URI:append:qemuarm64-secureboot = " \
    file://skip-unavailable-memory.patch \
    file://tee.cfg \
    "
+
+FILESEXTRAPATHS:prepend:qemuarm64 = "${ARMFILESPATHS}"
+SRC_URI:append:qemuarm64 = " file://efi.cfg"
+
+FILESEXTRAPATHS:prepend:qemuarm = "${ARMFILESPATHS}"
+SRC_URI:append:qemuarm = " file://efi.cfg"
@@ -9,6 +9,6 @@ DEPENDS:append = "\

 EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
                      'optee-ftpm', \
-                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \
+                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/${base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf"', \
                      '', \
                      d)} "
Author	SHA1	Message	Date
Ross Burton	6b2d97cecd	CI: use canonical git.yoctoproject.org URLs The canonical repository URLs don't use /git/. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2025-04-04 13:55:32 -04:00
Jon Mason	936c02ec13	arm/linux-yocto: disable CONFIG_MTD_NAND_FSL_IFC Linux stable kernel v5.15.166 added commit e59386c300198385d8bf33336de3b8c165d20d00, which modifies the depends for the Freescale IFC NAND controller. See https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e59386c300198385d8bf33336de3b8c165d20d00 Because of this change, do_kernel_configcheck is logging an warning about values not matching. To address this issue, disable it manually in a config fragment, but only for the affected machines in meta-arm. Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-10-21 12:00:10 -04:00
Javier Tia	bf98ef902e	trusted-firmware-a: fix build error when using ccache When ccache is enabled trusted-firmware-a recipe fails with this error message: make: *** No rule to make target 'aarch64-poky-linux-gcc'. Stop. ccache prefix CC variable with 'ccache' word before compiler. Because there are no quotes assigned to CC, only 'ccache' is assigned. The compiler becomes a make target, producing the build error. Add single quotes to LD is a good measure to prevent this kind of error. Signed-off-by: Javier Tia <javier.tia@linaro.org> Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-10-02 08:58:50 -04:00
Ross Burton	260e3adc2b	arm/boot-wrapper-aarch64: use https to fetch git source Some networks limit outgoing git: traffic, so use https:. Fixes: `0cec3e5` ("arm/gem5/boot-wrapper-aarch64: Move main recipe to meta-arm") Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-05-08 10:47:03 -04:00
Alexander Sverdlin	1c9ba5d495	optee-ftpm: fix EARLY_TA_PATHS passed to optee-os Fix the build with DISTRO_FEATURES containing "usrmerge": make: *** No rule to make target '/.../optee-os/4.1.0/recipe-sysroot/lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.stripped.elf', needed by '/.../optee-os/4.1.0/build/core/early_ta_bc50d971-d4c9-42c4-82cb-343fb7f37896.c'. Stop. Fixes: `6a105f47b9` ("optee-ftpm: Install artifacts into nonarch_base_libdir") Signed-off-by: Alexander Sverdlin <alexander.sverdlin@siemens.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-05-08 10:45:37 -04:00
Adam Johnston	668df530a5	arm-bsp/n1sdp: Use git clone to fetch FW for the N1SDP git.linaro.org/landing-teams/working no longer seems to serve snapshots in tar.gz format, breaking the N1SDP build for kirkstone. Using same tag as the existing snapshot, fetch the binaries with a conventional git clone, as per master. Signed-off-by: Adam Johnston <adam.johnston@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-04-30 08:13:14 -04:00
Ross Burton	d7b7b6fb6c	arm/opencsd: upgrade to 1.2.1 to fix kernel build Linux 5.15.149 contains the following change[1]: perf cs-etm: Bump minimum OpenCSD version to ensure a bugfix is present Since commit d927ef5004ef ("perf cs-etm: Add exception level consistency check"), the exception that was added to Perf will be triggered unless the following bugfix from OpenCSD is present: [...] The opencsd requirement is now 1.2.1 onwards, but the kirkstone branch has 1.2.0. The 1.2.1 release was just three bugfixes on top of 1.2.0 so this should be a safe upgrade: 3fecfb0 opencsd: etm4x: Update etm4x / ete decoder to flush context to client immediately. db97bbc opencsd: decode: Update decoder base to implement memory accessor invalidation. a7b77aa opencsd: memaccess: Allow memory accessors to have cache invalidated by decoder. [1] a7af1be5cf5507dd6c157b7a25453942f805db76 Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2024-03-20 14:49:14 -04:00
Ross Burton	b187fb9232	arm-bsp/secure-partitions: fix build with GCC 11.4 GCC 11.4 has improved code generation and needs the __aarch64_cas4_sync intrinsic from libgcc, but one of the modules here doesn't link to libgcc. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2023-08-24 11:13:41 -04:00
Jon Mason	c39bb4ce3b	arm/edk2: add support for qemuarm and qemuarm64 Add basic support for running edk2 on qemuarm and qemuarm64. This necessitated the need to add ACPI and EFI to the default kernel configs for these machines. Signed-off-by: Jon Mason <jon.mason@arm.com>	2023-07-10 08:39:12 -04:00