aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-16 01:34:11 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-16 01:34:11 +0000
commit18c9101466353560610d720e168bc7488613a91b (patch)
tree6a6bde835f14644c03b22e65726b763a0fbdaed0 /conf/machine
parent979da4dafc99a9e841ea59ef5a08025ae2ff7d75 (diff)
downloadopenembedded-18c9101466353560610d720e168bc7488613a91b.tar.gz
ixp4xx-kernel: unbreak nas100d build in 2.6.15
- temporarily put the CMDLINE_ROOT back in to the conf file so that nas100d kernels keep on working
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/nas100d.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index 29a3b04f5f..41836c3272 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -3,3 +3,6 @@
#@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"