aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-11-28 05:35:28 +0000
committerRod Whitby <rod@whitby.id.au>2007-11-28 05:35:28 +0000
commitf19c873a409ab4628ab5db2ddf12827063c0cfe8 (patch)
tree15aa61719bf93176bc3d50d5b1d7a2190a6e4c0c /conf
parentebc5a6179a680eadd5e7fc7ca985e2ce63fb90dc (diff)
downloadopenembedded-f19c873a409ab4628ab5db2ddf12827063c0cfe8.tar.gz
linux-ixp4xx: Migration from ixp4xx-kernel. Intended to follow recent OE kernel recipe conventions. Default kernel for slugos distro and ixp4xx machines. ixp4xx-kernel will be removed later once this is well tested.
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/sane-srcrevs.inc1
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/machine/include/ixp4xx.inc2
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 11145fe330..d2a86da256 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,6 +42,7 @@ SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
+SRCREV_pn-linux-ixp4xx ?= "927"
SRCREV_pn-linux-openmoko ?= "3238"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index a0d238f560..6acb72c345 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -114,7 +114,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6"
# Select the smallest provider of x11 libraries
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 175ec80e6a..81e2152bdc 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -8,7 +8,7 @@ ROOT_FLASH_SIZE ?= "12"
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
require conf/machine/include/tune-xscale.inc
require conf/machine/include/tune-thumb.inc