diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2015-02-20 13:42:18 (GMT) |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-19 12:39:26 (GMT) |
commit | fd1557923b2e45a7ff4664bd88311d8239d69ca9 (patch) | |
tree | 54d973bebc5d94105e6f85b57ba52cdbb92abe97 /arch/arc | |
parent | 6623146cb71eb0eb582943bb35f85a90b6195fc1 (diff) | |
download | linux-fd1557923b2e45a7ff4664bd88311d8239d69ca9.tar.xz |
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>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/Kconfig | 2 | ||||
-rw-r--r-- | arch/arc/Makefile | 4 | ||||
-rw-r--r-- | arch/arc/boot/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/nsim_700.dts (renamed from arch/arc/boot/dts/angel4.dts) | 2 | ||||
-rw-r--r-- | arch/arc/configs/nsim_700_defconfig | 4 | ||||
-rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 2 | ||||
-rw-r--r-- | arch/arc/plat-sim/Kconfig (renamed from arch/arc/plat-arcfpga/Kconfig) | 10 | ||||
-rw-r--r-- | arch/arc/plat-sim/Makefile (renamed from arch/arc/plat-arcfpga/Makefile) | 0 | ||||
-rw-r--r-- | arch/arc/plat-sim/platform.c (renamed from arch/arc/plat-arcfpga/platform.c) | 12 |
9 files changed, 13 insertions, 25 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 8e8de4c..824065a 100644 --- 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 87e0e5b..435b693 100644 --- 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 faf240e..b0e3f19 100644 --- 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 index 3b076fb..105a001 100644 --- 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 e6aa1ed..138f9d8 100644 --- 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 1aad236..31e1d95 100644 --- 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 index 043bac3..18e39fc 100644 --- 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 index 00b1a95..00b1a95 100644 --- a/arch/arc/plat-arcfpga/Makefile +++ b/arch/arc/plat-sim/Makefile diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-sim/platform.c index c79a05c..114fdc3 100644 --- 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", |