om-gta01.conf: bring over this conf from om.dev

The modification is made in a merge so cherry-picking is not possible.

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index a45380f..7e3b9ed 100644 (file)
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,12 +1,11 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA01 (Neo 1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
+#@NAME: OM GTA01 (Neo1973)
+#@DESCRIPTION: Machine configuration for the OM Neo1973 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-MACHINE_CLASS = "neo1973"
-PACKAGE_EXTRA_ARCHS = "fic-gta01 ${MACHINE_CLASS}"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
@@ -26,7 +25,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-snd-soc-neo1973-wm8753 \
-  kernel-module-snd-soc-smdk2440 \
+  kernel-module-g-ether \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
@@ -36,7 +35,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2"
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools