arm-bsp/linux-yocto: Alphabetize platform inc file
PATCH 1/5 arm-bsp/linux-yocto: Alphabetize platform inc file
This file was mostly alphabetized from previous attempts. Restore them to being alphabetized again.
--- .../linux/linux-arm-platforms.inc | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-)
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +36 -36
@@ -15,9 +15,9 @@ ARMBSPFILESPATHS := "${THISDIR}:${THISDIR}/files:" SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" SRC_URI:append:fvp-base = " ${SRC_URI_KMETA}" SRC_URI:append:fvp-base-arm32 = " ${SRC_URI_KMETA}" +SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}" SRC_URI:append:juno = " ${SRC_URI_KMETA}" SRC_URI:append:n1sdp = " ${SRC_URI_KMETA}" -SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}" SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" #
@@ -44,6 +44,13 @@ FILESEXTRAPATHS:prepend:fvp-base-arm32 := "${ARMBSPFILESPATHS}" SRC_URI:append:fvp-base-arm32 = " file://fvp-base-arm32-dts.patch \ file://0001-ARM-vexpress-enable-GICv3.patch" +# +# FVP BaseR AEMv8r64 Machine +# +COMPATIBLE_MACHINE:fvp-baser-aemv8r64 = "fvp-baser-aemv8r64" +FILESEXTRAPATHS:prepend:fvp-baser-aemv8r64 := "${ARMBSPFILESPATHS}" +SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/arch/arm64/boot/dts/arm" + # # Juno KMACHINE #
@@ -67,6 +74,34 @@ SRC_URI:append:juno = " \ file://0008-arm64-dts-juno-add-mhu-doorbell-support-and-scmi-dev.patch \ " +# +# Musca B1/S2 can't run Linux +# +COMPATIBLE_MACHINE:musca-b1 = "(^$)" +COMPATIBLE_MACHINE:musca-s1 = "(^$)" + +# +# N1SDP KMACHINE +# +FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-5.10/n1sdp:" +COMPATIBLE_MACHINE:n1sdp = "n1sdp" +KBUILD_DEFCONFIG:n1sdp = "defconfig" +KCONFIG_MODE:n1sdp = "--alldefconfig" +FILESEXTRAPATHS:prepend:n1sdp := "${ARMBSPFILESPATHS}" +SRC_URI:append:n1sdp = " \ + file://0001-pci_quirk-add-acs-override-for-PCI-devices.patch \ + file://0002-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch \ + file://0003-n1sdp-update-n1sdp-pci-quirk-for-SR-IOV-support.patch \ + file://0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch \ + file://0001-arm64-defconfig-drop-unused-BACKLIGHT_GENERIC-option.patch \ + file://no-power-avs.patch \ + file://enable-realtek-R8169.cfg \ + file://enable-usb_conn_gpio.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. +KCONF_AUDIT_LEVEL:n1sdp:pn-linux-yocto-rt = "0" + # # SGI575 KMACHINE #
@@ -117,38 +152,3 @@ FILESEXTRAPATHS:prepend:tc1 := "${THISDIR}/linux-arm64-ack-5.10/tc:" SRC_URI:append:tc1 = " \ file://0022-arm_ffa-add-support-for-FFA-v1.1.patch \ " - -# -# N1SDP KMACHINE -# -FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-5.10/n1sdp:" -COMPATIBLE_MACHINE:n1sdp = "n1sdp" -KBUILD_DEFCONFIG:n1sdp = "defconfig" -KCONFIG_MODE:n1sdp = "--alldefconfig" -FILESEXTRAPATHS:prepend:n1sdp := "${ARMBSPFILESPATHS}" -SRC_URI:append:n1sdp = " \ - file://0001-pci_quirk-add-acs-override-for-PCI-devices.patch \ - file://0002-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch \ - file://0003-n1sdp-update-n1sdp-pci-quirk-for-SR-IOV-support.patch \ - file://0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch \ - file://0001-arm64-defconfig-drop-unused-BACKLIGHT_GENERIC-option.patch \ - file://no-power-avs.patch \ - file://enable-realtek-R8169.cfg \ - file://enable-usb_conn_gpio.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. -KCONF_AUDIT_LEVEL:n1sdp:pn-linux-yocto-rt = "0" - -# -# Musca B1/S2 can't run Linux -# -COMPATIBLE_MACHINE:musca-b1 = "(^$)" -COMPATIBLE_MACHINE:musca-s1 = "(^$)" - -# -# FVP BaseR AEMv8r64 Machine -# -COMPATIBLE_MACHINE:fvp-baser-aemv8r64 = "fvp-baser-aemv8r64" -FILESEXTRAPATHS:prepend:fvp-baser-aemv8r64 := "${ARMBSPFILESPATHS}" -SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/arch/arm64/boot/dts/arm"
Signature · 1 line
2.17.1
PATCH 2/5 arm-bsp/linux-yocto: migrate corstone700 to the common file
The Linux kernel entries for corstone700 are not much more than any other BSP. Migrate them to the common file for easier development and debugging.
--- .../linux/linux-arm-platforms.inc | 53 +++++++++++++++++ .../linux/linux-yocto-corstone700.inc | 58 ------------------- .../linux/linux-yocto_5.6%.bbappend | 8 --- 3 files changed, 53 insertions(+), 66 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +53 -0
@@ -13,6 +13,7 @@ ARMBSPFILESPATHS := "${THISDIR}:${THISDIR}/files:" # Arm platforms kmeta SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI:append:corstone700 = " ${SRC_URI_KMETA}" SRC_URI:append:fvp-base = " ${SRC_URI_KMETA}" SRC_URI:append:fvp-base-arm32 = " ${SRC_URI_KMETA}" SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}"
@@ -28,6 +29,58 @@ KMACHINE:corstone500 = "corstone500" KBUILD_DEFCONFIG:corstone500 = "multi_v7_defconfig" KCONFIG_MODE:corstone500 = "--alldefconfig" +# +# Corstone-700 Machines +# +COMPATIBLE_MACHINE:corstone700 = "${MACHINE}" +KMACHINE:corstone700 = "corstone700" +KERNEL_IMAGETYPE:corstone700 = "xipImage" +KCONFIG_MODE:corstone700 = "--alldefconfig" +FILESEXTRAPATHS:prepend:corstone700 := "${ARMBSPFILESPATHS}" +SRC_URI:append:corstone700 = " \ + file://0001-arm-support-for-a-single-ARMv7-A-based-platform.patch \ + file://0002-arm-Add-tiny-vexpress-machine.patch \ + file://0003-arm-introduce-corstone700_defconfig.patch \ + file://0004-add-driver-of-mailbox-handling-unit-controller-versi.patch \ + file://0005-add-rpmsg-based-on-rpmsg-char-driver-using-mailbox.patch \ + file://0006-enable-arm-MHU-driver-and-RPMSG-char-driver.patch \ + file://0007-allow-creation-of-multiple-arm-rpmsg-channels.patch \ + file://0008-mailbox-enable-combined-receiver-interrupt-when-usin.patch \ + file://0009-misc-arm-add-corstone700-external-system-harness-dri.patch \ + file://0010-arm-containerize-endpoint-and-mailbox-information.patch \ + file://0011-arm-couple-mailbox-channel-ownership-to-rpmsg-endpoi.patch \ + file://0012-mailbox-arm_mhu_v2-add-new-AMBA-ID-to-support-MHU-v2.patch \ + file://0013-mailbox-arm_mhu_v2-dynamic-allocation-of-channels.patch \ + file://0014-defconfig-adjust-XIP-physical-address-to-3MB-offset.patch \ + file://0015-arm-Kconfig-disable-ARM_VIRT-extension-if-XIP_KERNEL.patch \ + file://0016-corstone700_defconfig-use-DDR-address-instead-of-sha.patch \ + file://0017-corstone700_defconfig-enable-configs-for-cramfs-xip.patch \ + file://0018-usb-isp1760-move-to-regmap-for-register-access.patch \ + file://0019-usb-isp1760-hcd-refactor-mempool-config-and-setup.patch \ + file://0020-usb-isp1760-add-support-for-isp1763.patch \ + " + +KERNEL_FEATURES:append:corstone700 = " bsp/arm-platforms/corstone700-bsp.scc" +KERNEL_FEATURES:append:corstone700-fvp = " \ + ${@bb.utils.contains('MACHINE_FEATURES', \ + 'eth_lan91c111', \ + 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \ + bsp/arm-platforms/corstone700/eth_lan91c111.scc', \ + 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \ + d)}" +KERNEL_FEATURES:append:corstone700-mps3 = " \ + ${@bb.utils.contains('MACHINE_FEATURES', \ + 'eth_lan9115', \ + 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \ + bsp/arm-platforms/corstone700/eth_lan9115.scc', \ + 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \ + d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', \ + 'usb_host', \ + 'bsp/arm-platforms/corstone700/usb_host.cfg', \ + '', \ + d)}" + # # FVP BASE KMACHINE #
meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc deleted +0 -58
58 lines not on this page · raw message
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend +0 -8
@@ -2,11 +2,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.6:" SRC_URI:append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \ file://0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch" - -# -# Corstone700 KMACHINE -# -MACHINE_KERNEL_REQUIRE ?= "" -MACHINE_KERNEL_REQUIRE:corstone700 = "linux-yocto-corstone700.inc" - -require ${MACHINE_KERNEL_REQUIRE}
Signature · 1 line
2.17.1
PATCH 3/5 arm/machine: update to new tunes locations
In reply to Jon Mason--- meta-arm-bsp/conf/machine/corstone500.conf | 2 +- meta-arm-bsp/conf/machine/include/corstone700.inc | 2 +- meta-arm/conf/machine/microbit-v1.conf | 2 +- meta-arm/conf/machine/qemu-cortex-a53.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
meta-arm-bsp/conf/machine/corstone500.conf +1 -1
@@ -2,7 +2,7 @@ #@NAME: Corstone-500 machine #@DESCRIPTION: Machine configuration for the Corstone-500 platform -require conf/machine/include/tune-cortexa5.inc +require conf/machine/include/arm/armv7a/tune-cortexa5.inc # Corstone-500 is built against poky-tiny distro. # poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny.
meta-arm-bsp/conf/machine/include/corstone700.inc +1 -1
@@ -1,6 +1,6 @@ # Common configuration for all Corstone700 machines -require conf/machine/include/tune-cortexa32.inc +require conf/machine/include/arm/armv8a/tune-cortexa32.inc MACHINEOVERRIDES =. "corstone700:"
meta-arm/conf/machine/microbit-v1.conf +1 -1
@@ -3,7 +3,7 @@ #@DESCRIPTION: Machine for BBC Microbit v1, Zephyr BOARD qemu_cortex_m0 require conf/machine/include/qemu.inc -require conf/machine/include/tune-cortex-m0.inc +require conf/machine/include/arm/armv6m/tune-cortexm0.inc MACHINEOVERRIDES =. "nordic:"
meta-arm/conf/machine/qemu-cortex-a53.conf +1 -1
@@ -3,7 +3,7 @@ #@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a53 require conf/machine/include/qemu.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc TCLIBC = "newlib"
Signature · 1 line
2.17.1
PATCH 4/5 arm-bsp/linux-yocto: Add 5.4 kernel
In reply to Jon MasonTemporary hack to allow for things to continue to work, while waiting for the platforms to migrate to a newer kernel.
--- .../recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bb
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bb new file +22 -0
@@ -0,0 +1,22 @@ +KBRANCH ?= "v5.4/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +SRCREV_machine ?= "807b4668ff7fe3be031ace442a84d70821ef9571" +SRCREV_meta ?= "98ba88191b7c489bc0d83b6c87a31b2330fcd886" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LINUX_VERSION ?= "5.4.139" + +DEPENDS += "openssl-native util-linux-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +# Functionality flags +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
Signature · 1 line
2.17.1
PATCH 5/5 arm/qemuarm64-secureboot: use 5.10 kernel
In reply to Jon Masonqemuarm64-secureboot is failing to boot with the 5.13 kernel. Use the 5.10 kernel until this can be addressed.
--- ci/xen.yml | 2 +- meta-arm/conf/machine/qemuarm64-secureboot.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
ci/xen.yml +1 -1
@@ -4,7 +4,7 @@ header: - meta-virtualization.yml local_conf_header: - meta-virt: + meta-virt: | DISTRO_FEATURES:append = " virtualization xen" target:
meta-arm/conf/machine/qemuarm64-secureboot.conf +2 -0
@@ -19,3 +19,5 @@ IMAGE_FSTYPES += "wic wic.qcow2" WKS_FILE ?= "qemuarm64.wks" WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" + +PREFERRED_VERSION_linux-yocto ?= "5.10%"
Signature · 1 line
2.17.1