diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-16 09:53:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-16 09:53:12 +0000 |
| commit | f2cfb2628d56ad31d4fe97a08b1012c252109b90 (patch) | |
| tree | 6a7f8709276df3782879b3b0f02ed6a1699c4882 /conf/machine | |
| parent | 6d6f449a77592d066856c916b660cd52c54f5147 (diff) | |
| parent | f99c03dff8ea114ab0bfe297a391a0fa90aa9922 (diff) | |
merge of 5ea9ec229c4d406638d5639fade5d53798bc6556
and bc3350438c52d7c9d7d4f8eb5b38a213796269cb
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/ixp4xx.conf | 4 | ||||
| -rw-r--r-- | conf/machine/nas100d.conf | 5 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 6 |
3 files changed, 1 insertions, 14 deletions
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 19a2ee0141..7239d59076 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -172,7 +172,3 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154" SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" - -# Always add the LEFIXUP - if desired this can be removed for a specific board -# if that board has an LE boot loader and therefore does not require it. -IXP4XX_LEFIXUP = "1" diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index a628841878..41836c3272 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -4,8 +4,5 @@ include conf/machine/include/ixp4xx.conf -# The correct settings for the NAS100D board: +# TEMPORARY: fixup the command line for nas100d builds CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -# This following means the kernel will only run on a NAS100D board: -IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}" -IXP4XX_MACHID = "865" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 96b9e37ce0..b00f8a520c 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -3,9 +3,3 @@ #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product include conf/machine/include/ixp4xx.conf - -# The correct settings for the NSLU2 board: -CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc" -IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}" -# This following means the kernel will only run on a NSLU2: -IXP4XX_MACHID = "597" |