diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-19 10:02:31 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-19 10:02:31 +0200 |
| commit | fab2a49c1a2679bc92e62cba0a0a0c65ae032cac (patch) | |
| tree | 42df9f150b9310e9fb111c28faf4923a2a3c0ff6 /conf | |
| parent | 31d6afe558939ef10ab7678a6f398ed57e53d072 (diff) | |
| parent | 036881b90919d04089d418067d076f391d82ea29 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 2 | ||||
| -rw-r--r-- | conf/machine/akita.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-kernel.inc | 7 | ||||
| -rw-r--r-- | conf/machine/spitz.conf | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index f10591948a..3cc807b4fc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21238,7 +21238,7 @@ sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908 md5=dc0f37d933b0b6c713ad617e09441f3b sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee -[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz] +[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5.tar.gz] md5=3fbb02294a8ca33d4684055adba5ed6f sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 9930c89c6a..6f71787fa1 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -21,3 +21,7 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" + +# xserver-kdrive 1.3.0.0 is still the only working version: +XSERVER = "xserver-kdrive-1300-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index 2ca00da9c7..d9f1c1ba85 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -6,13 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" -# Increase PR everytime you change something in the kernel -MACHINE_KERNEL_PR = "r11" -MACHINE_KERNEL_PR_collie = "r8" -MACHINE_KERNEL_PR_tosa = "r4" - -MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13" - KERNEL_IMAGE_MAXSIZE = "1294336" KERNEL_IMAGE_MAXSIZE_collie = "1048576" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 4fe62b5f43..dde1bd1499 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -27,3 +27,7 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" + +# xserver-kdrive 1.3.0.0 is still the only working version: +XSERVER = "xserver-kdrive-1300-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" |