merge of 'a9d59f7c5db704e36d7f7dbda87b750cabbbc775'

     and 'fcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f'

3 files changed, 43 insertions, 2 deletions

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index c479075285..a797d5ec04 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
 #@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -23,7 +23,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-ext2 \
   alsa-state"
 
-# used by sysvinit_2
+# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
 #SERIAL_CONSOLE = "115200 ttySAC0"
 
 # used by some images
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
new file mode 100644
index 0000000000..a946f49c4f
--- /dev/null
+++ b/conf/machine/fic-gta02.conf
@@ -0,0 +1,38 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: FIC GTA02 (Neo1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
+
+# package gta01 specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-module-gta01-pm-bt  \
+  kernel-module-gta01-pm-gps \
+  kernel-module-gta01-pm-gsm \
+  kernel-module-gta01kbd \
+  kernel-module-s3cmci \
+  kernel-module-ext2 \
+  alsa-state"
+
+SERIAL_CONSOLE = "115200 ttySAC2"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+
+# build tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+
+# tune for S3C24x0
+include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 95eb7354fe..e2e7f2f2d1 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -35,6 +35,8 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
 				kernel-module-htcuniversal-acx \
 				kernel-module-acx \
                                 kernel-module-i2c-algo-bit \
+                                kernel-module-htcuniversal-ts2 \
+                                kernel-module-ts-adc-debounce \
 				"
 
 #
@@ -45,6 +47,7 @@ module_autoload_htcuniversal_acx = "htcuniversal_acx"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
+module_autoload_htcuniversal-ts2 = "htcuniversal-ts2"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"