aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-16 10:13:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-16 10:13:55 +0000
commit2b9be5e324beee66740c311c67c660f544b8497d (patch)
tree6439ae8d48b84142b7d33a0290fe74a305185327 /conf
parentf2cfb2628d56ad31d4fe97a08b1012c252109b90 (diff)
downloadopenembedded-2b9be5e324beee66740c311c67c660f544b8497d.tar.gz
ixp4xx-kernel: fix boot setup parameters in 2.6.15
- there is now a default machine-specific command line and an override for the memory config to provide a useable default per-machine.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/nas100d.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index 41836c3272..29a3b04f5f 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -3,6 +3,3 @@
#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
include conf/machine/include/ixp4xx.conf
-
-# TEMPORARY: fixup the command line for nas100d builds
-CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"