summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/slugos.inc1
-rw-r--r--conf/machine/include/ixp4xx.inc9
2 files changed, 9 insertions, 1 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 6acb72c345..0d7c4773b7 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -64,6 +64,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}
# to enable/disable debugging in the distro. Here noirqdebug is used to
# remove the messages about unhandled interrupts - people debugging interrupt
# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_DEBUG = "noirqdebug"
# EXTRA PACKAGES
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 81e2152bdc..04b6542470 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,10 +2,17 @@
#@NAME: ixp4xx
#@DESCRIPTION: genric machine configuration for ixp4xx platforms
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+# Set default for nslu2 - can be overridden for machines with other features.
+MACHINE_FEATURES ?= "kernel26 usbhost ext2"
+# Set defaults for nslu2 - can be overridden for machines with other requirements.
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+# Set default for nslu2 - can be overridden for machines with more flash.
ROOT_FLASH_SIZE ?= "12"
+# Set default for nslu2, nas100d, dsmg600
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"