From 1091c186c5005a00f61c701d747cb864f1c1d7cf Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Tue, 3 Nov 2020 14:11:41 +0000 Subject: [PATCH] arm-bsp/linux-linaro-arm: Move N1SDP specifics from .bbapend to .inc Make usage of .inc for N1SDP to concentrate its specifics. Change-Id: I190eca0e9db0e9ec614588ff33190dba6ee75897 Issue-Id: SCM-1653 Signed-off-by: Diego Sueiro Signed-off-by: Jon Mason --- ...m_5.4.bbappend => linux-linaro-arm-n1sdp.inc} | 16 +++++----------- .../recipes-kernel/linux/linux-linaro-arm.inc | 6 ++++++ 2 files changed, 11 insertions(+), 11 deletions(-) rename meta-arm-bsp/recipes-kernel/linux/{linux-linaro-arm_5.4.bbappend => linux-linaro-arm-n1sdp.inc} (69%) diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc similarity index 69% rename from meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend rename to meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc index 6b13f9aa..1a6f0fe0 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend +++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc @@ -1,11 +1,6 @@ -# -# N1SDP MACHINE specific configurations -# - FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:" -# Apply N1SDP specific patches -SRC_URI_append_n1sdp = " \ +SRC_URI_append = " \ file://0001-TMP-iommu-arm-smmu-v3-Ignore-IOPF-capabilities.patch \ file://0002-pci_quirk-add-acs-override-for-PCI-devices.patch \ file://0003-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch \ @@ -16,14 +11,13 @@ SRC_URI_append_n1sdp = " \ " # Referring to commit TAG N1SDP-2020.07.27 -SRCREV_n1sdp = "84baaae9e751c058717d9702438429257f077f03" -SRCREV_dts_n1sdp = "3209a868152f348194cc1f20fd87c759d3a97d45" +SRCREV = "84baaae9e751c058717d9702438429257f077f03" # Use intree defconfig -KBUILD_DEFCONFIG_n1sdp = "defconfig" +KBUILD_DEFCONFIG = "defconfig" # Since the intree defconfig in n1sdp kernel repository is not setting all the configs, # KCONFIG_MODE is set to "alldefconfig" to properly expand the defconfig. -KCONFIG_MODE_n1sdp = "--alldefconfig" +KCONFIG_MODE = "--alldefconfig" -COMPATIBLE_MACHINE_n1sdp = "n1sdp" +COMPATIBLE_MACHINE = "n1sdp" diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc index 1b8d4b2c..999f4e7b 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc @@ -17,3 +17,9 @@ DEPENDS += "openssl-native util-linux-native" LINUX_VERSION ?= "${PV}" S = "${WORKDIR}/git" + +# Add machine-specific settings +MACHINE_KERNEL_REQUIRE ?= "" +MACHINE_KERNEL_REQUIRE_n1sdp = "linux-linaro-arm-n1sdp.inc" + +require ${MACHINE_KERNEL_REQUIRE}