summaryrefslogtreecommitdiff
path: root/conf/machine/nas100d.conf
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2006-01-14 06:22:41 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-14 06:22:41 +0000
commitcda660808fbc381cc11fb9ceb3cd0cde13c239d7 (patch)
treefa0d752a206a0c5db0649f0160f0b54e9c3f15a2 /conf/machine/nas100d.conf
parent23d4b048f42531eee488f8ddf510371c9eaa0e0c (diff)
parenta4f0089c5bf7d37257b244fb08de5e756498c6cd (diff)
merge of 198b28bba87e8c42ab6041406faa358334417c02
and 3862f1af15047c5bdc27ca357df15bdd3b9d80c3
Diffstat (limited to 'conf/machine/nas100d.conf')
-rw-r--r--conf/machine/nas100d.conf7
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index f99b601628..a628841878 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -5,10 +5,7 @@
include conf/machine/include/ixp4xx.conf
# The correct settings for the NAS100D board:
-SERIAL_CONSOLE = "115200 ttyS0"
-KERNEL_CONSOLE = "ttyS0,115200n8"
-USE_VT = "0"
CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"
-IXP4XX_SUFFIX = "${MACHINE}${BYTE_SEX_CHAR}"
+# This following means the kernel will only run on a NAS100D board:
+IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}"
IXP4XX_MACHID = "865"
-IXP4XX_LEFIXUP = "1"