From e7a9b4d52c146c9367c402a1086938616dba5aeb Mon Sep 17 00:00:00 2001
From: Vineet Gupta <vgupta@synopsys.com>
Date: Tue, 22 Jan 2013 16:51:50 +0530
Subject: [PATCH] --- yaml --- r: 360175 b: refs/heads/master c:
 93ad700de2abc111c50bb961c150a9968d5b3982 h: refs/heads/master i:   360173:
 c0bde72729b78d5523102bff244f662f8b20dcd6   360171:
 17fcaf881e67a7c4bda877d88ad64e439b2e1a5e   360167:
 e6ba6d882cf326bb87897d25f1fe2929530dee98   360159:
 b98323ae0636f4058bed50f42b7b68b34bbc5efe v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arc/Kconfig              | 21 +++------------------
 trunk/arch/arc/plat-arcfpga/Kconfig | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 1650e255d7a0..04dfe85571e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53d98958f585517f362733a1dbdb69e2dc5153a3
+refs/heads/master: 93ad700de2abc111c50bb961c150a9968d5b3982
diff --git a/trunk/arch/arc/Kconfig b/trunk/arch/arc/Kconfig
index 3fdd6a53e5d6..ac173687c056 100644
--- a/trunk/arch/arc/Kconfig
+++ b/trunk/arch/arc/Kconfig
@@ -82,18 +82,11 @@ source "kernel/Kconfig.freezer"
 
 menu "ARC Architecture Configuration"
 
-menu "ARC Platform/SoC"
-
-config ARC_PLAT_FPGA_LEGACY
-	bool "\"Legacy\" ARC FPGA dev platform"
-	help
-	  Support for ARC development platforms, provided by Synopsys.
-	  These are based on FPGA or ISS. e.g.
-	  - ARCAngel4
-	  - ML509
-	  - MetaWare ISS
+menu "ARC Platform/SoC/Board"
 
+source "arch/arc/plat-arcfpga/Kconfig"
 #New platform adds here
+
 endmenu
 
 menu "ARC CPU Configuration"
@@ -338,12 +331,6 @@ config ARC_HAS_RTSC
 
 endmenu   # "ARC CPU Configuration"
 
-menu "Platform Board Configuration"
-
-source "arch/arc/plat-arcfpga/Kconfig"
-
-#New platform adds here
-
 config LINUX_LINK_BASE
 	hex "Linux Link Address"
 	default "0x80000000"
@@ -357,8 +344,6 @@ config LINUX_LINK_BASE
 	  Linux needs to be scooted a bit.
 	  If you don't know what the above means, leave this setting alone.
 
-endmenu # "Platform Board Configuration"
-
 config ARC_CURR_IN_REG
 	bool "Dedicate Register r25 for current_task pointer"
 	default y
diff --git a/trunk/arch/arc/plat-arcfpga/Kconfig b/trunk/arch/arc/plat-arcfpga/Kconfig
index ae2c017151fa..b41e786cdbc0 100644
--- a/trunk/arch/arc/plat-arcfpga/Kconfig
+++ b/trunk/arch/arc/plat-arcfpga/Kconfig
@@ -6,13 +6,21 @@
 # published by the Free Software Foundation.
 #
 
-if ARC_PLAT_FPGA_LEGACY
+menuconfig ARC_PLAT_FPGA_LEGACY
+	bool "\"Legacy\" ARC FPGA dev Boards"
+	select ISS_SMP_EXTN if SMP
+	help
+	  Support for ARC development boards, provided by Synopsys.
+	  These are based on FPGA or ISS. e.g.
+	  - ARCAngel4
+	  - ML509
+	  - MetaWare ISS
 
-menu "FPGA Board"
+if ARC_PLAT_FPGA_LEGACY
 
 config ARC_BOARD_ANGEL4
 	bool "ARC Angel4"
-	select ISS_SMP_EXTN if SMP
+	default y
 	help
 	  ARC Angel4 FPGA Ref Platform (Xilinx Virtex Based)
 
@@ -34,8 +42,6 @@ config ISS_SMP_EXTN
 	  -XTL (To enable CPU start/stop/set-PC for another CPU)
 	  It doesn't provide coherent Caches and/or Atomic Ops (LLOCK/SCOND)
 
-endmenu
-
 config ARC_SERIAL_BAUD
 	int "UART Baud rate"
 	default "115200"