[oe] [PATCH v2] move to at91bootstrap 3.0 for sam9m10g45ek better at91bootstrap board choice for sam9m10g45ek

[Dvorkin Dmitry]

Signed-off-by: Dvorkin Dmitry <dvorkin at tibbo.com>
---
 conf/machine/at91sam9m10g45ek.conf   |   33 +++++++++++++++------------------
 conf/machine/include/at91-2.6.30.inc |    4 ++--
 conf/machine/include/at91-2.6.32.inc |    4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/conf/machine/at91sam9m10g45ek.conf b/conf/machine/at91sam9m10g45ek.conf
index 822b3a2..ac54fc3 100644
--- a/conf/machine/at91sam9m10g45ek.conf
+++ b/conf/machine/at91sam9m10g45ek.conf
@@ -1,26 +1,23 @@
 #@TYPE: Machine
 #@Name: Atmel AT91SAM9M10G45EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9m10g45ek development board with an at91sam9m10 processor
+#@DESCRIPTION: Machine configuration for the at91sam9m10g45ek board with a at91sam9m10 processor
 
-TARGET_ARCH = "arm"
+include conf/machine/include/at91-2.6.30.inc
+include conf/machine/include/at91-lcd.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+# Has linux config file in OpenEmbedded
+# 
+# LINUX26_DEFCONFIG = "at91sam9m10ekes_defconfig"
+# LINUX26_DEFCONFIG = "at91sam9m10g45ek_defconfig"
 
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "0x70008000"
-UBOOT_LOADADDRESS = "0x70008000"
+# Supported u-boot machines
+#UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_sd_config"
 
-#don't try to access tty1
-USE_VT = "0"
-
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
-
-# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttyS0"
-IMAGE_FSTYPES ?= "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+AT91BOOTSTRAP_BOARD = "at91sam9m10df at91sam9m10ek at91sam9m10nf"
 
-require conf/machine/include/tune-arm926ejs.inc
+MACHINE_FEATURES += "usbhost"
 
-AT91BOOTSTRAP_BOARD = "at91sam9m10df at91sam9m10ek at91sam9m10nf"
diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
index e245b15..0549a89 100644
--- a/conf/machine/include/at91-2.6.30.inc
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -7,8 +7,8 @@ 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_at91bootstrap = "at91bootstrap_3.0"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
 PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
 PREFERRED_VERSION_u-boot = "2009.11"
diff --git a/conf/machine/include/at91-2.6.32.inc b/conf/machine/include/at91-2.6.32.inc
index f315af3..4edfc82 100644
--- a/conf/machine/include/at91-2.6.32.inc
+++ b/conf/machine/include/at91-2.6.32.inc
@@ -7,8 +7,8 @@ SOC_FAMILY = "at91"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.32"
 
-PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
-PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_3.0"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
 PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
 PREFERRED_VERSION_u-boot = "2009.11"
-- 
1.7.3.4