summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-16 01:32:22 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-16 01:32:22 +0000
commit979da4dafc99a9e841ea59ef5a08025ae2ff7d75 (patch)
treebb02289cc47c0f12c351b9fe01113d3e26386c41 /conf/machine
parent4dc537b8e9653b8929ea3806dfb6f60839171547 (diff)
ixp4xx-kernel: create generic and machine specific images/packages in 2.6.15
- the generic ixp4xx-kernel package now creates the same generic kernel regardless of how MACHINE is set, it then appends shims to the kernel to obtain machine specific kernels and produces packages of the results. Still TBD is the command line fixup. The generic command line is the nslu2 one, this is a temporary hack to keep the NSLU2 build working.
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/ixp4xx.conf4
-rw-r--r--conf/machine/nas100d.conf6
-rw-r--r--conf/machine/nslu2.conf6
3 files changed, 0 insertions, 16 deletions
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 19a2ee0141..7239d59076 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -172,7 +172,3 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154"
SERIAL_CONSOLE = "115200 ttyS0"
KERNEL_CONSOLE = "ttyS0,115200n8"
USE_VT = "0"
-
-# Always add the LEFIXUP - if desired this can be removed for a specific board
-# if that board has an LE boot loader and therefore does not require it.
-IXP4XX_LEFIXUP = "1"
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index a628841878..29a3b04f5f 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -3,9 +3,3 @@
#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
include conf/machine/include/ixp4xx.conf
-
-# The correct settings for the NAS100D board:
-CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"
-# This following means the kernel will only run on a NAS100D board:
-IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}"
-IXP4XX_MACHID = "865"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 96b9e37ce0..b00f8a520c 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -3,9 +3,3 @@
#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
include conf/machine/include/ixp4xx.conf
-
-# The correct settings for the NSLU2 board:
-CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc"
-IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}"
-# This following means the kernel will only run on a NSLU2:
-IXP4XX_MACHID = "597"