From 3dadda089d00c62b4499bf542f238063a7f63b3a Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 2 Dec 2007 22:52:07 +0000
Subject: ixp4xx.inc: Required networking modules are now compiled into the
 kernel.

---
 conf/machine/include/ixp4xx.inc | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'conf')

diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 743b7ad362..6e7d303586 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,24 +2,15 @@
 #@NAME: ixp4xx
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
-# Set default for nslu2 - can be overridden for machines with other features.
+# Set default for common ixp4xx-based machines
 MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
 
+# Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
 PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
 
-# Add modules required for basic networking support
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= " \
-	ixp4xx-npe \
-	"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
-	kernel-module-mii \
-	kernel-module-ixp4xx-mac \
-	kernel-module-ixp4xx-qmgr \
-	kernel-module-via-velocity \
-	"
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
 
 # Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
@@ -27,7 +18,7 @@ ROOT_FLASH_SIZE ?= "12"
 # Allow for rootfs loaded direct from internal hard disk
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-# Set default for nslu2, nas100d, dsmg600
+# Set default for common ixp4xx-based machines
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-xscale.inc
-- 
cgit v1.2.3


From d1e8b3dd5b1af4c2be01833553fbc8c85b2d968b Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 3 Dec 2007 06:45:21 +0000
Subject: mpc8313e-rdb: add JFFS2 arguments for rootfs on NAND flash

---
 conf/machine/mpc8313e-rdb.conf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'conf')

diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3c47b53b56..81c3e29e91 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 PREFERRED_VERSION_u-boot = "1.3.0"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
 #don't try to access tty1
 USE_VT = "0"
 
-- 
cgit v1.2.3