From 3a51839799446a014f23eb43e7e5f7ebe18a2f62 Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Wed, 8 Jun 2016 14:44:13 +0200
Subject: linux-ls1: Apply kernel configs

Aplpy the same kernel configs as for the qoriq kernel. meta-fsl-arm has
a class overwriting the .config file in do_configure_prepend which makes
it impossible to make changes to it in a .bbappend. So we are forced to
change it in do_configure_append and force another configuration.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 recipes-kernel/linux/linux-ls1-common.inc    | 27 ++++++++++++++++++++++++++
 recipes-kernel/linux/linux-ls1_3.12.bbappend | 29 +++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-ls1-common.inc

diff --git a/recipes-kernel/linux/linux-ls1-common.inc b/recipes-kernel/linux/linux-ls1-common.inc
new file mode 100644
index 0000000..fe8a391
--- /dev/null
+++ b/recipes-kernel/linux/linux-ls1-common.inc
@@ -0,0 +1,27 @@
+require recipes-kernel/linux/enea-common.inc
+
+ENEA_KERNEL_FRAGMENTS += "\
+    cfg/localversion.cfg \
+    cfg/with_modules.cfg \
+    cfg/embedded.cfg \
+    cfg/preempt.cfg \
+    cfg/root_nfs.cfg \
+    cfg/devtmpfs.cfg \
+    cfg/bootlogd.cfg \
+    cfg/mtd_tests.cfg \
+    cfg/latencytop.cfg \
+    cfg/ltp.cfg \
+    cfg/fuse.cfg \
+    cfg/dpa.cfg \
+    cfg/kprobes.cfg \
+    cfg/i2c.cfg \
+    cfg/lttng.cfg \
+    cfg/powertop.cfg \
+    cfg/systemtap.cfg \
+    cfg/kgdb.cfg \
+    cfg/gpio.cfg \
+    cfg/cpusets.cfg \
+    cfg/nfsdv3.cfg \
+    cfg/nfsdv4.cfg \
+    cfg/nls_cp437.cfg \
+    "
diff --git a/recipes-kernel/linux/linux-ls1_3.12.bbappend b/recipes-kernel/linux/linux-ls1_3.12.bbappend
index 338b3bf..e8fd2e4 100644
--- a/recipes-kernel/linux/linux-ls1_3.12.bbappend
+++ b/recipes-kernel/linux/linux-ls1_3.12.bbappend
@@ -1,3 +1,5 @@
+require linux-ls1-common.inc
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://ls1021aiot.dts \
@@ -8,5 +10,30 @@ SRC_URI += "file://ls1021aiot.dts \
 ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
 
 do_configure_prepend() {
-     cp -rf ${WORKDIR}/ls1021aiot.dts ${S}/arch/arm/boot/dts/ls1021aiot.dts
+    cp -rf ${WORKDIR}/ls1021aiot.dts ${S}/arch/arm/boot/dts/ls1021aiot.dts
+}
+
+do_configure_append() {
+    #
+    # Add Enea specific kernel configs
+    #
+
+    #gather full config fragment paths
+    addon_features=""
+    if [ -n "${ENEA_KERNEL_FRAGMENTS}" ]; then
+        for feature in ${ENEA_KERNEL_FRAGMENTS}; do
+            addon_features="${addon_features} ${WORKDIR}/${feature}"
+        done
+    fi
+
+    #in case there is no .config file yet
+    touch ${B}/.config
+
+    if [ -e "${S}/scripts/kconfig/merge_config.sh" ]; then
+        O=${B} ${S}/scripts/kconfig/merge_config.sh -m .config ${addon_features}
+    else
+        bbfatal "No merge_config.sh found in the kernel tree."
+    fi
+
+    oe_runmake KCONFIG_ALLCONFIG=${B}/.config O=${B} alldefconfig
 }
-- 
cgit v1.2.3-54-g00ecf