From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 14 Mar 2012 15:49:46 +0000 (+0100)
Subject: kernel: update omap kernel to 2.6.40.24 aka 3.0.24.
X-Git-Tag: v2.13-beta1~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8160aeb7f9bea0da57adeabc3b86cf89844ee186;p=ipfire-2.x.git

kernel: update omap kernel to 2.6.40.24 aka 3.0.24.
---

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap
index 8470ca98ec..10b72ddae0 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-omap
+++ b/config/kernel/kernel.config.armv5tel-ipfire-omap
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.40.23-ipfire-omap Kernel Configuration
+# Linux/arm 2.6.40.24 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -439,7 +439,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 # CONFIG_HIGHMEM is not set
-# CONFIG_HIGHPTE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
@@ -450,7 +449,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_COMPACTION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
-CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -1485,7 +1483,10 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX_MENU=m
-# CONFIG_WL12XX is not set
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_WL12XX_SDIO=m
+# CONFIG_WL12XX_SDIO_TEST is not set
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -3540,7 +3541,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap
new file mode 100644
index 0000000000..15bcb6c29d
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/linux-omap
@@ -0,0 +1,5 @@
+boot/uInit-ipfire-omap
+boot/uImage-ipfire-omap
+boot/System.map-2.6.40.24-ipfire-omap
+boot/config-2.6.40.24-ipfire-omap
+lib/modules/2.6.40.24-ipfire-omap
diff --git a/lfs/linux3 b/lfs/linux3
index 344c8aedf9..b72b78cdda 100644
--- a/lfs/linux3
+++ b/lfs/linux3
@@ -24,14 +24,14 @@
 
 include Config
 
-PATCHLEVEL = .23
-VER           = 2.6.40.23
+PATCHLEVEL = .24
+VER           = 2.6.40.24
 
-XVERS         = 3.0.23
+XVERS         = 3.0.24
 XVERSION      = 2
 XPATCHLEVEL   = 6
 XSUBLEVEL     = 40
-XEXTRAVERSION = .23
+XEXTRAVERSION = .24
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(XVERS).tar.bz2
@@ -88,7 +88,7 @@ patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
 xen-patches-2.6.32-2f.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5				= 4905e6a50e4074a1529a14f792636d40
+$(DL_FILE)_MD5				= 3bebfdf614f3139202c5497b40953920
 netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
@@ -189,8 +189,6 @@ ifeq "$(MACHINE_TYPE)" "arm"
 endif
 
 ifeq "$(KCFG)" "-omap"
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/panda-usb-power.patch
-#
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-wlan-fix.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-dvi720p.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.40-pandaboard-i2c-fix.patch