diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-05 18:15:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-05 18:15:38 +0000 |
| commit | a2e86652b541c85a5cb3ba83875f2c21d365405c (patch) | |
| tree | 4d4ad286a756fc9e0225f245e5d67fe6c4713055 /conf/machine | |
| parent | 2260652d80d4481e2a4950677bf1ffee2e9ab02b (diff) | |
openslug-init(modprobe.conf),nslu2.conf: generate the correct ixp-eth alias, support le
modprobe.conf is now machine generated to use the PROVIDER of virtual/ixp-eth
in place of a hard code module name - PREFERRED_PROVIDER_virtual/ixp-eth must
be specified to make this work, the configuration files have been updated
appropriate. openslug-image now pulls in virtual/ixp-eth, not a specific
provider and uses the PREFERRED_PROVIDER of that module as the RDEPENDS.
nslu2.conf and ucslugc.conf have changes to support configuration of the build
endianness correctly - not fully functional because the flash read code still
needs word swapping on LE.
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/nslu2.conf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 03af44953c..d22c3b5568 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -84,14 +84,16 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # lot of work, so has not yet been done. #NOTE: do *not* change this is a distro.conf, a lot of work is required # to get this fixed. -TARGET_ARCH = "armeb" +NSLU2_ARCH_TYPE = "b" +TARGET_ARCH = "arme${NSLU2_ARCH_TYPE}" +# To change to little endian see distro/ucslugc.conf # The list of valid architectures for thumb or arm on NSLU2. The arm list is # derived from the architecture settings known to gcc, the thumb list is then # derived from that (only the 't' architectures of course). Note: NSLU2 is # assumed to imply 'big-endian', though in fact this need not be the case. -NSLU2_ARM_ARCHITECTURES = "armeb armv2b armv2ab armv3b armv3mb armv4b armv4tb armv5b armv5tb armv5eb armv5teb xscaleb" -NSLU2_THUMB_ARCHITECTURES = "thumbeb thumbv4tb thumbv5tb" +NSLU2_ARM_ARCHITECTURES = "${TARGET_ARCH} armv2${NSLU2_ARCH_TYPE} armv2a${NSLU2_ARCH_TYPE} armv3${NSLU2_ARCH_TYPE} armv3m${NSLU2_ARCH_TYPE} armv4${NSLU2_ARCH_TYPE} armv4t${NSLU2_ARCH_TYPE} armv5${NSLU2_ARCH_TYPE} armv5t${NSLU2_ARCH_TYPE} armv5e${NSLU2_ARCH_TYPE} armv5te${NSLU2_ARCH_TYPE} xscale${NSLU2_ARCH_TYPE}" +NSLU2_THUMB_ARCHITECTURES = "thumbe${NSLU2_ARCH_TYPE} thumbv4t${NSLU2_ARCH_TYPE} thumbv5t${NSLU2_ARCH_TYPE}" # NOTE: this list contains just the things which rootfs_ipk.bbclass does not # add, rootfs_ipk.bbclass evaluates: @@ -115,8 +117,8 @@ IPKG_ARCHS = "${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ # in the old system list). #NOTE: new distros with independent feeds are encouraged to fix this, the # variable NSLU2_PACKAGE_ARCH is provided for this purpose. -PACKAGE_ARCH = "armeb" -NSLU2_PACKAGE_ARCH = "${@['thumbv5tb', 'armv5teb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == '']}" +PACKAGE_ARCH = "${TARGET_ARCH}" +NSLU2_PACKAGE_ARCH = "${@['thumbv5t${NSLU2_ARCH_TYPE}', 'armv5te${NSLU2_ARCH_TYPE}'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == '']}" #------------------------------------------------------------------------------- # Miscellany |