fic-gta0? : renamed fic-gta0? to om-gta0? to reflect true name of device

81 files changed, 65 insertions, 53 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 37655b663e..e1482f4107 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -166,7 +166,7 @@ Recipes:    altboot, webcam-server
 Person:     Michael 'Mickey' Lauer
 Mail:       mlauer@vanille-media.de
 Distros:    OpenMoko, Ångström, Generic
-Machines:   fic-gta01, fic-gta02, nokia810, x86, qemuarm, qemux86
+Machines:   om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
 Interests:  Core OE infrastructure, everything Python, EFL, E17, Qt4
 Recipes:    *python*, efl/*, e17*
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 8699dc183c..bb1d65dec3 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -92,8 +92,8 @@ FEED_ARCH_acern30 	= "armv4t"
 FEED_ARCH_amsdelta 	= "armv4t"
 FEED_ARCH_ep93xx 	= "armv4t"
 FEED_ARCH_eteng500 	= "armv4t"
-FEED_ARCH_fic-gta01 	= "armv4t"
-FEED_ARCH_fic-gta02 	= "armv4t"
+FEED_ARCH_om-gta01 	= "armv4t"
+FEED_ARCH_om-gta02 	= "armv4t"
 FEED_ARCH_h1940 	= "armv4t"
 FEED_ARCH_h6300 	= "armv4t"
 FEED_ARCH_kb9202 	= "armv4t"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 2b7aea03b9..434469dc74 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -27,12 +27,12 @@ FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
   snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
   snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \
-  snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \
+  snapshot-om-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/om-gta01 \
   \
   updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
   updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
   updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \
-  updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 "
+  updates-om-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/om-gta01 "
 
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
@@ -49,20 +49,20 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # Same kernel runs on both these machines
 # Currently not used but left here in case someone wants to switch on
 # quickly
-#PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "${MACHINE_CLASS}"
 
 # Same kernel so same usb
-PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "${MACHINE_CLASS}"
 # same kernel so same keymaps
-PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "${MACHINE_CLASS}"
 # neod knows about both machines
-PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}"
 
 # Select package versions we want to use.
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
@@ -74,5 +74,5 @@ PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
 
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
-DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
+DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
+DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/om-gta01.conf
index bfaf5ed793..bfaf5ed793 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/om-gta01.conf
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/om-gta02.conf
index 2c2034b1b6..2c2034b1b6 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/om-gta02.conf
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 600352ec6e..12f74a81c0 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -38,7 +38,7 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
 }
 
-for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
 do
         BUILD_MACHINE=$machine
 	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index cf5af3073e..bb903b236a 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -78,7 +78,7 @@ do
 done  
 
 # graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
+for machine in om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
@@ -96,7 +96,7 @@ do
 done 
 
 #phones
-for machine in fic-gta01 a780 
+for machine in om-gta01 a780 
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index c2414b8013..195363df3c 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -251,7 +251,7 @@ $feeds = array(
 				     ),
 				array(
 						'name'=>'FIC gta01/Neo1973 phone',
-						'url'=>'armv4t/machine/fic-gta01',
+						'url'=>'armv4t/machine/om-gta01',
 				     ),
 
 				array(
diff --git a/contrib/qa/bugzilla.py b/contrib/qa/bugzilla.py
index 17849552b0..019b546a96 100644
--- a/contrib/qa/bugzilla.py
+++ b/contrib/qa/bugzilla.py
@@ -5126,7 +5126,7 @@ bugs_openmoko = """<!-- 1.0@bugzilla.org -->
     </td>
     <td><nobr>FIXE</nobr>
     </td>
-    <td>defconfig-fic-gta01 could use updating
+    <td>defconfig-om-gta01 could use updating
     </td>
 
   </tr>
@@ -5798,7 +5798,7 @@ bugs_openmoko = """<!-- 1.0@bugzilla.org -->
     </td>
     <td><nobr>FIXE</nobr>
     </td>
-    <td>Please enable CONFIG_TUN as a module in defconfig-fic-gta01
+    <td>Please enable CONFIG_TUN as a module in defconfig-om-gta01
     </td>
 
   </tr>
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 7a95b55f34..1d31bd765e 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -15,7 +15,7 @@ SRC_URI = " \
   file://asound.state \
   file://alsa-state "
 
-SRC_URI_append_fic-gta01 = " \
+SRC_URI_append_om-gta01 = " \
   file://capturehandset.state \
   file://captureheadset.state \
   file://gsmbluetooth.state \
@@ -26,7 +26,7 @@ SRC_URI_append_fic-gta01 = " \
   file://voip-handset.state \
   file://voip-headset.state"
 
-SRC_URI_append_fic-gta02 = "\
+SRC_URI_append_om-gta02 = "\
   file://stereoout.state \
   file://gsmhandset.state \
   "
diff --git a/packages/alsa/alsa-state/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-state/om-gta01/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/alsa/alsa-state/fic-gta01/.mtn2git_empty
+++ b/packages/alsa/alsa-state/om-gta01/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/fic-gta01/asound.state b/packages/alsa/alsa-state/om-gta01/asound.state
index 26db3cf311..26db3cf311 100644
--- a/packages/alsa/alsa-state/fic-gta01/asound.state
+++ b/packages/alsa/alsa-state/om-gta01/asound.state
diff --git a/packages/alsa/alsa-state/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/om-gta01/capturehandset.state
index 54bf01e945..54bf01e945 100644
--- a/packages/alsa/alsa-state/fic-gta01/capturehandset.state
+++ b/packages/alsa/alsa-state/om-gta01/capturehandset.state
diff --git a/packages/alsa/alsa-state/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/om-gta01/captureheadset.state
index 2a174d80ab..2a174d80ab 100644
--- a/packages/alsa/alsa-state/fic-gta01/captureheadset.state
+++ b/packages/alsa/alsa-state/om-gta01/captureheadset.state
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state
index 8569474a0e..8569474a0e 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
+++ b/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/om-gta01/gsmhandset.state
index 999f71253c..999f71253c 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
+++ b/packages/alsa/alsa-state/om-gta01/gsmhandset.state
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/om-gta01/gsmheadset.state
index e81bfc8306..e81bfc8306 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
+++ b/packages/alsa/alsa-state/om-gta01/gsmheadset.state
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state b/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state
index 5e3ed93179..5e3ed93179 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
+++ b/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state
diff --git a/packages/alsa/alsa-state/fic-gta01/stereoout.state b/packages/alsa/alsa-state/om-gta01/stereoout.state
index 26db3cf311..26db3cf311 100644
--- a/packages/alsa/alsa-state/fic-gta01/stereoout.state
+++ b/packages/alsa/alsa-state/om-gta01/stereoout.state
diff --git a/packages/alsa/alsa-state/fic-gta01/voip-handset.state b