bump up a few version numbers. kill dead 2.6.19 option.

accomodate powerpc64

diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 808433a7ada0177dd7df3af75313e76339ed560d..1d27021a696a411fe936156f37edb8039d2f4084 100644 (file)
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -40,10 +40,6 @@ choice
                depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
                bool "Linux 2.6.12 kernel headers"
 
-       config BR2_KERNEL_HEADERS_2_6_19_2
-               depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
-               bool "Linux 2.6.19.2 kernel headers"
-
        config BR2_KERNEL_HEADERS_2_6_20
                depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
                bool "Linux 2.6.20 kernel headers"
@@ -91,9 +87,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
        default "2.6.9"     if BR2_KERNEL_HEADERS_2_6_9
        default "2.6.11"    if BR2_KERNEL_HEADERS_2_6_11
        default "2.6.12"    if BR2_KERNEL_HEADERS_2_6_12
-       default "2.6.19.2"  if BR2_KERNEL_HEADERS_2_6_19_2
-       default "2.6.20.4"  if BR2_KERNEL_HEADERS_2_6_20
-       default "2.6.21.5"  if BR2_KERNEL_HEADERS_2_6_21
-       default "2.6.22.1"  if BR2_KERNEL_HEADERS_2_6_22
+       default "2.6.20.19"  if BR2_KERNEL_HEADERS_2_6_20
+       default "2.6.21.7"  if BR2_KERNEL_HEADERS_2_6_21
+       default "2.6.22.6"  if BR2_KERNEL_HEADERS_2_6_22
 
 endmenu

diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile
index 67c1114f03b5925a9b4b85f190ca5a7bb00fec3c..be2e493c8fb3a161342b30a582a53b8e54514ca9 100644 (file)
--- a/toolchain/kernel-headers/kernel-headers-new.makefile
+++ b/toolchain/kernel-headers/kernel-headers-new.makefile
@@ -3,11 +3,11 @@
 # full kernel tarballs >= 2.6.19.1
 #
 #############################################################
-ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.1")
+ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.22.6")
 VERSION:=2
 PATCHLEVEL:=6
 SUBLEVEL:=22
-EXTRAVERSION:=.1
+EXTRAVERSION:=.6
 LOCALVERSION:=
 LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/
@@ -18,11 +18,11 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 LINUX_HEADERS_IS_KERNEL=y
 endif
 
-ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.5")
+ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.21.7")
 VERSION:=2
 PATCHLEVEL:=6
 SUBLEVEL:=21
-EXTRAVERSION:=.5
+EXTRAVERSION:=.7
 LOCALVERSION:=
 LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/
@@ -33,11 +33,11 @@ LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 LINUX_HEADERS_IS_KERNEL=y
 endif
 
-ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.4")
+ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.20.19")
 VERSION:=2
 PATCHLEVEL:=6
 SUBLEVEL:=20
-EXTRAVERSION:=.4
+EXTRAVERSION:=.19
 LOCALVERSION:=
 LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/

diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index b4e0c38ac1bbf80764910cb3fd2123ae4a52d449..b6fe3e56cf0a0ea0125e1eb26b9ec0632b5f05ca 100644 (file)
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -16,6 +16,7 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \
        -e s/i.86/i386/ -e s/sun4u/sparc64/ \
        -e s/arm.*/arm/ -e s/sa110/arm/ \
        -e s/s390x/s390/ -e s/parisc64/parisc/ \
+       -e s/powerpc64/powerpc/ \
        -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
        -e s/sh2.*/sh/ -e s/sh3.*/sh/ -e s/sh4.*/sh/")