aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-30 18:39:03 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-30 18:39:03 +0000
commitc1e444ff72f363ff5f7e0cd7ecf0ae1a4af702dd (patch)
treea9501f9ac3e6da4fd97844839994374a54558145
parent040bd64849da37e6c35bab3726019c059c96893e (diff)
downloadbuildroot-c1e444ff72f363ff5f7e0cd7ecf0ae1a4af702dd.tar.gz
buildroot-c1e444ff72f363ff5f7e0cd7ecf0ae1a4af702dd.tar.bz2
Remove AVR32 patches from kernel-headers directory and put them in
"target/device/Atmel/arch-avre/kernel-headers-2.6.28.2" Make sure BR2_KERNEL_HEADERS_PATCH_DIR is enabled for 2.6.28 Set KERNEL_HEADERS_PATCH_DIR="target/device/Atmel/arch-avre/kernel-headers-2.6.28.2" for Atmel AVR32 targets and "valka"
-rw-r--r--target/device/Atmel/Makefile.in4
-rw-r--r--target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-100-avr32.patch (renamed from toolchain/kernel-headers/linux-2.6.28.2-100-avr32.patch)0
-rw-r--r--target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch (renamed from toolchain/kernel-headers/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch)0
-rw-r--r--target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch (renamed from toolchain/kernel-headers/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch)0
-rw-r--r--target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch (renamed from toolchain/kernel-headers/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch)0
-rw-r--r--target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch (renamed from toolchain/kernel-headers/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch)0
-rw-r--r--target/device/valka/Makefile.in1
-rw-r--r--toolchain/kernel-headers/Config.in2
8 files changed, 6 insertions, 1 deletions
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index fd53e6ee96..70d380586a 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -13,6 +13,10 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton
TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt
TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz
+ifeq ($(BR2_avr32),y)
+KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2
+endif
+
ifneq ($(COPYTO),)
TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_COPYTO)))
else
diff --git a/toolchain/kernel-headers/linux-2.6.28.2-100-avr32.patch b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-100-avr32.patch
index 6512f77ef5..6512f77ef5 100644
--- a/toolchain/kernel-headers/linux-2.6.28.2-100-avr32.patch
+++ b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-100-avr32.patch
diff --git a/toolchain/kernel-headers/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch
index 6cc4b679ae..6cc4b679ae 100644
--- a/toolchain/kernel-headers/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch
+++ b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch
diff --git a/toolchain/kernel-headers/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch
index 2163c92c77..2163c92c77 100644
--- a/toolchain/kernel-headers/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch
+++ b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch
diff --git a/toolchain/kernel-headers/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch
index ac990f9cdc..ac990f9cdc 100644
--- a/toolchain/kernel-headers/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch
+++ b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch
diff --git a/toolchain/kernel-headers/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch
index 05522da5bd..05522da5bd 100644
--- a/toolchain/kernel-headers/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch
+++ b/target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch
diff --git a/target/device/valka/Makefile.in b/target/device/valka/Makefile.in
index 56ae1d2855..01422465ef 100644
--- a/target/device/valka/Makefile.in
+++ b/target/device/valka/Makefile.in
@@ -3,6 +3,7 @@ VALKA_PATH= target/device/valka
TARGET_SKELETON=$(VALKA_PATH)/target_skeleton
TARGET_DEVICE_TABLE=$(VALKA_PATH)/device_table.txt
+KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2
valka_status:
@echo "***************************************************************"
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 2633e9a3a2..2a8a50c06c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -98,7 +98,7 @@ config BR2_KERNEL_HEADERS_RT
config BR2_KERNEL_HEADERS_PATCH_DIR
bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)"
- depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1 || BR2_KERNEL_HEADERS_2_6_22_10
+ depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1 || BR2_KERNEL_HEADERS_2_6_22_10 || BR2_KERNEL_HEADERS_2_6_28
help
Apply additional kernel patches defined by KERNEL_HEADERS_PATCH_DIR
in your board directory.