merge of '1ced81b8e37ff2e92b41ce7ba7c6d5482c409182'

     and 'b5e0b951b33635fff4584dd883c6750daba2ece3'

5 files changed, 46 insertions, 26 deletions

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index d2cb649437..3a80703420 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -26,8 +26,6 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Intel IXP4xx device"
 LICENSE = "GPL"
 
-DEPENDS += "arm-kernel-shim"
-
 # Linux kernel source has the general form linux-X.Y.Z-patchP,
 # X.Y is the major version number, Z (which may have multiple
 # parts) is a sub-version and 'patch' is something like 'mm' or
@@ -318,20 +316,18 @@ pkg_postrm_kernel () {
 #	copy the zImage and append the appropriate shim
 #  dest:       where to copy to
 #  cmdline:    command line to pass to image
-#  machine:    machine shim to prepend, empty for none
+#  machine-id: decimal machine id to prepend, empty for none
 copy_image() {
-	local shim
+	local setmach
 
-	shim="/dev/null"
-	test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin"
+	setmach=""
+	test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
 
-	rm -f "$1".new "$1".shim
-	cat $shim ${KERNEL_OUTPUT} > "$1".shim
-	devio '<<'"$1"'.shim' >"$1".new '${FIXUP}' || {
+	rm -f "$1".new
+	devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || {
 		echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2
 		return 1
 	}
-	rm -f "$1".shim
 	mv "$1".new "$1"
 }
 
@@ -346,10 +342,10 @@ do_install_append() {
 	install_image '${MACHINE_ARCH}'
 
 	# Add the machine specific images, with appropriate suffixes
-	install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
-	install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
-	install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
-	install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+	install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+	install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+	install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+	install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
 }
 
 do_deploy[dirs] = "${S}"
@@ -363,10 +359,10 @@ do_deploy() {
 	deploy_image '${MACHINE_ARCH}'
 
 	# And the machine specific images
-	deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
-	deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
-	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
-	deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+	deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+	deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+	deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
 }
 
 addtask deploy before do_build after do_compile
diff --git a/packages/linux/ixp4xx-kernel/2.6.19/series b/packages/linux/ixp4xx-kernel/2.6.19/series
index df62b582e7..ec0e7a81c5 100644
--- a/packages/linux/ixp4xx-kernel/2.6.19/series
+++ b/packages/linux/ixp4xx-kernel/2.6.19/series
@@ -39,9 +39,8 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-dflt-cmdline.patch
-# These are now done via arm-kernel-shim
-#88-nas100d-dflt-cmdline.patch
-#88-nslu2-dflt-cmdline.patch
+88-nas100d-dflt-cmdline.patch
+88-nslu2-dflt-cmdline.patch
 95-pata-ixp4xx.patch
 96-fsg3-support.patch
 97-avila-setup-pata.patch
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index d98b4ba58f..f362b614b4 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -35,9 +35,8 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-dflt-cmdline.patch
-# These are now done via arm-kernel-shim
-#88-nas100d-dflt-cmdline.patch
-#88-nslu2-dflt-cmdline.patch
+88-nas100d-dflt-cmdline.patch
+88-nslu2-dflt-cmdline.patch
 96-fsg3-support.patch
 98-sata_via-pata-support-upstream.patch
 99-avila-mtd-microcode.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 915e241f75..f10af6c050 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "682"
+IXP4XX_KERNEL_SVN_REV = "683"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,3 +23,16 @@ require ixp4xx-kernel-svnpatch.inc
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+#	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+#	fi
+
+}
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 304866c555..3af3556845 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "682"
+IXP4XX_KERNEL_SVN_REV = "683"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,3 +23,16 @@ require ixp4xx-kernel-svnpatch.inc
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+	fi
+
+}