diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/beagleboard.conf | 5 | ||||
-rw-r--r-- | conf/machine/include/omap3.inc | 2 |
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 |
18 | EXTRA_IMAGEDEPENDS = "u-boot" | 18 | EXTRA_IMAGEDEPENDS = "u-boot" |
19 | 19 | ||
20 | PREFERRED_PROVIDER_virtual/kernel = "linux" | 20 | PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" |
21 | 21 | ||
22 | IMAGE_FSTYPES += "tar.bz2 ubi" | 22 | IMAGE_FSTYPES += "tar.bz2 ubi" |
23 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 23 | EXTRA_IMAGECMD_jffs2 = "-lnp " |
@@ -46,3 +46,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" | |||
46 | 46 | ||
47 | # and sdio | 47 | # and sdio |
48 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" | 48 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" |
49 | |||
50 | # For a modularized kernel we want to drag in networking, sound, rtc etc." | ||
51 | 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 | |||
4 | require conf/machine/include/tune-cortexa8.inc | 4 | require conf/machine/include/tune-cortexa8.inc |
5 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 5 | PREFERRED_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 |
7 | MACHINE_KERNEL_PR = "r119" | 7 | MACHINE_KERNEL_PR = "r120" |
8 | 8 | ||
9 | KERNEL_IMAGETYPE = "uImage" | 9 | KERNEL_IMAGETYPE = "uImage" |
10 | 10 | ||