Merge tag 'arc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / arch / arc / plat-arcfpga / Kconfig

diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig
index b9f34cf55acf47c653d6d6b7e5c09adde2d9d324..217593a7075134f72d3aa2dafcbc4e585ec5cf05 100644 (file)
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-arcfpga/Kconfig
@@ -8,7 +8,7 @@
 
 menuconfig ARC_PLAT_FPGA_LEGACY
        bool "\"Legacy\" ARC FPGA dev Boards"
 
 menuconfig ARC_PLAT_FPGA_LEGACY
        bool "\"Legacy\" ARC FPGA dev Boards"

-       select ISS_SMP_EXTN if SMP
+       select ARC_HAS_COH_CACHES if SMP

        help
          Support for ARC development boards, provided by Synopsys.
          These are based on FPGA or ISS. e.g.
        help
          Support for ARC development boards, provided by Synopsys.
          These are based on FPGA or ISS. e.g.


@@ -18,17 +18,6 @@ menuconfig ARC_PLAT_FPGA_LEGACY
 
 if ARC_PLAT_FPGA_LEGACY
 
 
 if ARC_PLAT_FPGA_LEGACY
 

-config ARC_BOARD_ANGEL4
-       bool "ARC Angel4"
-       default y
-       help
-         ARC Angel4 FPGA Ref Platform (Xilinx Virtex Based)
-
-config ARC_BOARD_ML509
-       bool "ML509"
-       help
-         ARC ML509 FPGA Ref Platform (Xilinx Virtex-5 Based)
-

 config ISS_SMP_EXTN
        bool "ARC SMP Extensions (ISS Models only)"
        default n
 config ISS_SMP_EXTN
        bool "ARC SMP Extensions (ISS Models only)"
        default n