From 44eb397f1c60062b765bee9f51ceabb015ba3b73 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <thomas.klaehn@u-blox.com>
Date: Tue, 16 Oct 2018 16:28:46 +0200
Subject: [PATCH] meta-bbb: Update to sumo

Signed-off-by: Thomas Klaehn <thomas.klaehn@u-blox.com>
---
 buildconf/bbb-init-build-env                              | 2 +-
 buildconf/local.conf.sample                               | 8 ++++----
 conf/layer.conf                                           | 1 +
 ...inux-yocto_4.10.bbappend => linux-yocto_4.15.bbappend} | 6 +++++-
 4 files changed, 11 insertions(+), 6 deletions(-)
 rename recipes-kernel/linux/{linux-yocto_4.10.bbappend => linux-yocto_4.15.bbappend} (72%)

diff --git a/buildconf/bbb-init-build-env b/buildconf/bbb-init-build-env
index b2bd80b..1a1685b 100644
--- a/buildconf/bbb-init-build-env
+++ b/buildconf/bbb-init-build-env
@@ -1,5 +1,5 @@
 # Defaults
-OPT_M=beaglebone
+OPT_M=beaglebone-yocto
 BUILD_DIR=build
 
 #
diff --git a/buildconf/local.conf.sample b/buildconf/local.conf.sample
index 969df9a..3438899 100644
--- a/buildconf/local.conf.sample
+++ b/buildconf/local.conf.sample
@@ -1,4 +1,4 @@
-MACHINE ?= "beaglebone"
+MACHINE ?= "beaglebone-yocto"
 
 #DL_DIR ?= "${TOPDIR}/../../downloads"
 #SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
@@ -35,9 +35,9 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 
-#INHERIT += "icecc"
-#ICECC_PATH = "/usr/bin/icecc"
-#ICECC_PARALLEL_MAKE = "-j 20"
+INHERIT += "icecc"
+ICECC_PATH = "/usr/bin/icecc"
+ICECC_PARALLEL_MAKE = "-j 20"
 
 INHERIT += "own-mirrors"
 SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
diff --git a/conf/layer.conf b/conf/layer.conf
index b37f310..355893f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,3 +16,4 @@ BBFILE_COLLECTIONS += "meta-bbb"
 BBFILE_PATTERN_meta-bbb = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-bbb = "7"
 
+LAYERSERIES_COMPAT_meta-bbb = "sumo rocko"
diff --git a/recipes-kernel/linux/linux-yocto_4.10.bbappend b/recipes-kernel/linux/linux-yocto_4.15.bbappend
similarity index 72%
rename from recipes-kernel/linux/linux-yocto_4.10.bbappend
rename to recipes-kernel/linux/linux-yocto_4.15.bbappend
index d27f5dc..3311baa 100644
--- a/recipes-kernel/linux/linux-yocto_4.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.15.bbappend
@@ -7,11 +7,15 @@ SRC_URI += " \
 	file://rtl8192cu.cfg \
 	file://enable_pwm.cfg \
 	file://enable_onboard_leds.cfg \
-	file://0001-bbb-enable-pwm.patch \
+	file://enable_hostap_wext.cfg \
+	file://0003-bbb-enable-pwm.patch \
 	file://0002-onboard-led-init-disable.patch \
 "
 
 KERNEL_CONFIG_FRAGMENTS_append_ti33x = " \
   ${WORKDIR}/rtl8192cu.cfg \
   ${WORKDIR}/enable_pwm.cfg \
+  ${WORKDIR}/enable_onboard_leds.cfg \
+  ${WORKDIR}/enable_hostap_wext.cfg \
 "
+