From c1e444ff72f363ff5f7e0cd7ecf0ae1a4af702dd Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 30 Jan 2009 18:39:03 +0000 Subject: [PATCH] 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" --- target/device/Atmel/Makefile.in | 4 ++++ .../kernel-headers-2.6.28.2}/linux-2.6.28.2-100-avr32.patch | 0 .../linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch | 0 ...vr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch | 0 .../linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch | 0 ...2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch | 0 target/device/valka/Makefile.in | 1 + toolchain/kernel-headers/Config.in | 2 +- 8 files changed, 6 insertions(+), 1 deletion(-) rename {toolchain/kernel-headers => target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2}/linux-2.6.28.2-100-avr32.patch (100%) rename {toolchain/kernel-headers => target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2}/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch (100%) rename {toolchain/kernel-headers => 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 (100%) rename {toolchain/kernel-headers => target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2}/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch (100%) rename {toolchain/kernel-headers => 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 (100%) 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 similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.2-100-avr32.patch rename to 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 similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.2-201-avr32-atmel_mpopfb-disable-debug.patch rename to 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 similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.2-202-avr32-atmel_mpopfb-add-signal-to-disable-line-caching.patch rename to 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 similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.2-203-avr32-fix-arch-header-byteorder.patch rename to 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 similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.2-204-avr32-ap700x-fix-det_pin-for-nand-flash.patch rename to 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. -- 2.30.2