From 4c2025b2da0c3e7157e65dad7581f42179b644ef Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Mon, 2 Mar 2009 21:12:47 +0100
Subject: [PATCH] linux-openmoko.inc: Openmoko's GTA03 device got a new name

---
 conf/machine/om-3d7k.conf         | 34 ++++++++++++++++++++++++++++++++++
 conf/machine/om-gta03.conf        | 35 -----------------------------------
 packages/linux/linux-openmoko.inc |  6 ++++--
 3 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 conf/machine/om-3d7k.conf
 delete mode 100644 conf/machine/om-gta03.conf

diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
new file mode 100644
index 0000000..7f2cc87
--- /dev/null
+++ b/conf/machine/om-3d7k.conf
@@ -0,0 +1,34 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: Openmoko 3D7K
+#@DESCRIPTION: Machine configuration for the Openmoko 3D7K GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-xorg"
+
+# package machine specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-modules \
+"
+
+SERIAL_CONSOLE = "115200 ttySAC2"
+USE_VT = "0"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# boots only from SD
+IMAGE_FSTYPES = "tar.bz2"
+
+# tune for S3C6410
+include conf/machine/include/tune-arm1176jzf-s.inc
diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-gta03.conf
deleted file mode 100644
index f135178..0000000
--- a/conf/machine/om-gta03.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Machine
-#@NAME: Openmoko GTA03 (XXX)
-#@DESCRIPTION: Machine configuration for the Openmoko XXX GSM phone
-#-----------------------------------------------------------------------------
-
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
-MACHINE_DISPLAY_WIDTH_PIXELS = "480"
-MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_DISPLAY_ORIENTATION = "0"
-MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
-
-# package machine specific modules
-MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-modules \
-"
-
-# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
-SERIAL_CONSOLE = "115200 ttySAC2"
-USE_VT = "0"
-
-# used by some images
-ROOT_FLASH_SIZE = "256"
-
-# boots only from SD
-IMAGE_FSTYPES = "tar.bz2"
-
-# tune for S3C6410
-include conf/machine/include/tune-arm1176jzf-s.inc
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 5224841..edc869a 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -5,9 +5,11 @@ KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-gta03"
+COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-3d7k"
 
-KERNEL_IMAGETYPE_om-gta03 = "zImage"
+KERNEL_IMAGE_SYMLINK_NAME_om-gta01 = "uImage-GTA01.bin"
+KERNEL_IMAGE_SYMLINK_NAME_om-gta01 = "uImage-GTA02.bin"
+KERNEL_IMAGE_SYMLINK_NAME_om-gta01 = "uImage-OM3D7K.bin"
 
 CMDLINE = "unused -- bootloader passes ATAG list"
 
-- 
2.7.4