From d0a0461f3a8b58803e4637a8991501c9c8565e14 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Feb 2007 07:28:37 +0000
Subject: ixp4xx-kernel: Replaced nslu2 and nas100d cmdline hack patches with
 arm-kernel-shim.

---
 packages/linux/ixp4xx-kernel.inc           | 32 +++++++++++++++++-------------
 packages/linux/ixp4xx-kernel/2.6.19/series |  5 +++--
 packages/linux/ixp4xx-kernel/2.6.20/series |  5 +++--
 packages/linux/ixp4xx-kernel_2.6.19.bb     | 13 ------------
 packages/linux/ixp4xx-kernel_2.6.20.bb     | 13 ------------
 5 files changed, 24 insertions(+), 44 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 3a80703420..d2cb649437 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -26,6 +26,8 @@ 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
@@ -316,18 +318,20 @@ pkg_postrm_kernel () {
 #	copy the zImage and append the appropriate shim
 #  dest:       where to copy to
 #  cmdline:    command line to pass to image
-#  machine-id: decimal machine id to prepend, empty for none
+#  machine:    machine shim to prepend, empty for none
 copy_image() {
-	local setmach
+	local shim
 
-	setmach=""
-	test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
+	shim="/dev/null"
+	test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin"
 
-	rm -f "$1".new
-	devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || {
+	rm -f "$1".new "$1".shim
+	cat $shim ${KERNEL_OUTPUT} > "$1".shim
+	devio '<<'"$1"'.shim' >"$1".new '${FIXUP}' || {
 		echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2
 		return 1
 	}
+	rm -f "$1".shim
 	mv "$1".new "$1"
 }
 
@@ -342,10 +346,10 @@ do_install_append() {
 	install_image '${MACHINE_ARCH}'
 
 	# Add the machine specific images, with appropriate suffixes
-	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}'
+	install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
+	install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
+	install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
+	install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
 
 do_deploy[dirs] = "${S}"
@@ -359,10 +363,10 @@ do_deploy() {
 	deploy_image '${MACHINE_ARCH}'
 
 	# And the machine specific images
-	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}'
+	deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
+	deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
+	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
+	deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
 
 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 ec0e7a81c5..df62b582e7 100644
--- a/packages/linux/ixp4xx-kernel/2.6.19/series
+++ b/packages/linux/ixp4xx-kernel/2.6.19/series
@@ -39,8 +39,9 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-dflt-cmdline.patch
-88-nas100d-dflt-cmdline.patch
-88-nslu2-dflt-cmdline.patch
+# These are now done via arm-kernel-shim
+#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 f362b614b4..d98b4ba58f 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -35,8 +35,9 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-dflt-cmdline.patch
-88-nas100d-dflt-cmdline.patch
-88-nslu2-dflt-cmdline.patch
+# These are now done via arm-kernel-shim
+#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 6841c93d00..915e241f75 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -23,16 +23,3 @@ 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 0cc6b387f7..304866c555 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -23,16 +23,3 @@ 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
-
-}
-- 
cgit v1.2.3


From cb74d297f6f3734b0e844abc75ac0c26d9773a62 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 6 Feb 2007 18:54:24 +0000
Subject: disapproval of revision 'b9a2e7516cc3620c51495eadf5a2d938086881a9'

---
 packages/linux/linux-rp-2.6.18/defconfig-spitz | 1 -
 packages/linux/linux-rp_2.6.18.bb              | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-rp-2.6.18/defconfig-spitz b/packages/linux/linux-rp-2.6.18/defconfig-spitz
index bda9cfbd53..f425956323 100644
--- a/packages/linux/linux-rp-2.6.18/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18/defconfig-spitz
@@ -1563,4 +1563,3 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_SHARPSL_RC=y
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 2f3d63dee2..7150881cad 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r9"
+PR = "r7"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -49,7 +49,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://orinoco-remove-all-which-are-in-hostap-HACK.patch;patch=1;status=unmergable-hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
-           http://oe.reversefold.com/sharpsl-rc/sharpsl-rc-2.6.18-r0.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
-- 
cgit v1.2.3


From b4db3f8d626677cc88e6f4515184787ae56b0f67 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 7 Feb 2007 11:22:07 +0000
Subject: linux-rp_2.6.20.bb : update to latest ASoC release

---
 packages/linux/linux-rp_2.6.20.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index f0f62c36b2..6cd46f9561 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -14,7 +14,7 @@ PR = "r1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.patch;patch=1;status=merged \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch;patch=1;status=merged \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
-- 
cgit v1.2.3


From ff358e366d4954f975cb658c82838b5222843d75 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 7 Feb 2007 12:07:44 +0000
Subject: linux-handhelds-2.6 cvs: Bump to the latest release, 2.6.19-hh10.

---
 packages/linux/linux-handhelds-2.6_cvs.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index e004199865..bdb091ba9b 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "19"
-HHV     = "7"
+HHV     = "10"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
-- 
cgit v1.2.3


From a20d60d85c060d3ef32b91f74381d98549d7f689 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 7 Feb 2007 12:37:00 +0000
Subject: linux-handhelds-2.6 2.6.19-hh9: Add new release. * Changes since
 -hh8: 1. Tree cleanup, get rid of unused arch/arm/plat-ipaq/, etc. 2. Added
 PXA serial hooks setters. 3. Revamped asus620 port. 4. Cleanup of rx3000
 port. 5. Update of h3800 port. 6. Updated mach-s3c2410. 7. Updates for
 htcmagician port.

---
 packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb

(limited to 'packages/linux')

diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb
new file mode 100644
index 0000000000..ec5844bfb5
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
-- 
cgit v1.2.3


From cf80525ad857b78bdb783dfab4f46a8b03702600 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 7 Feb 2007 12:38:20 +0000
Subject: linux-handhelds-2.6 2.6.19-hh10: Add new release. * Changes since
 -hh9: 1. Added aximx50 port. 2. IR and battery classdev support for h4000. 3.
 Battery classdev support for htcapache. 4. Generic TS drivers for ads7846 &
 ad7877 chips (used for h4000 & htcapache). 5. Sound support for rx3000. 6.
 asic3_base s3cxxx clocks compatibility issue fixed.

---
 packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb

(limited to 'packages/linux')

diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb
new file mode 100644
index 0000000000..ec5844bfb5
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
-- 
cgit v1.2.3


From e9bc2c07ac4628c516e2d6098f7181fb7ed2aa8d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 7 Feb 2007 12:39:08 +0000
Subject: linux-handhelds-2.6 2.6.19-hh7: Drop old version.

---
 packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb

(limited to 'packages/linux')

diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb
deleted file mode 100644
index b34d4630a0..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
-- 
cgit v1.2.3


From 830c651033cefc4f0188b3dcc061852a0f5183cd Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 8 Feb 2007 15:26:30 +0000
Subject: x86 machine: Add some basic features, update kernel configuration to
 add support for more x86 based devices.

---
 packages/linux/linux-x86-2.6.17.9/defconfig | 118 +++++++++++++++++++---------
 1 file changed, 83 insertions(+), 35 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-x86-2.6.17.9/defconfig b/packages/linux/linux-x86-2.6.17.9/defconfig
index 3ee6a43392..82f7049e49 100644
--- a/packages/linux/linux-x86-2.6.17.9/defconfig
+++ b/packages/linux/linux-x86-2.6.17.9/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17.9
-# Mon Sep 18 23:30:42 2006
+# Wed Jan 24 17:29:53 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -421,11 +421,14 @@ CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_UB=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -682,44 +685,51 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRA=m
+CONFIG_SMC9194=m
 # CONFIG_NET_VENDOR_RACAL is not set
 
 #
 # Tulip family network device support
 #
 # CONFIG_NET_TULIP is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
 # CONFIG_NET_ISA is not set
 CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+# CONFIG_AMD8111E_NAPI is not set
+CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+CONFIG_B44=m
+CONFIG_FORCEDETH=m
+CONFIG_CS89x0=m
+CONFIG_DGRS=m
+CONFIG_EEPRO100=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
 CONFIG_8139TOO=y
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_NET_POCKET is not set
 
 #
@@ -765,7 +775,15 @@ CONFIG_S2IO=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
@@ -859,7 +877,7 @@ CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTY_COUNT=128
 CONFIG_PRINTER=y
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
@@ -979,7 +997,7 @@ CONFIG_FB_FIRMWARE_EDID=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=y
+# CONFIG_FB_VGA16 is not set
 CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
@@ -1186,7 +1204,9 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
 
@@ -1503,19 +1523,47 @@ CONFIG_DOUBLEFAULT=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
 #
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
 
 #
 # Library routines
 #
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
-- 
cgit v1.2.3


From d41c3f9d14e92d9339dabb60a838c2f276828d01 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Feb 2007 10:49:33 +0000
Subject: slugos: backed out of using arm-kernel-shim instead of the cmdline
 hacks, cause arm-kernel-shim doesn't work on LE

---
 packages/linux/ixp4xx-kernel.inc           | 32 +++++++++++++-----------------
 packages/linux/ixp4xx-kernel/2.6.19/series |  5 ++---
 packages/linux/ixp4xx-kernel/2.6.20/series |  5 ++---
 packages/linux/ixp4xx-kernel_2.6.19.bb     | 13 ++++++++++++
 packages/linux/ixp4xx-kernel_2.6.20.bb     | 13 ++++++++++++
 5 files changed, 44 insertions(+), 24 deletions(-)

(limited to 'packages/linux')

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..6841c93d00 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -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..0cc6b387f7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -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
+
+}
-- 
cgit v1.2.3


From c3e8ef6c31102a4488b3ed4dcf147a6c72ea2cba Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Feb 2007 13:38:54 +0000
Subject: ixp4xx-kernel: Reinstated the cmdline byteswap patch - required for
 LE.

---
 packages/linux/ixp4xx-kernel_2.6.19.bb | 2 +-
 packages/linux/ixp4xx-kernel_2.6.20.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 6841c93d00..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
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 0cc6b387f7..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
-- 
cgit v1.2.3


From df9a71e4e4b9ae35e7fb97a5591780dfb1c44045 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Feb 2007 15:32:56 +0000
Subject: ixp4xx-kernel: Enabled 11-mtdpart-redboot-config-byteswap.patch for
 2.6.20 kernel

---
 packages/linux/ixp4xx-kernel/2.6.20/series | 1 +
 packages/linux/ixp4xx-kernel_2.6.20.bb     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index f362b614b4..71c17940fc 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -12,6 +12,7 @@ squashfs/squashfs-Makefile.patch
 07-remove-avila-ixdp425-setup.patch
 08-avila-loft-setup.patch
 09-avila-setup-pata.patch
+11-mtdpart-redboot-config-byteswap.patch
 30-ixp4xx-npe-driver-0.3.1.patch
 37-ixp4xx-net-driver-improve-mac-handling.patch
 39-ixp4xx-net-driver-mtd-load-fw.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 3af3556845..2d057799ac 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
-- 
cgit v1.2.3


From 8930d02f19c5d65f9d26b7c81b95ba18ba1decea Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 8 Feb 2007 12:59:45 +0000
Subject: ixp4xx-kernel: Fix redboot breakage in 2.6.20 which was preventing
 the SlugOS/LE boot.

---
 packages/linux/ixp4xx-kernel/2.6.20/series | 2 +-
 packages/linux/ixp4xx-kernel_2.6.20.bb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index 71c17940fc..64339d47b0 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -9,10 +9,10 @@ squashfs/squashfs-force-O2.patch
 squashfs/squashfs-lzma.patch
 squashfs/squashfs-Kconfig.patch
 squashfs/squashfs-Makefile.patch
+00-fix-redboot-bad-code.patch
 07-remove-avila-ixdp425-setup.patch
 08-avila-loft-setup.patch
 09-avila-setup-pata.patch
-11-mtdpart-redboot-config-byteswap.patch
 30-ixp4xx-npe-driver-0.3.1.patch
 37-ixp4xx-net-driver-improve-mac-handling.patch
 39-ixp4xx-net-driver-mtd-load-fw.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 2d057799ac..6fd1330cbd 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 = "683"
+IXP4XX_KERNEL_SVN_REV = "686"
 #
 # The directory containing the patches to be applied is
 # specified below
-- 
cgit v1.2.3


From abd27ceb3d513b802fa1c678d49cf61413b32eb0 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Feb 2007 05:48:34 +0000
Subject: ixp4xx-kernel: Enabled EABI compatibilty mode

---
 packages/linux/ixp4xx-kernel/2.6.19/defconfig | 3 ++-
 packages/linux/ixp4xx-kernel/2.6.20/defconfig | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel/2.6.19/defconfig b/packages/linux/ixp4xx-kernel/2.6.19/defconfig
index 00750f843a..56eaea7a27 100644
--- a/packages/linux/ixp4xx-kernel/2.6.19/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.19/defconfig
@@ -189,7 +189,8 @@ CONFIG_PCI=y
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
index a7cdacc960..93380dd3b9 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
@@ -196,7 +196,8 @@ CONFIG_PCI=y
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
-- 
cgit v1.2.3


From 93421f8375dee985c4aab983d172e90684465c5a Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Feb 2007 05:50:33 +0000
Subject: ixp4xx-kernel: Modified to use arm-kernel-shim instead of hard-coded
 devio incantations

---
 packages/linux/ixp4xx-kernel/2.6.19/series | 2 --
 packages/linux/ixp4xx-kernel/2.6.20/series | 2 --
 2 files changed, 4 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel/2.6.19/series b/packages/linux/ixp4xx-kernel/2.6.19/series
index ec0e7a81c5..e7ef3083dd 100644
--- a/packages/linux/ixp4xx-kernel/2.6.19/series
+++ b/packages/linux/ixp4xx-kernel/2.6.19/series
@@ -39,8 +39,6 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-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 64339d47b0..7100d2f806 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -36,8 +36,6 @@ squashfs/squashfs-Makefile.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
 88-dsmg600-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
-- 
cgit v1.2.3


From 78a8f7905503336c0bcdb8def6f190b009d9c9e4 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Feb 2007 05:51:00 +0000
Subject: ixp4xx-kernel: Modified to use arm-kernel-shim instead of hard-coded
 devio incantations

---
 packages/linux/ixp4xx-kernel.inc       | 43 +++++++++++++++++-----------------
 packages/linux/ixp4xx-kernel_2.6.19.bb | 15 +-----------
 packages/linux/ixp4xx-kernel_2.6.20.bb | 15 +-----------
 3 files changed, 23 insertions(+), 50 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 3a80703420..d848427921 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -26,6 +26,8 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Intel IXP4xx device"
 LICENSE = "GPL"
 
+DEPENDS = "arm-kernel-shim devio-native"
+
 # 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
@@ -298,12 +300,8 @@ pkg_postrm_kernel-image-fsg3 () {
 	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
 }
 
-#FIXUP: the correct instructions to copy the kernel prepended with the le fixup
-#FIXME: do a fixup for BE too...
-FIXUP_armeb = "cp$"
-FIXUP_arm   = "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4"
-
-DEPENDS += "devio-native"
+BYTESWAP_armeb = "cp$"
+BYTESWAP_arm   = "xp $,4"
 
 # We need the alternatives to happen in the kernel-image packages, not in
 # the kernel package, because only the images know the name of the kernel.
@@ -312,22 +310,23 @@ pkg_postinst_kernel () {
 pkg_postrm_kernel () {
 }
 
-# copy_image <dest> <cmdline> <machine-id>
+# copy_image <dest> <machine>
 #	copy the zImage and append the appropriate shim
 #  dest:       where to copy to
-#  cmdline:    command line to pass to image
-#  machine-id: decimal machine id to prepend, empty for none
+#  machine:    machine shim to prepend, empty for none
 copy_image() {
-	local setmach
+	local shim
 
-	setmach=""
-	test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
+	shim="/dev/null"
+	test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin"
 
-	rm -f "$1".new
-	devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || {
+	rm -f "$1".new "$1".shimmed
+	cat $shim ${KERNEL_OUTPUT} > "$1".shimmed
+	devio '<<'"$1"'.shimmed' >"$1".new '${BYTESWAP}' || {
 		echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2
 		return 1
 	}
+	rm -f "$1".shimmed
 	mv "$1".new "$1"
 }
 
@@ -342,10 +341,10 @@ do_install_append() {
 	install_image '${MACHINE_ARCH}'
 
 	# Add the machine specific images, with appropriate suffixes
-	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}'
+	install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
+	install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
+	install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
+	install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
 
 do_deploy[dirs] = "${S}"
@@ -359,10 +358,10 @@ do_deploy() {
 	deploy_image '${MACHINE_ARCH}'
 
 	# And the machine specific images
-	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}'
+	deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
+	deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
+	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
+	deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
 
 addtask deploy before do_build after do_compile
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index f10af6c050..eba9d6a404 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 = "683"
+IXP4XX_KERNEL_SVN_REV = "693"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,16 +23,3 @@ 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 6fd1330cbd..2e768b133b 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 = "686"
+IXP4XX_KERNEL_SVN_REV = "693"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,16 +23,3 @@ 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
-
-}
-- 
cgit v1.2.3