summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-26 15:05:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-26 15:12:26 +0200
commit8bb53d3f261c59353652f0328bfd887d6aa1c112 (patch)
tree99e66d9e168fe70b3de5e12a1879adda6971ac39 /conf
parentfa8b49b614644b3b02cf2e962fed95cf41f6e6f3 (diff)
linux-openmoko: partial revert of rename to PN_PV sheme
* details in http://thread.gmane.org/gmane.comp.handhelds.openembedded/32950 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/om-3d7k.conf3
-rw-r--r--conf/machine/om-gta01.conf3
-rw-r--r--conf/machine/om-gta02.conf4
3 files changed, 3 insertions, 7 deletions
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 229f34c7d0..0ebd2a0d6d 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -6,9 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index fddb6536e4..0890d7184b 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -6,9 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
UBOOT_ENTRYPOINT = "30008000"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ae1aa93a15..47f4ae16e5 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,10 +6,8 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_VERSION_linux-openmoko ?= "2.6.29"
-
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
# Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
MACHINE_DRI_MODULES_shr = "glamo"