Add updated gcc-4.2.2 prepatched toolchain for AVR32

diff --git a/target/device/Config.in.toolchain b/target/device/Config.in.toolchain
index 2528ed88cb01a55b71412013e0ba5ff516546242..172222d742550e4f8858e61891d00ea087ae7c54 100644 (file)
--- a/target/device/Config.in.toolchain
+++ b/target/device/Config.in.toolchain
@@ -51,6 +51,23 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
          It is generated from buildroot-avr32-v2.2.0-rc4
          in http://www.atmel.no/buildroot
 
+config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
+       bool "Use prepatched source for AVR32 gcc-4.2.2 toolchain"
+       depends on BR2_avr32
+       select BR2_EXT_GCC_VERSION_4_2_2
+       select BR2_EXT_BINUTILS_VERSION_2_18
+       select BR2_EXT_UCLIBC_VERSION_0_9_29
+       select BR2_TOOLCHAIN_ATMEL_AVR32
+       select BR2_GCC_SUPPORTS_SYSROOT
+       help
+         The gcc-4.2.2 toolchain for the AVR32
+         * gcc-4.2.2
+         * binutils-2.18
+         * uClibc-0.9.29
+         * gdb-6.7.1
+         It is generated from buildroot-avr32-v2.3.0-rc1
+         in http://www.atmel.no/buildroot
+
 config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
        bool "Use prepatched source for AVR32 gcc-4.2.3 toolchain"
        depends on BR2_avr32
@@ -94,6 +111,7 @@ config BR2_VENDOR_BINUTILS_RELEASE
        default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
        default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
+       default "-1.0.1" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
 
 config BR2_VENDOR_GCC_RELEASE
@@ -101,6 +119,7 @@ config BR2_VENDOR_GCC_RELEASE
        default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
        default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
+       default "-1.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
 
 config BR2_VENDOR_UCLIBC_RELEASE
@@ -108,6 +127,7 @@ config BR2_VENDOR_UCLIBC_RELEASE
        default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
        default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
+       default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
        default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
 
 config BR2_VENDOR_GDB_RELEASE
@@ -174,6 +194,10 @@ config     BR2_EXT_BINUTILS_VERSION_2_17
        bool
        default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
 
+config BR2_EXT_BINUTILS_VERSION_2_18
+       bool
+       default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+
 config BR2_EXT_UCLIBC_VERSION_0_9_28_3
        bool
        default !BR2_TOOLCHAIN_EXTERNAL_SOURCE

diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile
index dce9ee8a5c39627aa4bbd4ee21f5fe6512a6e12c..94c0570836db44a4659df1811afc3d272df4a00f 100644 (file)
--- a/toolchain/kernel-headers/kernel-headers-new.makefile
+++ b/toolchain/kernel-headers/kernel-headers-new.makefile
@@ -77,6 +77,8 @@ ifeq ($(BR2_PACKAGE_OPENSWAN),y)
        toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) package/openswan \
                linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 endif
+       toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/arch/$(ARCH)/linux-$(LINUX_HEADERS_VERSION) \
+               linux-\*.patch{,.gz,.bz2}
        touch $@
 
 $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched