[meta-arm,1/4] arm-bsp/linux-linaro-arm: Move N1SDP specifics from .bbapend to .inc

Submitted by Diego Sueiro on Nov. 3, 2020, 2:11 p.m. | Patch ID: 178080

Details

Message ID 0624b1d5cb32b094405595f69ec1bacee09c7e4e.1604412597.git.diego.sueiro@arm.com
State New
Headers show

Commit Message

Diego Sueiro Nov. 3, 2020, 2:11 p.m.
Make usage of .inc for N1SDP to concentrate its specifics.

Change-Id: I190eca0e9db0e9ec614588ff33190dba6ee75897
Issue-Id: SCM-1653
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>

---
 .../linux/linux-linaro-arm-n1sdp.inc               | 23 +++++++++++++++++
 .../recipes-kernel/linux/linux-linaro-arm.inc      |  6 +++++
 .../linux/linux-linaro-arm_5.4.bbappend            | 29 ----------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend

-- 
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1321): https://lists.yoctoproject.org/g/meta-arm/message/1321
Mute This Topic: https://lists.yoctoproject.org/mt/78006774/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc
new file mode 100644
index 0000000..1a6f0fe
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc
@@ -0,0 +1,23 @@ 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
+
+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 \
+    file://0004-n1sdp-update-n1sdp-pci-quirk-for-SR-IOV-support.patch \
+    file://0005-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch \
+    file://enable-realtek-R8169.cfg \
+    file://scripts-dtc-remove-redundant-YYLOC.patch \
+    "
+
+# Referring to commit TAG N1SDP-2020.07.27
+SRCREV = "84baaae9e751c058717d9702438429257f077f03"
+
+# Use intree 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 = "--alldefconfig"
+
+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 1b8d4b2..999f4e7 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}
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_5.4.bbappend
deleted file mode 100644
index 6b13f9a..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend
+++ /dev/null
@@ -1,29 +0,0 @@ 
-#
-# N1SDP MACHINE specific configurations
-#
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
-
-# Apply N1SDP specific patches
-SRC_URI_append_n1sdp = " \
-    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 \
-    file://0004-n1sdp-update-n1sdp-pci-quirk-for-SR-IOV-support.patch \
-    file://0005-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch \
-    file://enable-realtek-R8169.cfg \
-    file://scripts-dtc-remove-redundant-YYLOC.patch \
-    "
-
-# Referring to commit TAG N1SDP-2020.07.27
-SRCREV_n1sdp  = "84baaae9e751c058717d9702438429257f077f03"
-SRCREV_dts_n1sdp = "3209a868152f348194cc1f20fd87c759d3a97d45"
-
-# Use intree defconfig
-KBUILD_DEFCONFIG_n1sdp = "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"
-
-COMPATIBLE_MACHINE_n1sdp = "n1sdp"