diff options
| author |   Rod Whitby <rod@whitby.id.au> | 2007-12-01 14:20:01 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-12-01 14:20:01 +0000 |
| commit | fdf5a003fdaeba376c9ec1aa0a0b305f8dc4fcb8 (patch) | |
| tree | 265312f415dbd9a48eec1930792ffabb74dedbac | |
| parent | 214ed085dec831f0f1a9a369ca3646e187b85949 (diff) | |
| parent | a5fb224426c234fa7d6e1e8821b4efeb53c1add3 (diff) | |
| download | openembedded-fdf5a003fdaeba376c9ec1aa0a0b305f8dc4fcb8.tar.gz | |
merge of '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
and 'f31acbcc26f0c26226e19e7d8c547973cf9a473b'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 1 | ||||
| -rw-r--r-- | conf/machine/include/ixp4xx.inc | 20 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx_2.6.23.8.bb | 6 |
3 files changed, 21 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 84077594af..ead957f1ba 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -61,6 +61,7 @@ PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 04b6542470..bc3b49c7c1 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -5,9 +5,21 @@ # Set default for nslu2 - can be overridden for machines with other features. MACHINE_FEATURES ?= "kernel26 usbhost ext2" -# Set defaults for nslu2 - can be overridden for machines with other requirements. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" + +# Add modules required for basic networking support + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= " \ + ixp4xx-npe \ + " + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ + kernel-module-mii \ + kernel-module-ixp4xx-mac \ + kernel-module-ixp4xx-qmgr \ + kernel-module-via-velocity \ + " # Set default for nslu2 - can be overridden for machines with more flash. ROOT_FLASH_SIZE ?= "12" @@ -15,8 +27,6 @@ ROOT_FLASH_SIZE ?= "12" # Set default for nslu2, nas100d, dsmg600 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" - require conf/machine/include/tune-xscale.inc require conf/machine/include/tune-thumb.inc diff --git a/packages/linux/linux-ixp4xx_2.6.23.8.bb b/packages/linux/linux-ixp4xx_2.6.23.8.bb index a6dcca41b5..ab621f310a 100644 --- a/packages/linux/linux-ixp4xx_2.6.23.8.bb +++ b/packages/linux/linux-ixp4xx_2.6.23.8.bb @@ -1,3 +1,7 @@ +# The new ethernet driver included in the 2.6.23 version of the nslu2-linux.org kernel patches +# has problems with providing the correct MAC address on the initial DHCP request. +DEFAULT_PREFERENCE = "-1" + require linux.inc require linux-ixp4xx.inc @@ -8,7 +12,7 @@ KERNEL_RELEASE = "2.6.23.8" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ |