[meta-lsi] [PATCH 03/22] linux-yocto: use config fragments instead of defconfigs
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:56:54 PST 2016
From: Cristian Bercaru <cristian.bercaru at windriver.com>
This patch enables the use of configuration fragments instead of
defconfigs when building linux-yocto-3.14/4.1 from the yocto
repositories.
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
recipes-kernel/linux/frags-arm-3.14.inc | 10 ----------
recipes-kernel/linux/frags-arm-4.1.inc | 9 ---------
recipes-kernel/linux/frags-arm.inc | 12 ++++++++++++
recipes-kernel/linux/frags-arm64.inc | 6 ++++++
recipes-kernel/linux/frags-powerpc-3.14.inc | 4 ----
recipes-kernel/linux/frags-powerpc.inc | 5 +++++
recipes-kernel/linux/linux-yocto-rt_3.14.inc | 4 ++--
recipes-kernel/linux/linux-yocto-rt_4.1.inc | 10 ++++++++--
recipes-kernel/linux/linux-yocto_3.14.inc | 4 ++--
recipes-kernel/linux/linux-yocto_4.1.inc | 10 ++++++++--
recipes-kernel/linux/lsi-tip-rt_3.14.inc | 4 ++--
recipes-kernel/linux/lsi-tip_3.14.inc | 4 ++--
recipes-kernel/linux/placeholder.inc | 1 -
13 files changed, 47 insertions(+), 36 deletions(-)
delete mode 100644 recipes-kernel/linux/frags-arm-3.14.inc
delete mode 100644 recipes-kernel/linux/frags-arm-4.1.inc
create mode 100644 recipes-kernel/linux/frags-arm.inc
create mode 100644 recipes-kernel/linux/frags-arm64.inc
delete mode 100644 recipes-kernel/linux/frags-powerpc-3.14.inc
create mode 100644 recipes-kernel/linux/frags-powerpc.inc
delete mode 100644 recipes-kernel/linux/placeholder.inc
diff --git a/recipes-kernel/linux/frags-arm-3.14.inc b/recipes-kernel/linux/frags-arm-3.14.inc
deleted file mode 100644
index 069eca5..0000000
--- a/recipes-kernel/linux/frags-arm-3.14.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
- ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/frags-arm-4.1.inc b/recipes-kernel/linux/frags-arm-4.1.inc
deleted file mode 100644
index 6391886..0000000
--- a/recipes-kernel/linux/frags-arm-4.1.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/frags-arm.inc b/recipes-kernel/linux/frags-arm.inc
new file mode 100644
index 0000000..648a32b
--- /dev/null
+++ b/recipes-kernel/linux/frags-arm.inc
@@ -0,0 +1,12 @@
+# adding fragments with kernel options to the final .config
+KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
+SRC_URI += "file://common.scc \
+ ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', 'file://standard.scc', d)} \
+ ${@base_conditional('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
+ ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
+ ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
+
+# cpu hotplug options: low power (default), full power down, full power down with L2 cache
+SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
+ ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
+ ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/frags-arm64.inc b/recipes-kernel/linux/frags-arm64.inc
new file mode 100644
index 0000000..88c3584
--- /dev/null
+++ b/recipes-kernel/linux/frags-arm64.inc
@@ -0,0 +1,6 @@
+# adding fragments with kernel options to the final .config
+KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
+SRC_URI += "file://common.scc \
+ ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', '', d)} \
+ ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
+ ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
diff --git a/recipes-kernel/linux/frags-powerpc-3.14.inc b/recipes-kernel/linux/frags-powerpc-3.14.inc
deleted file mode 100644
index 4235263..0000000
--- a/recipes-kernel/linux/frags-powerpc-3.14.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# adding fragments with kernel options to the final .config
-SRC_URI += "file://common.scc \
- ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/frags-powerpc.inc b/recipes-kernel/linux/frags-powerpc.inc
new file mode 100644
index 0000000..1726570
--- /dev/null
+++ b/recipes-kernel/linux/frags-powerpc.inc
@@ -0,0 +1,5 @@
+# adding fragments with kernel options to the final .config
+SRC_URI += "file://common.scc \
+ ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', 'file://standard.scc', d)} \
+ ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
+ ${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.inc b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
index 42d056f..572b719 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
@@ -1,7 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'dt-${KARCH}.inc', d)}
+require dt-${KARCH}.inc
LINUX_VERSION = "3.14.39"
KBRANCH = "standard/preempt-rt/axxia/base"
@@ -9,4 +9,4 @@ SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
SRC_URI += "file://fit"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'frags-${KARCH}-${KV}.inc', d)}
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.1.inc b/recipes-kernel/linux/linux-yocto-rt_4.1.inc
index d14a182..75a0116 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.1.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_4.1.inc
@@ -1,5 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+require dt-${KARCH}.inc
+
+KBRANCH = "standard/preempt-rt/axxia/base"
SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
-SRC_URI += "file://defconfig"
+SRC_URI += "file://fit"
+
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.14.inc b/recipes-kernel/linux/linux-yocto_3.14.inc
index c76a590..e22293a 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto_3.14.inc
@@ -1,7 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'dt-${KARCH}.inc', d)}
+require dt-${KARCH}.inc
LINUX_VERSION = "3.14.39"
KBRANCH = "standard/axxia/base"
@@ -9,4 +9,4 @@ SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
SRC_URI += "file://fit"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'frags-${KARCH}-${KV}.inc', d)}
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/linux-yocto_4.1.inc b/recipes-kernel/linux/linux-yocto_4.1.inc
index d14a182..5533192 100644
--- a/recipes-kernel/linux/linux-yocto_4.1.inc
+++ b/recipes-kernel/linux/linux-yocto_4.1.inc
@@ -1,5 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
+require dt-${KARCH}.inc
+
+KBRANCH = "standard/axxia/base"
SRCREV_machine ="${AUTOREV}"
SRCREV_meta ="${AUTOREV}"
-SRC_URI += "file://defconfig"
+SRC_URI += "file://fit"
+
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.14.inc b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
index f3b87da..823925e 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'dt-${KARCH}.inc', d)}
+require dt-${KARCH}.inc
LSI_KERNEL_TAG = "tip"
LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
@@ -15,4 +15,4 @@ SRCREV_meta ="${AUTOREV}"
SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine; \
${KREPO_META};type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
SRC_URI += "file://fit"
-SRC_URI += "${@base_conditional('KARCH', 'arm64', '', 'file://defconfig', d)}"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.14.inc b/recipes-kernel/linux/lsi-tip_3.14.inc
index f61f4de..4cd58bb 100644
--- a/recipes-kernel/linux/lsi-tip_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip_3.14.inc
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
-require ${@base_conditional('KARCH', 'arm64', 'placeholder.inc', 'dt-${KARCH}.inc', d)}
+require dt-${KARCH}.inc
LSI_KERNEL_TAG = "tip"
LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
@@ -15,4 +15,4 @@ SRCREV_meta ="${AUTOREV}"
SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine; \
${KREPO_META};type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
SRC_URI += "file://fit"
-SRC_URI += "${@base_conditional('KARCH', 'arm64', '', 'file://defconfig', d)}"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/placeholder.inc b/recipes-kernel/linux/placeholder.inc
deleted file mode 100644
index 406d25d..0000000
--- a/recipes-kernel/linux/placeholder.inc
+++ /dev/null
@@ -1 +0,0 @@
-# empty config file
--
1.9.1
More information about the meta-lsi
mailing list