[meta-lsi] [PATCH 13/15] linux-yocto-3.10: use configuration fragments selectively
Cristian Bercaru
cristian.bercaru at windriver.com
Wed May 13 04:19:47 PDT 2015
This patch modified the yocto recipes for linux kernel 3.10 such that
- When compiling the kernel from github private and public
repositories the defconfigs from meta-lsi are used.
- When compiling the kernel from the yocto repository, configuration
fragments are used to build the defconfigs. The fragments are taken
from the meta branches of the repository and from the meta-lsi layer.
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
recipes-kernel/linux/axxiaarm_3.10.inc | 16 ++++++++++++++++
recipes-kernel/linux/axxiapowerpc_3.10.inc | 9 +++++++++
recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 10 +++++-----
recipes-kernel/linux/linux-yocto-rt_3.10.inc | 13 +++++++++----
recipes-kernel/linux/linux-yocto_3.10.bbappend | 10 +++++-----
recipes-kernel/linux/linux-yocto_3.10.inc | 10 ++++++++--
recipes-kernel/linux/lsi-public-rt_3.10.inc | 4 ++++
recipes-kernel/linux/lsi-public_3.10.inc | 4 ++++
recipes-kernel/linux/lsi-tip-rt_3.10.inc | 6 +++++-
recipes-kernel/linux/lsi-tip_3.10.inc | 6 +++++-
10 files changed, 70 insertions(+), 18 deletions(-)
create mode 100644 recipes-kernel/linux/axxiaarm_3.10.inc
create mode 100644 recipes-kernel/linux/axxiapowerpc_3.10.inc
diff --git a/recipes-kernel/linux/axxiaarm_3.10.inc b/recipes-kernel/linux/axxiaarm_3.10.inc
new file mode 100644
index 0000000..c7c35aa
--- /dev/null
+++ b/recipes-kernel/linux/axxiaarm_3.10.inc
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/linux-3.10/${MACHINE}:\
+${THISDIR}/conf/linux-3.10/${MACHINE}/big-endian:\
+${THISDIR}/conf/linux-3.10/${MACHINE}/dbg-arm:"
+
+# adding fragments with kernel options to the final .config
+KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
+SRC_URI += "file://axxiaarm-common.scc \
+ ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://axxiaarm-preempt-rt.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://power-management-full-power.scc', '', d)} \
+ ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://power-management-full-power-L2.scc', '', d)} \
+ ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://power-management-low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_3.10.inc b/recipes-kernel/linux/axxiapowerpc_3.10.inc
new file mode 100644
index 0000000..163b7c8
--- /dev/null
+++ b/recipes-kernel/linux/axxiapowerpc_3.10.inc
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/linux-3.10/${MACHINE}:\
+${THISDIR}/conf/linux-3.10/${MACHINE}/dbg-ppc:"
+
+# adding fragments with kernel options to the final .config
+KERNEL_EXTRA_FEATURES = ""
+SRC_URI += "file://axxiapowerpc-common.scc \
+ ${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://axxiapowerpc-preempt-rt.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.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index 647740d..e0a7c9c 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
LINUX_KERNEL_TYPE = "preempt-rt"
LSI_SRC ?= "linux-yocto"
+POWER_MANAGEMENT ?= "low-power"
+BIG_ENDIAN ?= "no"
+DBG ?= "no"
+TESTING ?= "no"
KV = "3.10"
+KERNEL_EXTRA_FEATURES = ""
require ${LSI_SRC}-rt_3.10.inc
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-SRC_URI += "file://defconfig"
-SRC_URI += "file://fit"
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.inc b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
index 10614e8..224eaef 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
@@ -3,9 +3,14 @@ require linux-yocto.inc
LINUX_VERSION = "3.10.65"
-#KBRANCH = "standard/preempt-rt/axxia/base"
-KBRANCH = "standard/axxia/base"
+KBRANCH = "standard/preempt-rt/axxia/base"
+KMETA = "meta"
KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
-SRCREV_machine = "70621a4c5f74ccd8dc57f6592c5ebf560df7405e"
-SRCREV_meta = "d5456dd830cad14bd844753b751b83744ced3793"
+SRCREV_machine = "d9a725f91ab2873f1b199f8733168ccb23e07095"
+SRCREV_meta = "1b6394b7047e4b614e14145987463cb030dc81f9"
+
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+
+require ${MACHINE}_3.10.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 0e6e2cc..3ecc90d 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
LINUX_KERNEL_TYPE = "standard"
LSI_SRC ?= "linux-yocto"
+POWER_MANAGEMENT ?= "low-power"
+BIG_ENDIAN ?= "no"
+DBG ?= "no"
+TESTING ?= "no"
KV = "3.10"
+KERNEL_EXTRA_FEATURES = ""
require ${LSI_SRC}_3.10.inc
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-SRC_URI += "file://defconfig"
-SRC_URI += "file://fit"
diff --git a/recipes-kernel/linux/linux-yocto_3.10.inc b/recipes-kernel/linux/linux-yocto_3.10.inc
index 1740b79..aa28104 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto_3.10.inc
@@ -4,7 +4,13 @@ require linux-yocto.inc
LINUX_VERSION = "3.10.65"
KBRANCH = "standard/axxia/base"
+KMETA = "meta"
KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
-SRCREV_machine = "70621a4c5f74ccd8dc57f6592c5ebf560df7405e"
-SRCREV_meta = "d5456dd830cad14bd844753b751b83744ced3793"
+SRCREV_machine = "ba56b29d5fc1543494413a42bc70cb82fd067cc5"
+SRCREV_meta = "1b6394b7047e4b614e14145987463cb030dc81f9"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+
+require ${MACHINE}_3.10.inc
diff --git a/recipes-kernel/linux/lsi-public-rt_3.10.inc b/recipes-kernel/linux/lsi-public-rt_3.10.inc
index 7db8fe0..85b75f0 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.10.inc
@@ -9,3 +9,7 @@ KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git"
SRCREV_machine="576cfef2bbdd19ed0ea0751530120f1b3deb19cf"
SRCREV_meta="d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
+
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-public_3.10.inc b/recipes-kernel/linux/lsi-public_3.10.inc
index 1f5c37b..8017676 100644
--- a/recipes-kernel/linux/lsi-public_3.10.inc
+++ b/recipes-kernel/linux/lsi-public_3.10.inc
@@ -9,3 +9,7 @@ KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git"
SRCREV_machine="d897b74e044397e4d1be55b9e761772809f58563"
SRCREV_meta="d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.10.inc b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
index c637771..0bbf2f3 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
@@ -8,4 +8,8 @@ KBRANCH = "standard/preempt-rt/lsi/base"
KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRCREV_meta="${AUTOREV}"
+
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.10.inc b/recipes-kernel/linux/lsi-tip_3.10.inc
index 50565cf..e24e5d4 100644
--- a/recipes-kernel/linux/lsi-tip_3.10.inc
+++ b/recipes-kernel/linux/lsi-tip_3.10.inc
@@ -8,4 +8,8 @@ KBRANCH = "standard/lsi/base"
KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRCREV_meta="${AUTOREV}"
+
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI += "file://fit"
+SRC_URI += "file://defconfig"
--
1.7.9.5
More information about the meta-lsi
mailing list