added support for kernel 2.6.24

diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index cb956bdfc478fd2242d2ebfa35ed11174d961e50..4d28ebe75ab3a6b8275de4f25ce2fe4fb16927e0 100644 (file)
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -40,7 +40,7 @@ config BR2_KERNEL_PATCH_LEVEL
 
 config BR2_KERNEL_CURRENT_VERSION
        string
-       default "2.6.23.1"
+       default "2.6.24"
 
 config BR2_KERNEL_NEXT_VERSION
        string
@@ -51,6 +51,7 @@ config BR2_KERNEL_NEXT_VERSION
 
 config BR2_KERNEL_THIS_VERSION
        string
+       default "2.6.24" if BR2_LINUX_2_6_24
        default "2.6.23" if BR2_LINUX_2_6_23
        default "2.6.22" if BR2_LINUX_2_6_22
        default "2.6.21" if BR2_LINUX_2_6_21
@@ -58,15 +59,15 @@ config BR2_KERNEL_THIS_VERSION
 
 config LINUX26_LATEST_RC_VERSION
        string
-       default "2.6.23" if BR2_KERNEL_ADD_LATEST_RC_PATCH
+       default "2.6.24" if BR2_KERNEL_ADD_LATEST_RC_PATCH
 
 config LINUX26_LATEST_MM_VERSION
        string
-       default "2.6.23-mm1" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+       default "2.6.24-mm1" if BR2_KERNEL_ADD_LATEST_MM_PATCH
 
 config LINUX26_LATEST_GIT_VERSION
        string
-       default "2.6.23-git3" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+       default "2.6.24-git3" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
 
 config BR2_KERNEL_SITE
        string
@@ -124,9 +125,15 @@ choice
          Select the specific Linux version you want to use
 
 config BR2_LINUX_2_6_STABLE
-       bool "The latest stable Linux kernel (2.6.23)"
+       bool "The latest stable Linux kernel (2.6.24)"
        help
-         Linux 2.6.23
+         Linux 2.6.24
+
+config BR2_LINUX_2_6_24
+       bool "Linux 2.6.24"
+       select BR2_KERNEL_BASE
+       help
+         Linux 2.6.24
 
 config BR2_LINUX_2_6_23
        bool "Linux 2.6.23"

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 285b9bd71f323df01e4e57119215984d187612dd..ad5938aca85e4a510dd812b8b30e340cb97061f8 100644 (file)
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -91,7 +91,7 @@ else
 ifeq ($(BR2_i386),y)
 LINUX26_KCONFIG:=$(BOARD_PATH)/linux26.config
 else
-LINUX26_KCONFIG:=$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config
+LINUX26_KCONFIG:=$(BR2_BOARD_PATH)/linux-$(LINUX26_VERSION).config
 endif
 endif
 endif
@@ -139,15 +139,29 @@ endif
 # --------------
 # BZIMAGE
 ifeq ($(LINUX26_FORMAT),bzImage)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
-KERNEL_EXT:=.bz
+LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage
+KERNEL_EXT:=
 endif
 
 endif
 
 # -----------------------------------------------------------------------------
 # File name for the Linux kernel binary
+ifeq ($(LINUX26_FORMAT),uImage)
+LINUX26_KERNEL_NAME:="uImage"
+endif
+ifeq ($(LINUX26_FORMAT),bzImage)
+LINUX26_KERNEL_NAME:="bzImage"
+endif
+ifeq ($(LINUX26_FORMAT),vmlinux)
+LINUX26_KERNEL_NAME:="vmlinux"
+endif
+ifeq ($(LINUX26_FORMAT),zImage)
+LINUX26_KERNEL_NAME:="zImage"
+endif
+ifeq ($(LINUX26_FORMAT),custom)
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
+endif
 
 ifndef LINUX26_KERNEL
 LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
@@ -260,9 +274,7 @@ ifeq ($(BR2_PACKAGE_OPENSWAN),y)
                linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
 endif
 ifneq ($(LINUX26_PATCH_DIR),)
-       if [ -d $(LINUX26_PATCH_DIR) ] ; then \
-               toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) linux-$(LINUX26_VERSION)-\*.patch ; \
-       fi
+               toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) linux-$(LINUX26_VERSION)-\*.patch ; 
 endif
        touch $@