summaryrefslogtreecommitdiff
path: root/target/device/KwikByte
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2008-07-04 10:36:55 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2008-07-04 10:36:55 +0000
commite8106da816af429373c26ba84d81ca4ed276cb89 (patch)
tree980de52176063fd5d7a1b3db60bc89d7a7f64d33 /target/device/KwikByte
parent283e81ab9ebde9204509050bed4d5603fb15764d (diff)
Fix Config conflict caused by duplicate definition in KB9202 BSP
Diffstat (limited to 'target/device/KwikByte')
-rw-r--r--target/device/KwikByte/Config.in34
1 files changed, 17 insertions, 17 deletions
diff --git a/target/device/KwikByte/Config.in b/target/device/KwikByte/Config.in
index aa5f78f83..60151633f 100644
--- a/target/device/KwikByte/Config.in
+++ b/target/device/KwikByte/Config.in
@@ -27,37 +27,37 @@ choice
prompt "Add AT91 specific patches"
depends on BR2_KERNEL_ARCH_PATCH_ENABLED
depends on 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
+ default BR2_ARCH_AT91_2_6_24_KB if BR2_LINUX_2_6_24
+# default BR2_ARCH_AT91_2_6_24_KB if BR2_LINUX_2_6_23
+# default BR2_ARCH_AT91_2_6_22_1_KB if BR2_LINUX_2_6_22_1
+# default BR2_ARCH_AT91_2_6_21_5_KB if BR2_LINUX_2_6_21 || BR2_LINUX_2_6_21_5
+# default BR2_ARCH_AT91_2_6_21_1_KB if BR2_LINUX_2_6_21_1
+# default BR2_ARCH_AT91_2_6_20_4_KB if BR2_LINUX_2_6_20 || BR2_LINUX_2_6_20_4
+# default BR2_ARCH_AT91_2_6_24_KB
help
Select a patch to add to the Linux kernel
-config BR2_ARCH_AT91_2_6_24
+config BR2_ARCH_AT91_2_6_24_KB
bool "2.6.24"
help
Apply the at91 linux-2.6.24 patches"
-#config BR2_ARCH_AT91_2_6_22_1
+#config BR2_ARCH_AT91_2_6_22_1_KB
# bool "2.6.22.1"
# help
# Apply the at91 linux-2.6.22.1 patches"
#
-#config BR2_ARCH_AT91_2_6_21_5
+#config BR2_ARCH_AT91_2_6_21_5_KB
# bool "2.6.21.5"
# help
# Apply the at91 linux-2.6.21.5 patches"
#
-#config BR2_ARCH_AT91_2_6_21_1
+#config BR2_ARCH_AT91_2_6_21_1_KB
# bool "2.6.21.1"
# help
# Apply the at91 linux-2.6.21.1 patches"
#
-#config BR2_ARCH_AT91_2_6_20_4
+#config BR2_ARCH_AT91_2_6_20_4_KB
# bool "2.6.20.4"
# help
# Apply the at91 linux-2.6.20.4 patches"
@@ -68,11 +68,11 @@ config BR2_KERNEL_ARCH_PATCH_VERSION
string
depends on BR2_KERNEL_ARCH_PATCH_ENABLED
depends on 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
+ default "2.6.24" if BR2_ARCH_AT91_2_6_24_KB
+# default "2.6.22.1" if BR2_ARCH_AT91_2_6_22_1_KB
+# default "2.6.21.5" if BR2_ARCH_AT91_2_6_21_5_KB
+# default "2.6.21.1" if BR2_ARCH_AT91_2_6_21_1_KB
+# default "2.6.20.4" if BR2_ARCH_AT91_2_6_20_4_KB
config BR2_KERNEL_ARCH_PATCH_DIR
string