summaryrefslogtreecommitdiff
path: root/conf/machine/include/ixp4xx.inc
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-12-02 16:05:32 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-12-02 16:05:32 +0000
commit282088f1ad999b8427ad8acf43021538388afa60 (patch)
tree3e0564475209464a8c8ea73930e74fdef7d6e1ad /conf/machine/include/ixp4xx.inc
parent540a1c1e47ffaf5fff8788d039ea32c0b1c5e4e8 (diff)
parent76690a09c46fc3214e2f0e3daab4ba1c55f52a0e (diff)
merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
and 'd045039e1aba07c5bb52c9acf9236d6bb0cf1831'
Diffstat (limited to 'conf/machine/include/ixp4xx.inc')
-rw-r--r--conf/machine/include/ixp4xx.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index bc3b49c7c1..743b7ad362 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -3,7 +3,7 @@
#@DESCRIPTION: genric machine configuration for ixp4xx platforms
# Set default for nslu2 - can be overridden for machines with other features.
-MACHINE_FEATURES ?= "kernel26 usbhost ext2"
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
@@ -21,9 +21,12 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
kernel-module-via-velocity \
"
-# Set default for nslu2 - can be overridden for machines with more flash.
+# Set default for 16MB machines - can be overridden for more or less flash.
ROOT_FLASH_SIZE ?= "12"
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
# Set default for nslu2, nas100d, dsmg600
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"