From c56b95f3ae26c97fb6aef11bda3155c713b05130 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 22 May 2008 08:21:04 +0000
Subject: Rename fic-gta01 to om-gta01 as per upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4533 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../initscripts/initscripts-1.0/fic-gta01/inittab  | 48 ---------------
 .../initscripts/initscripts-1.0/om-gta01/inittab   | 48 +++++++++++++++
 meta/packages/libgsmd/files/fic-gta01/gsmd         | 49 ---------------
 meta/packages/libgsmd/files/om-gta01/gsmd          | 49 +++++++++++++++
 meta/packages/linux/linux-openmoko_2.6.24+git.bb   |  6 +-
 .../packages/pointercal/files/fic-gta01/pointercal |  1 -
 meta/packages/pointercal/files/om-gta01/pointercal |  1 +
 .../uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine  | 69 ----------------------
 .../uclibc/uclibc-0.9.29/om-gta01/uClibc.machine   | 69 ++++++++++++++++++++++
 9 files changed, 170 insertions(+), 170 deletions(-)
 delete mode 100644 meta/packages/initscripts/initscripts-1.0/fic-gta01/inittab
 create mode 100644 meta/packages/initscripts/initscripts-1.0/om-gta01/inittab
 delete mode 100644 meta/packages/libgsmd/files/fic-gta01/gsmd
 create mode 100644 meta/packages/libgsmd/files/om-gta01/gsmd
 delete mode 100644 meta/packages/pointercal/files/fic-gta01/pointercal
 create mode 100644 meta/packages/pointercal/files/om-gta01/pointercal
 delete mode 100644 meta/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine
 create mode 100644 meta/packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine

(limited to 'meta/packages')

diff --git a/meta/packages/initscripts/initscripts-1.0/fic-gta01/inittab b/meta/packages/initscripts/initscripts-1.0/fic-gta01/inittab
deleted file mode 100644
index 8d313b2a5..000000000
--- a/meta/packages/initscripts/initscripts-1.0/fic-gta01/inittab
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/inittab: init(8) configuration.
-# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
-
-# The default runlevel.
-id:5:initdefault:
-
-# Boot-time system configuration/initialization script.
-# This is run first except when booting in emergency (-b) mode.
-si::sysinit:/etc/init.d/rcS
-
-# What to do in single-user mode.
-~~:S:wait:/sbin/sulogin
-
-# Shut down if kernel sends us SIGINT or SIGPWR
-ca::ctrlaltdel:/sbin/halt -p
-pf::powerfailnow:/sbin/halt -p
-
-# /etc/init.d executes the S and K scripts upon change
-# of runlevel.
-#
-# Runlevel 0 is halt.
-# Runlevel 1 is single-user.
-# Runlevels 2-5 are multi-user.
-# Runlevel 6 is reboot.
-
-l0:0:wait:/etc/init.d/rc 0
-l1:1:wait:/etc/init.d/rc 1
-l2:2:wait:/etc/init.d/rc 2
-l3:3:wait:/etc/init.d/rc 3
-l4:4:wait:/etc/init.d/rc 4
-l5:5:wait:/etc/init.d/rc 5
-l6:6:wait:/etc/init.d/rc 6
-# Normally not reached, but fallthrough in case of emergency.
-z6:6:respawn:/sbin/sulogin
-
-# /sbin/getty invocations for the runlevels.
-#
-# The "id" field MUST be the same as the last
-# characters of the device (after "tty").
-#
-# Format:
-#  <id>:<runlevels>:<action>:<process>
-
-# NOTE: FIC GTA01 has this odd multiplexer on ttySAC0 since
-#       GSM shares it with the serial output. We only allow
-#       the getty in runlevel 2 to cope with that. gsmd gets
-#       started in runlevel 3.        -- mickey@openmoko.org
-S:2:respawn:/sbin/getty 115200 ttySAC0
diff --git a/meta/packages/initscripts/initscripts-1.0/om-gta01/inittab b/meta/packages/initscripts/initscripts-1.0/om-gta01/inittab
new file mode 100644
index 000000000..8d313b2a5
--- /dev/null
+++ b/meta/packages/initscripts/initscripts-1.0/om-gta01/inittab
@@ -0,0 +1,48 @@
+# /etc/inittab: init(8) configuration.
+# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $
+
+# The default runlevel.
+id:5:initdefault:
+
+# Boot-time system configuration/initialization script.
+# This is run first except when booting in emergency (-b) mode.
+si::sysinit:/etc/init.d/rcS
+
+# What to do in single-user mode.
+~~:S:wait:/sbin/sulogin
+
+# Shut down if kernel sends us SIGINT or SIGPWR
+ca::ctrlaltdel:/sbin/halt -p
+pf::powerfailnow:/sbin/halt -p
+
+# /etc/init.d executes the S and K scripts upon change
+# of runlevel.
+#
+# Runlevel 0 is halt.
+# Runlevel 1 is single-user.
+# Runlevels 2-5 are multi-user.
+# Runlevel 6 is reboot.
+
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+
+# NOTE: FIC GTA01 has this odd multiplexer on ttySAC0 since
+#       GSM shares it with the serial output. We only allow
+#       the getty in runlevel 2 to cope with that. gsmd gets
+#       started in runlevel 3.        -- mickey@openmoko.org
+S:2:respawn:/sbin/getty 115200 ttySAC0
diff --git a/meta/packages/libgsmd/files/fic-gta01/gsmd b/meta/packages/libgsmd/files/fic-gta01/gsmd
deleted file mode 100644
index d8323e202..000000000
--- a/meta/packages/libgsmd/files/fic-gta01/gsmd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# gsmd  This shell script starts and stops gsmd.
-#
-# chkconfig: 345 90 40
-# description: Gsmd manages access to a serial- or USB-connected GSM
-# processname: gsmd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/gsmd ] && . /etc/default/gsmd
-
-case "$1" in
-    start)
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
-        stty -F "$GSM_DEV" -echo
-        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
-        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
-
-        echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
-
-        if [ $? = 0 ]; then
-            echo "gsmd."
-        else
-            echo "(failed.)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping GSM daemon: "
-        start-stop-daemon -K -x /usr/sbin/gsmd
-        stty -F "$GSM_DEV" -crtscts
-        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-        echo "gsmd."
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/meta/packages/libgsmd/files/om-gta01/gsmd b/meta/packages/libgsmd/files/om-gta01/gsmd
new file mode 100644
index 000000000..d8323e202
--- /dev/null
+++ b/meta/packages/libgsmd/files/om-gta01/gsmd
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# gsmd  This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+    start)
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        stty -F "$GSM_DEV" -echo
+        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+        echo -n "Starting GSM daemon: "
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+        if [ $? = 0 ]; then
+            echo "gsmd."
+        else
+            echo "(failed.)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping GSM daemon: "
+        start-stop-daemon -K -x /usr/sbin/gsmd
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+        echo "gsmd."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta/packages/linux/linux-openmoko_2.6.24+git.bb b/meta/packages/linux/linux-openmoko_2.6.24+git.bb
index c37259c52..88ea00a56 100644
--- a/meta/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/meta/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -23,15 +23,15 @@ ALLOW_EMPTY = "1"
 CMDLINE = "unused -- bootloader passes ATAG list"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = "fic-gta01|fic-gta02"
+COMPATIBLE_MACHINE = "om-gta01|om-gta02"
 DEFAULT_PREFERENCE = "1"
 
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-CONFIG_NAME_fic-gta01 = "gta01"
-CONFIG_NAME_fic-gta02 = "gta02"
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
 
 UBOOT_ENTRYPOINT = "30008000"
 
diff --git a/meta/packages/pointercal/files/fic-gta01/pointercal b/meta/packages/pointercal/files/fic-gta01/pointercal
deleted file mode 100644
index 198fd2a77..000000000
--- a/meta/packages/pointercal/files/fic-gta01/pointercal
+++ /dev/null
@@ -1 +0,0 @@
--67 36365 -2733100 -48253 -310 45219816 65536
diff --git a/meta/packages/pointercal/files/om-gta01/pointercal b/meta/packages/pointercal/files/om-gta01/pointercal
new file mode 100644
index 000000000..198fd2a77
--- /dev/null
+++ b/meta/packages/pointercal/files/om-gta01/pointercal
@@ -0,0 +1 @@
+-67 36365 -2733100 -48253 -310 45219816 65536
diff --git a/meta/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine b/meta/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine
deleted file mode 100644
index 898b73a33..000000000
--- a/meta/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Mon May 14 10:23:14 2007
-#
-# TARGET_alpha is not set
-TARGET_arm=y
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="arm"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_ARM_OABI is not set
-CONFIG_ARM_EABI=y
-USE_BX=y
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-CONFIG_ARM920T=y
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_ANY_ENDIAN=y
-ARCH_LITTLE_ENDIAN=y
-# ARCH_WANTS_BIG_ENDIAN is not set
-ARCH_WANTS_LITTLE_ENDIAN=y
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-KERNEL_HEADERS="/usr/include"
-HAVE_DOT_CONFIG=y
-
diff --git a/meta/packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine b/meta/packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine
new file mode 100644
index 000000000..898b73a33
--- /dev/null
+++ b/meta/packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
-- 
cgit v1.2.3