diff options
-rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf index d6eee6fe64..26706911b0 100644 --- a/meta-yocto/conf/machine/beagleboard.conf +++ b/meta-yocto/conf/machine/beagleboard.conf | |||
@@ -6,19 +6,19 @@ TARGET_ARCH = "arm" | |||
6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 6 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
7 | XSERVER = "xserver-kdrive-fbdev" | 7 | XSERVER = "xserver-kdrive-fbdev" |
8 | 8 | ||
9 | #Ship all kernel modules till the board support has matured enough | 9 | # Ship all kernel modules by default |
10 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 10 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
11 | 11 | ||
12 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) | 12 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) |
13 | EXTRA_IMAGEDEPENDS += "u-boot x-load" | 13 | EXTRA_IMAGEDEPENDS += "u-boot x-load" |
14 | 14 | ||
15 | #include conf/machine/include/tune-arm1136jf-s.inc | ||
16 | include conf/machine/include/tune-cortexa8.inc | 15 | include conf/machine/include/tune-cortexa8.inc |
17 | 16 | ||
18 | IMAGE_FSTYPES += "tar.bz2 jffs2" | 17 | IMAGE_FSTYPES += "tar.bz2 jffs2" |
19 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 18 | EXTRA_IMAGECMD_jffs2 = "-lnp " |
20 | 19 | ||
21 | # Guesswork | 20 | # 2.6.37 and later kernels use OMAP_SERIAL, ttyO2 |
21 | # earlier kernels use ttyS2 | ||
22 | SERIAL_CONSOLE = "115200 ttyO2" | 22 | SERIAL_CONSOLE = "115200 ttyO2" |
23 | 23 | ||
24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 24 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
@@ -30,6 +30,4 @@ UBOOT_MACHINE = "omap3_beagle_config" | |||
30 | UBOOT_ENTRYPOINT = "0x80008000" | 30 | UBOOT_ENTRYPOINT = "0x80008000" |
31 | UBOOT_LOADADDRESS = "0x80008000" | 31 | UBOOT_LOADADDRESS = "0x80008000" |
32 | 32 | ||
33 | |||
34 | # and sdio | ||
35 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" | 33 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" |