ARC: [plat_arcfpga]->[plat_sim]

* Remove remanants of legacy ARC FPGA platforms (AA4, ML509...)
* Only nsim simulation platform is left, rename platform accordingly
* AA4 DT stuff is compatible with nsim for ARC700 so rename it too

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 8e8de4c3442ea638899bd68f983fc7e2a9f57eda..824065a94b37b66fbff9d6a6bc21945bb78c6745 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -81,7 +81,7 @@ menu "ARC Architecture Configuration"
 
 menu "ARC Platform/SoC/Board"
 
-source "arch/arc/plat-arcfpga/Kconfig"
+source "arch/arc/plat-sim/Kconfig"
 source "arch/arc/plat-tb10x/Kconfig"
 #New platform adds here
 

diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 87e0e5b36ce13b970f32f78f33748cad32bdfd7e..435b693637f6a93cf5b1eb836f2440ebba7f923c 100644 (file)
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -81,8 +81,8 @@ core-y                += arch/arc/
 # w/o this dtb won't embed into kernel binary
 core-y         += arch/arc/boot/dts/
 
-core-$(CONFIG_ARC_PLAT_FPGA_LEGACY)    += arch/arc/plat-arcfpga/
-core-$(CONFIG_ARC_PLAT_TB10X)          += arch/arc/plat-tb10x/
+core-$(CONFIG_ARC_PLAT_SIM)    += arch/arc/plat-sim/
+core-$(CONFIG_ARC_PLAT_TB10X)  += arch/arc/plat-tb10x/
 
 drivers-$(CONFIG_OPROFILE)     += arch/arc/oprofile/
 

diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile
index faf240e29ec2cebc1b6f7762b0c0556de37f1a8f..b0e3f19bbd07e32cb57c91f803302603ebe429fc 100644 (file)
--- a/arch/arc/boot/dts/Makefile
+++ b/arch/arc/boot/dts/Makefile
@@ -1,5 +1,5 @@
 # Built-in dtb
-builtindtb-y           := angel4
+builtindtb-y           := nsim_700
 
 ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"")
        builtindtb-y    := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME))

diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/nsim_700.dts
similarity index 97%
rename from arch/arc/boot/dts/angel4.dts
rename to arch/arc/boot/dts/nsim_700.dts
index 3b076fbd83661c1c1889ce178465fb881d24f111..105a0017023f27fc810c29336fa999dcc6456a24 100644 (file)
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/nsim_700.dts
@@ -10,7 +10,7 @@
 /include/ "skeleton.dtsi"
 
 / {
-       compatible = "snps,arc-angel4";
+       compatible = "snps,nsim";
        clock-frequency = <80000000>;   /* 80 MHZ */
        #address-cells = <1>;
        #size-cells = <1>;

diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig
index e6aa1ed09c6d7ff822967cc339bd315972005484..138f9d8879570a8b329415d9238c710fa6e5b032 100644 (file)
--- a/arch/arc/configs/nsim_700_defconfig
+++ b/arch/arc/configs/nsim_700_defconfig
@@ -22,8 +22,8 @@ CONFIG_MODULES=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARC_PLAT_FPGA_LEGACY=y
-CONFIG_ARC_BUILTIN_DTB_NAME="angel4"
+CONFIG_ARC_PLAT_SIM=y
+CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700"
 CONFIG_PREEMPT=y
 # CONFIG_COMPACTION is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set

diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 1aad2365bef89c9872d5fd87cbe9dc2fd34a21e5..31e1d95764ff91dc10fe80d936a5613e6f713cc4 100644 (file)
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -23,7 +23,7 @@ CONFIG_MODULES=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARC_PLAT_FPGA_LEGACY=y
+CONFIG_ARC_PLAT_SIM=y
 CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci"
 # CONFIG_COMPACTION is not set
 CONFIG_NET=y

diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-sim/Kconfig
similarity index 60%
rename from arch/arc/plat-arcfpga/Kconfig
rename to arch/arc/plat-sim/Kconfig
index 043bac36f34f814b24d585c7cebd4d7dc55265fd..18e39fcc488adb84ef3f8d716e0009b7204464cd 100644 (file)
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-sim/Kconfig
@@ -6,11 +6,9 @@
 # published by the Free Software Foundation.
 #
 
-menuconfig ARC_PLAT_FPGA_LEGACY
-       bool "\"Legacy\" ARC FPGA dev Boards"
+menuconfig ARC_PLAT_SIM
+       bool "ARC nSIM based simulation virtual platforms"
        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.
-         - ARCAngel4
-         - ML509
+         Support for nSIM based ARC simulation platforms
+         This includes the standalone nSIM (uart only) vs. System C OSCI VP

diff --git a/arch/arc/plat-arcfpga/Makefile b/arch/arc/plat-sim/Makefile
similarity index 100%
rename from arch/arc/plat-arcfpga/Makefile
rename to arch/arc/plat-sim/Makefile

diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-sim/platform.c
similarity index 78%
rename from arch/arc/plat-arcfpga/platform.c
rename to arch/arc/plat-sim/platform.c
index c79a05c47ebdb7a70de609ffd79b8ff49c99aeb8..114fdc30941c43af948e89b0e05fac5aacc060ac 100644 (file)
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-sim/platform.c
@@ -1,5 +1,5 @@
 /*
- * ARC FPGA Platform support code
+ * ARC simulation Platform support code
  *
  * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com)
  *
@@ -19,16 +19,6 @@
  * callback set, by matching the DT compatible name.
  */
 
-static const char *legacy_fpga_compat[] __initconst = {
-       "snps,arc-angel4",
-       "snps,arc-ml509",
-       NULL,
-};
-
-MACHINE_START(LEGACY_FPGA, "legacy_fpga")
-       .dt_compat      = legacy_fpga_compat,
-MACHINE_END
-
 static const char *simulation_compat[] __initconst = {
        "snps,nsim",
        "snps,nsimosci",