summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-03-02 21:12:47 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-03-02 21:15:49 +0100
commit4c2025b2da0c3e7157e65dad7581f42179b644ef (patch)
tree01c21208b8e8688d526e7b1a5c5df7a640deef91
parent1d1c182fca4b9da46f464d45715b000e1f24c743 (diff)
linux-openmoko.inc: Openmoko's GTA03 device got a new name
-rw-r--r--conf/machine/om-3d7k.conf (renamed from conf/machine/om-gta03.conf)9
-rw-r--r--packages/linux/linux-openmoko.inc6
2 files changed, 8 insertions, 7 deletions
diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-3d7k.conf
index f135178652..7f2cc875b9 100644
--- 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 522484184b..edc869ae14 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"