From 8a97c4ea197818d511aa021663bf0f162b6206e9 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 29 Jan 2009 22:33:23 +0000 Subject: [PATCH] Cleanup of AT91 patches --- .../Atmel/arch-arm/Config.in.linux.patches | 53 ++++++++++-------- .../linux-2.6.20.4-atmel.patch | 0 .../linux-2.6.21.5-at91-1-update.patch | 0 .../linux-2.6.21.5-at91.patch | 0 .../.empty | 0 .../linux-2.6.27-at91.patch.gz | Bin 6 files changed, 30 insertions(+), 23 deletions(-) rename target/device/Atmel/arch-arm/{kernel-patches-2.6.20.4 => kernel-patches-2.6.20}/linux-2.6.20.4-atmel.patch (100%) rename target/device/Atmel/arch-arm/{kernel-patches-2.6.21.5 => kernel-patches-2.6.21}/linux-2.6.21.5-at91-1-update.patch (100%) rename target/device/Atmel/arch-arm/{kernel-patches-2.6.21.5 => kernel-patches-2.6.21}/linux-2.6.21.5-at91.patch (100%) rename target/device/Atmel/arch-arm/{kernel-patches-2.6.22.1 => kernel-patches-2.6.22}/.empty (100%) rename target/device/Atmel/arch-arm/{kernel-patches-2.6.27.7 => kernel-patches-2.6.27}/linux-2.6.27-at91.patch.gz (100%) diff --git a/target/device/Atmel/arch-arm/Config.in.linux.patches b/target/device/Atmel/arch-arm/Config.in.linux.patches index db52a04ca6..4ea1157cde 100644 --- a/target/device/Atmel/arch-arm/Config.in.linux.patches +++ b/target/device/Atmel/arch-arm/Config.in.linux.patches @@ -3,27 +3,27 @@ choice depends on BR2_KERNEL_ARCH_PATCH_ENABLED depends on BR2_TARGET_ATMEL && BR2_arm default BR2_ARCH_AT91_2_6_28 if BR2_LINUX_2_6_28 - default BR2_ARCH_AT91_2_6_27_7 if BR2_LINUX_2_6_27 + default BR2_ARCH_AT91_2_6_27 if BR2_LINUX_2_6_27 default BR2_ARCH_AT91_2_6_26 if BR2_LINUX_2_6_26 default BR2_ARCH_AT91_2_6_25 if BR2_LINUX_2_6_25 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_20_4 if BR2_LINUX_2_6_20 || BR2_LINUX_2_6_20_4 - default BR2_ARCH_AT91_2_6_24 + default BR2_ARCH_AT91_2_6_23 if BR2_LINUX_2_6_23 + default BR2_ARCH_AT91_2_6_22 if BR2_LINUX_2_6_22 + default BR2_ARCH_AT91_2_6_21 if BR2_LINUX_2_6_21 + default BR2_ARCH_AT91_2_6_20 if BR2_LINUX_2_6_20 + default BR2_ARCH_AT91_2_6_28 help Select a patch to add to the Linux kernel config BR2_ARCH_AT91_2_6_28 bool "2.6.28" help - Apply the at91 linux-2.6.28-rc6 patches + Apply the at91 linux-2.6.28 patches -config BR2_ARCH_AT91_2_6_27_7 - bool "2.6.27.7" +config BR2_ARCH_AT91_2_6_27 + bool "2.6.27" help - Apply the at91 linux-2.6.27.7 patches + Apply the at91 linux-2.6.27 patches config BR2_ARCH_AT91_2_6_26 bool "2.6.26" @@ -40,20 +40,25 @@ config BR2_ARCH_AT91_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" +config BR2_ARCH_AT91_2_6_23 + bool "2.6.23" help - Apply the at91 linux-2.6.22.1 patches + Apply the at91 linux-2.6.23 patches -config BR2_ARCH_AT91_2_6_21_5 - bool "2.6.21.5" +config BR2_ARCH_AT91_2_6_22 + bool "2.6.22" help - Apply the at91 linux-2.6.21.5 patches + Apply the at91 linux-2.6.22 patches -config BR2_ARCH_AT91_2_6_20_4 - bool "2.6.20.4" +config BR2_ARCH_AT91_2_6_21 + bool "2.6.21" help - Apply the at91 linux-2.6.20.4 patches + Apply the at91 linux-2.6.21 patches + +config BR2_ARCH_AT91_2_6_20 + bool "2.6.20" + help + Apply the at91 linux-2.6.20 patches endchoice @@ -62,14 +67,16 @@ config BR2_KERNEL_ARCH_PATCH_VERSION depends on BR2_KERNEL_ARCH_PATCH_ENABLED depends on BR2_TARGET_ATMEL && BR2_arm default "2.6.28" if BR2_ARCH_AT91_2_6_28 - default "2.6.27.7" if BR2_ARCH_AT91_2_6_27_7 + default "2.6.27" if BR2_ARCH_AT91_2_6_27 default "2.6.26" if BR2_ARCH_AT91_2_6_26 default "2.6.25" if BR2_ARCH_AT91_2_6_25 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.20.4" if BR2_ARCH_AT91_2_6_20_4 + default "2.6.24" if BR2_ARCH_AT91_2_6_23 + default "2.6.22" if BR2_ARCH_AT91_2_6_22 + default "2.6.21" if BR2_ARCH_AT91_2_6_21 + default "2.6.20" if BR2_ARCH_AT91_2_6_20 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/kernel-patches-2.6.20.4/linux-2.6.20.4-atmel.patch b/target/device/Atmel/arch-arm/kernel-patches-2.6.20/linux-2.6.20.4-atmel.patch similarity index 100% rename from target/device/Atmel/arch-arm/kernel-patches-2.6.20.4/linux-2.6.20.4-atmel.patch rename to target/device/Atmel/arch-arm/kernel-patches-2.6.20/linux-2.6.20.4-atmel.patch diff --git a/target/device/Atmel/arch-arm/kernel-patches-2.6.21.5/linux-2.6.21.5-at91-1-update.patch b/target/device/Atmel/arch-arm/kernel-patches-2.6.21/linux-2.6.21.5-at91-1-update.patch similarity index 100% rename from target/device/Atmel/arch-arm/kernel-patches-2.6.21.5/linux-2.6.21.5-at91-1-update.patch rename to target/device/Atmel/arch-arm/kernel-patches-2.6.21/linux-2.6.21.5-at91-1-update.patch diff --git a/target/device/Atmel/arch-arm/kernel-patches-2.6.21.5/linux-2.6.21.5-at91.patch b/target/device/Atmel/arch-arm/kernel-patches-2.6.21/linux-2.6.21.5-at91.patch similarity index 100% rename from target/device/Atmel/arch-arm/kernel-patches-2.6.21.5/linux-2.6.21.5-at91.patch rename to target/device/Atmel/arch-arm/kernel-patches-2.6.21/linux-2.6.21.5-at91.patch diff --git a/target/device/Atmel/arch-arm/kernel-patches-2.6.22.1/.empty b/target/device/Atmel/arch-arm/kernel-patches-2.6.22/.empty similarity index 100% rename from target/device/Atmel/arch-arm/kernel-patches-2.6.22.1/.empty rename to target/device/Atmel/arch-arm/kernel-patches-2.6.22/.empty diff --git a/target/device/Atmel/arch-arm/kernel-patches-2.6.27.7/linux-2.6.27-at91.patch.gz b/target/device/Atmel/arch-arm/kernel-patches-2.6.27/linux-2.6.27-at91.patch.gz similarity index 100% rename from target/device/Atmel/arch-arm/kernel-patches-2.6.27.7/linux-2.6.27-at91.patch.gz rename to target/device/Atmel/arch-arm/kernel-patches-2.6.27/linux-2.6.27-at91.patch.gz -- 2.30.2