From c659b13a2fc07188f716327364f6080e9486f3de Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sat, 29 Mar 2008 23:09:46 +0000 Subject: Remove duplicate AVR32 patches, and add support for ARCH and conditional AVR32 patches --- .../device/Atmel/arch-arm/Config.in.linux.patches | 58 ++++++++++++++++++++++ target/device/Atmel/arch-arm/Makefile.in | 12 +++++ target/device/Atmel/arch-arm/arch-arm.mk | 4 ++ 3 files changed, 74 insertions(+) create mode 100644 target/device/Atmel/arch-arm/Config.in.linux.patches create mode 100644 target/device/Atmel/arch-arm/Makefile.in create mode 100644 target/device/Atmel/arch-arm/arch-arm.mk (limited to 'target/device/Atmel/arch-arm') diff --git a/target/device/Atmel/arch-arm/Config.in.linux.patches b/target/device/Atmel/arch-arm/Config.in.linux.patches new file mode 100644 index 000000000..48f754539 --- /dev/null +++ b/target/device/Atmel/arch-arm/Config.in.linux.patches @@ -0,0 +1,58 @@ +choice + prompt "Add AT91 specific patches" + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_TARGET_ATMEL && BR2_arm + default BR2_ARCH_AT91_2_6_24 if BR2_LINUX_2_6_24 + default BR2_ARCH_AT91_2_6_24 if BR2_LINUX_2_6_23 + default BR2_ARCH_AT91_2_6_22_1 if BR2_LINUX_2_6_22_1 + default BR2_ARCH_AT91_2_6_21_5 if BR2_LINUX_2_6_21 || BR2_LINUX_2_6_21_5 + default BR2_ARCH_AT91_2_6_21_1 if BR2_LINUX_2_6_21_1 + default BR2_ARCH_AT91_2_6_20_4 if BR2_LINUX_2_6_20 || BR2_LINUX_2_6_20_4 + default BR2_ARCH_AT91_2_6_24 + help + Select a patch to add to the Linux kernel + +config BR2_ARCH_AT91_2_6_24 + bool "2.6.24" + help + Apply the at91 linux-2.6.24 patches" + +config BR2_ARCH_AT91_2_6_22_1 + bool "2.6.22.1" + help + Apply the at91 linux-2.6.22.1 patches" + +config BR2_ARCH_AT91_2_6_21_5 + bool "2.6.21.5" + help + Apply the at91 linux-2.6.21.5 patches" + +config BR2_ARCH_AT91_2_6_21_1 + bool "2.6.21.1" + help + Apply the at91 linux-2.6.21.1 patches" + +config BR2_ARCH_AT91_2_6_20_4 + bool "2.6.20.4" + help + Apply the at91 linux-2.6.20.4 patches" + +endchoice + +config BR2_KERNEL_ARCH_PATCH_VERSION + string + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_TARGET_ATMEL && BR2_arm + default "2.6.24" if BR2_ARCH_AT91_2_6_24 + default "2.6.22.1" if BR2_ARCH_AT91_2_6_22_1 + default "2.6.21.5" if BR2_ARCH_AT91_2_6_21_5 + default "2.6.21.1" if BR2_ARCH_AT91_2_6_21_1 + default "2.6.20.4" if BR2_ARCH_AT91_2_6_20_4 + +config BR2_KERNEL_ARCH_PATCH_DIR + string + default "target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)" + + + + diff --git a/target/device/Atmel/arch-arm/Makefile.in b/target/device/Atmel/arch-arm/Makefile.in new file mode 100644 index 000000000..1db111e9b --- /dev/null +++ b/target/device/Atmel/arch-arm/Makefile.in @@ -0,0 +1,12 @@ +ifeq ($(BR2_avr32),y) +KERNEL_COND_PATCHES:= +ifeq ($(BR2_LINUX_AVR32_AC97_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.ac97 +endif +ifeq ($(BR2_LINUX_AVR32_ISI_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.isi +endif +ifeq ($(BR2_LINUX_AVR32_PSIF_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.psif +endif +endif diff --git a/target/device/Atmel/arch-arm/arch-arm.mk b/target/device/Atmel/arch-arm/arch-arm.mk new file mode 100644 index 000000000..49af52510 --- /dev/null +++ b/target/device/Atmel/arch-arm/arch-arm.mk @@ -0,0 +1,4 @@ +ifeq ($(BR2_arm),y) + +endif + -- cgit v1.2.3