beagleboard: switch to linux-mainline and drag in more modules

also bump MACHINE_KERNEL_PR to force rebuild of external modules like sgx and dsp.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 0043a700..a9029d1d 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -17,7 +17,7 @@ require conf/machine/include/omap3.inc
 # SPL build
 EXTRA_IMAGEDEPENDS = "u-boot"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
 
 IMAGE_FSTYPES += "tar.bz2 ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
@@ -46,3 +46,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
+
+# For a modularized kernel we want to drag in networking, sound, rtc etc."
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 99038565..c5b1979c 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r119"
+MACHINE_KERNEL_PR = "r120"
 
 KERNEL_IMAGETYPE = "uImage"