From 5a5f4943ac05ee83b83fba32724e0ec90aa5de0f Mon Sep 17 00:00:00 2001
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Date: Mon, 20 Nov 2006 19:58:41 +0000
Subject: mx31ads: Fixed kernel oops and upgraded to 2.6.19rc6

---
 packages/linux/mx31ads-kernel/imx31ads_defconfig | 10 ++--
 packages/linux/mx31ads-kernel_2.6.19rc5.bb       | 60 ------------------------
 packages/linux/mx31ads-kernel_2.6.19rc6.bb       | 59 +++++++++++++++++++++++
 3 files changed, 64 insertions(+), 65 deletions(-)
 delete mode 100644 packages/linux/mx31ads-kernel_2.6.19rc5.bb
 create mode 100644 packages/linux/mx31ads-kernel_2.6.19rc6.bb

diff --git a/packages/linux/mx31ads-kernel/imx31ads_defconfig b/packages/linux/mx31ads-kernel/imx31ads_defconfig
index 3836ed03ea..83cd5f933d 100644
--- a/packages/linux/mx31ads-kernel/imx31ads_defconfig
+++ b/packages/linux/mx31ads-kernel/imx31ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc5
-# Mon Nov 13 12:42:45 2006
+# Linux kernel version: 2.6.19-rc6
+# Mon Nov 20 18:11:58 2006
 #
 CONFIG_ARM=y
 # CONFIG_GENERIC_TIME is not set
@@ -235,9 +235,9 @@ CONFIG_MXC_IPU_PF=y
 # MXC SPI support
 #
 CONFIG_MXC_SPI=y
-# CONFIG_MXC_SPI_SELECT1 is not set
+CONFIG_MXC_SPI_SELECT1=y
 CONFIG_MXC_SPI_SELECT2=y
-# CONFIG_MXC_SPI_SELECT3 is not set
+CONFIG_MXC_SPI_SELECT3=y
 
 #
 # MXC SSI support
@@ -308,7 +308,7 @@ CONFIG_PM_LEGACY=y
 # Dynamic Power Management
 #
 CONFIG_DPM=y
-# CONFIG_DPM_STATS is not set
+CONFIG_DPM_STATS=y
 CONFIG_DPM_PROCFS=y
 
 #
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc5.bb b/packages/linux/mx31ads-kernel_2.6.19rc5.bb
deleted file mode 100644
index 0957fe71fe..0000000000
--- a/packages/linux/mx31ads-kernel_2.6.19rc5.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for the MX31ADS"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-    http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc5.bz2;patch=1 \
-    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc5-lg3.patch.bz2;patch=1 \
-    file://imx31ads_defconfig"
-
-S = "${WORKDIR}/linux-2.6.18"
-
-COMPATIBLE_HOST = 'arm.*-linux'
-COMPATIBLE_MACHINE = "mx31ads"
-
-inherit kernel
-inherit package
-
-ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.19-rc5"
-
-
-#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
-#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/imx31ads_defconfig ${S}/defconfig
-
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
-                echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else
-                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
-                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
-        fi
-
-        sed     -e '/CONFIG_AEABI/d' \
-                -e '/CONFIG_OABI_COMPAT=/d' \
-                '${S}/defconfig' >>'${S}/.config'
-
-
-#	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-
-	yes '' | oe_runmake oldconfig
-
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
new file mode 100644
index 0000000000..d164dfd810
--- /dev/null
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -0,0 +1,59 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the MX31ADS"
+LICENSE = "GPL"
+PR = "r3"
+
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
+    http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \
+    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc6-lg1.patch.bz2;patch=1 \
+    file://imx31ads_defconfig"
+
+S = "${WORKDIR}/linux-2.6.18"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+COMPATIBLE_MACHINE = "mx31ads"
+
+inherit kernel
+inherit package
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+RPROVIDES_kernel-image += "hostap-modules"
+
+# to get module dependencies working
+KERNEL_RELEASE = "2.6.19-rc6"
+
+
+#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/imx31ads_defconfig ${S}/defconfig
+
+        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+        else
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi
+
+        sed     -e '/CONFIG_AEABI/d' \
+                -e '/CONFIG_OABI_COMPAT=/d' \
+                '${S}/defconfig' >>'${S}/.config'
+
+
+#	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+
+	yes '' | oe_runmake oldconfig
+
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
-- 
cgit v1.2.3