linux-openmoko.inc: Openmoko's GTA03 device got a new name

diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-3d7k.conf
similarity index 72%
rename from conf/machine/om-gta03.conf
rename to conf/machine/om-3d7k.conf
index f135178..7f2cc87 100644 (file)
--- a/conf/machine/om-gta03.conf
+++ b/conf/machine/om-3d7k.conf
@@ -1,27 +1,26 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: Openmoko GTA03 (XXX)
-#@DESCRIPTION: Machine configuration for the Openmoko XXX GSM phone
+#@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-kdrive"
+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-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER = "xserver-xorg"
 
 # 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"
 

diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 5224841..edc869a 100644 (file)
--- 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"