From 926d6a0e6bed96ee45ace0381b18fb62f4ee3adf Mon Sep 17 00:00:00 2001 From: viresh kumar Date: Fri, 20 May 2011 08:34:26 +0100 Subject: [PATCH] --- yaml --- r: 249972 b: refs/heads/master c: 202fae9b082b326ce9771f4daac65d22a7421d09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-spear6xx/Kconfig | 15 ++++++++------- trunk/arch/arm/mach-spear6xx/Kconfig600 | 17 ----------------- 3 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 trunk/arch/arm/mach-spear6xx/Kconfig600 diff --git a/[refs] b/[refs] index fe7bfb796ee3..08a3c5143375 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d354e40b6f6b5bd0ce2e7d039f541f3e88e1278 +refs/heads/master: 202fae9b082b326ce9771f4daac65d22a7421d09 diff --git a/trunk/arch/arm/mach-spear6xx/Kconfig b/trunk/arch/arm/mach-spear6xx/Kconfig index bddba034f862..ff4ae5ba00f1 100644 --- a/trunk/arch/arm/mach-spear6xx/Kconfig +++ b/trunk/arch/arm/mach-spear6xx/Kconfig @@ -4,17 +4,18 @@ if ARCH_SPEAR6XX -choice - prompt "SPEAr6XX Family" - default MACH_SPEAR600 +menu "SPEAr6xx Implementations" +config BOARD_SPEAR600_EVB + bool "SPEAr600 Evaluation Board" + select MACH_SPEAR600 + help + Supports ST SPEAr600 Evaluation Board + +endmenu config MACH_SPEAR600 bool "SPEAr600" help Supports ST SPEAr600 Machine -endchoice - -# Adding SPEAr6XX machine specific configuration files -source "arch/arm/mach-spear6xx/Kconfig600" endif #ARCH_SPEAR6XX diff --git a/trunk/arch/arm/mach-spear6xx/Kconfig600 b/trunk/arch/arm/mach-spear6xx/Kconfig600 deleted file mode 100644 index 9e19f65eb78e..000000000000 --- a/trunk/arch/arm/mach-spear6xx/Kconfig600 +++ /dev/null @@ -1,17 +0,0 @@ -# -# SPEAr600 machine configuration file -# - -if MACH_SPEAR600 - -choice - prompt "SPEAr600 Boards" - default BOARD_SPEAR600_EVB - -config BOARD_SPEAR600_EVB - bool "SPEAr600 Evaluation Board" - help - Supports ST SPEAr600 Evaluation Board -endchoice - -endif #MACH_SPEAR600