diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-25 14:36:33 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-26 13:02:43 +0200 |
| commit | bab8cda39ab1cecec1119a75596b168b38bc8014 (patch) | |
| tree | 6053b349914c51e468667067fa02c45381a3d381 /conf/machine | |
| parent | 351c813baedcebd8b91cb95aa0038fd0ff2a17dc (diff) | |
linux-openmoko: rename recipes to common PN_PV scheme, cleanup versioning
* move DESCRIPTION to .inc
* remove OEV, KERNEL_RELEASE and KERNEL_VERSION, keep KERNEL_* from
kernel.bbclass
* update distro/machine configs where needed
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/om-3d7k.conf | 3 | ||||
| -rw-r--r-- | conf/machine/om-gta01.conf | 12 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 10 |
3 files changed, 8 insertions, 17 deletions
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf index 95bfd40b23..229f34c7d0 100644 --- a/conf/machine/om-3d7k.conf +++ b/conf/machine/om-3d7k.conf @@ -6,8 +6,9 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" 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 ede2a2009e..fddb6536e4 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -6,16 +6,10 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" - -# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel -PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32" - -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +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 9733269d4f..ae1aa93a15 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -6,15 +6,11 @@ TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_VERSION_linux-openmoko ?= "2.6.29" -# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel -PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel" -#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" - -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" +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" |