4 files changed, 72 insertions, 28 deletions
diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
deleted file mode 100644
index 3036295f48..0000000000
--- a/conf/machine/include/AT91-LCD.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Common description for Atmel ARM processors with LCD controller
-
-include conf/machine/include/AT91.inc
-
-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-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
new file mode 100644
index 0000000000..e245b15363
--- /dev/null
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -0,0 +1,39 @@
+# Common description for Atmel ARM processors
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+SOC_FAMILY = "at91"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.30"
+
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
+PREFERRED_VERSION_at91bootstrap = "2.13"
+
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
+PREFERRED_VERSION_u-boot = "2009.11"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot "
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+MACHINE_EXTRA_RDEPENDS += " kernel-modules "
+#MACHINE_EXTRA_RDEPENDS += " atmel-fixes "
+
+# 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
+
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/at91-2.6.32.inc
index 6c0f8f04ac..f315af3999 100644
--- a/conf/machine/include/AT91.inc
+++ b/conf/machine/include/at91-2.6.32.inc
@@ -2,26 +2,16 @@
 
 TARGET_ARCH = "arm"
 #PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-CPU_FAMILY = "at91"
+SOC_FAMILY = "at91"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.32"
 
-#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
-#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-#PREFERRED_PROVIDER_xserver = "xserver-xorg"
-#PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-#XSERVER = "xserver-kdrive-fbdev"
-# Angstrom defines:
-#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
-
 PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
 PREFERRED_VERSION_at91bootstrap = "2.13"
 
-PREFERRED_PROVIDER_u-boot = "u-boot_2009.08"
-PREFERRED_VERSION_u-boot = "2009.08"
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
+PREFERRED_VERSION_u-boot = "2009.11"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/at91-lcd.inc b/conf/machine/include/at91-lcd.inc
new file mode 100644
index 0000000000..9611a18236
--- /dev/null
+++ b/conf/machine/include/at91-lcd.inc
@@ -0,0 +1,30 @@
+# Common description for Atmel ARM processors with LCD controller
+
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#XSERVER = "xserver-kdrive-fbdev"
+#XSERVER = "xserver-xorg \
+#           xf86-input-evdev \
+#           xf86-input-mouse \
+#           xf86-input-tslib \
+#           xf86-video-fbdev \
+#           xf86-input-keyboard"
+
+# Angstrom defines:
+#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
+
+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"
+
+