summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/beagleboard.conf5
-rw-r--r--conf/machine/include/omap3.inc2
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
17# SPL build 17# SPL build
18EXTRA_IMAGEDEPENDS = "u-boot" 18EXTRA_IMAGEDEPENDS = "u-boot"
19 19
20PREFERRED_PROVIDER_virtual/kernel = "linux" 20PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
21 21
22IMAGE_FSTYPES += "tar.bz2 ubi" 22IMAGE_FSTYPES += "tar.bz2 ubi"
23EXTRA_IMAGECMD_jffs2 = "-lnp " 23EXTRA_IMAGECMD_jffs2 = "-lnp "
@@ -46,3 +46,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
46 46
47# and sdio 47# and sdio
48MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" 48MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
49
50# For a modularized kernel we want to drag in networking, sound, rtc etc."
51MACHINE_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
4require conf/machine/include/tune-cortexa8.inc 4require conf/machine/include/tune-cortexa8.inc
5PREFERRED_PROVIDER_virtual/kernel = "linux-omap" 5PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
6# Increase this everytime you change something in the kernel 6# Increase this everytime you change something in the kernel
7MACHINE_KERNEL_PR = "r119" 7MACHINE_KERNEL_PR = "r120"
8 8
9KERNEL_IMAGETYPE = "uImage" 9KERNEL_IMAGETYPE = "uImage"
10 10