[oe-commits] Ulf Samuelsson : Update common machine files for AT91, fix PREFERRED_VERSION_u-boot

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: 5fee16ea0babcb9502f186b565255b1d52120aa4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5fee16ea0babcb9502f186b565255b1d52120aa4

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Tue Aug 11 23:35:06 2009 +0200

Update common machine files for AT91, fix PREFERRED_VERSION_u-boot

---

 conf/machine/include/AT91-LCD.inc |   10 +++++++++-
 conf/machine/include/AT91.inc     |   17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
index f531158..2adae2b 100644
--- a/conf/machine/include/AT91-LCD.inc
+++ b/conf/machine/include/AT91-LCD.inc
@@ -2,5 +2,13 @@
 
 include conf/machine/include/AT91.inc
 
-MACHINE_FEATURES += "screen touchscreen"
+MACHINE_FEATURES += "screen touchscreen keyboard"
+
+# Some options we disable for now
+# MACHINE_FEATURES += "apm"
+# MACHINE_FEATURES += "lcd"
+# MACHINE_FEATURES += "bluetooth wifi irda phone gps"
+# MACHINE_FEATURES += "mmc mmcroot fat"
+# MACHINE_FEATURES += "i2c spi serial"
+# MACHINE_FEATURES += "sound libogg libvorbis"
 
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc
index 658ac07..3bea557 100644
--- a/conf/machine/include/AT91.inc
+++ b/conf/machine/include/AT91.inc
@@ -7,23 +7,38 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.30.2"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13-rc1"
-PREFERRED_PROVIDER_u-boot = "u-boot_2009.09-rc2"
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.08-rc2"
 
 KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_VERSION_at91bootstrap = "2.13-rc1"
 PREFERRED_VERSION_u-boot = "2009.08-rc2"
+# PREFERRED_VERSION_mplayer = "svn"
+
 #don't try to access tty1
 USE_VT = "0"
 
 MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget vfat"
+MACHINE_EXTRA_RDEPENDS += "mpg321 mpd madplay mplayer libmad"
+MACHINE_EXTRA_RDEPENDS += "kernel-modules u-boot-utils"
+MACHINE_EXTRA_RDEPENDS += "minicom"
+MACHINE_EXTRA_RDEPENDS += "samba vsftpd"
+MACHINE_EXTRA_RDEPENDS += "nano"
+
+
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "at91bootstrap"
 
+
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
 IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+#
+# Uncomment or add kernel modules that should be autoloaded
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_file_storage', '',d)}
+#module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
+module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
 require conf/machine/include/tune-arm926ejs.inc