1 files changed, 28 insertions, 1 deletions

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
 }