Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+13 -25
+1 -1
arch/arc/Kconfig
··· 81 81 82 82 menu "ARC Platform/SoC/Board" 83 83 84 - source "arch/arc/plat-arcfpga/Kconfig" 84 + source "arch/arc/plat-sim/Kconfig" 85 85 source "arch/arc/plat-tb10x/Kconfig" 86 86 #New platform adds here 87 87
+2 -2
arch/arc/Makefile
··· 81 81 # w/o this dtb won't embed into kernel binary 82 82 core-y += arch/arc/boot/dts/ 83 83 84 - core-$(CONFIG_ARC_PLAT_FPGA_LEGACY) += arch/arc/plat-arcfpga/ 85 - core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ 84 + core-$(CONFIG_ARC_PLAT_SIM) += arch/arc/plat-sim/ 85 + core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ 86 86 87 87 drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/ 88 88
+1 -1
arch/arc/boot/dts/Makefile
··· 1 1 # Built-in dtb 2 - builtindtb-y := angel4 2 + builtindtb-y := nsim_700 3 3 4 4 ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") 5 5 builtindtb-y := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME))
+1 -1
arch/arc/boot/dts/angel4.dts arch/arc/boot/dts/nsim_700.dts
··· 10 10 /include/ "skeleton.dtsi" 11 11 12 12 / { 13 - compatible = "snps,arc-angel4"; 13 + compatible = "snps,nsim"; 14 14 clock-frequency = <80000000>; /* 80 MHZ */ 15 15 #address-cells = <1>; 16 16 #size-cells = <1>;
+2 -2
arch/arc/configs/nsim_700_defconfig
··· 22 22 # CONFIG_BLK_DEV_BSG is not set 23 23 # CONFIG_IOSCHED_DEADLINE is not set 24 24 # CONFIG_IOSCHED_CFQ is not set 25 - CONFIG_ARC_PLAT_FPGA_LEGACY=y 26 - CONFIG_ARC_BUILTIN_DTB_NAME="angel4" 25 + CONFIG_ARC_PLAT_SIM=y 26 + CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700" 27 27 CONFIG_PREEMPT=y 28 28 # CONFIG_COMPACTION is not set 29 29 # CONFIG_CROSS_MEMORY_ATTACH is not set
+1 -1
arch/arc/configs/nsimosci_defconfig
··· 23 23 # CONFIG_BLK_DEV_BSG is not set 24 24 # CONFIG_IOSCHED_DEADLINE is not set 25 25 # CONFIG_IOSCHED_CFQ is not set 26 - CONFIG_ARC_PLAT_FPGA_LEGACY=y 26 + CONFIG_ARC_PLAT_SIM=y 27 27 CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci" 28 28 # CONFIG_COMPACTION is not set 29 29 CONFIG_NET=y
+4 -6
arch/arc/plat-arcfpga/Kconfig arch/arc/plat-sim/Kconfig
··· 6 6 # published by the Free Software Foundation. 7 7 # 8 8 9 - menuconfig ARC_PLAT_FPGA_LEGACY 10 - bool "\"Legacy\" ARC FPGA dev Boards" 9 + menuconfig ARC_PLAT_SIM 10 + bool "ARC nSIM based simulation virtual platforms" 11 11 select ARC_HAS_COH_CACHES if SMP 12 12 help 13 - Support for ARC development boards, provided by Synopsys. 14 - These are based on FPGA or ISS. e.g. 15 - - ARCAngel4 16 - - ML509 13 + Support for nSIM based ARC simulation platforms 14 + This includes the standalone nSIM (uart only) vs. System C OSCI VP
arch/arc/plat-arcfpga/Makefile arch/arc/plat-sim/Makefile
+1 -11
arch/arc/plat-arcfpga/platform.c arch/arc/plat-sim/platform.c
··· 1 1 /* 2 - * ARC FPGA Platform support code 2 + * ARC simulation Platform support code 3 3 * 4 4 * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com) 5 5 * ··· 18 18 * however as part of early device tree scan, we also select the right 19 19 * callback set, by matching the DT compatible name. 20 20 */ 21 - 22 - static const char *legacy_fpga_compat[] __initconst = { 23 - "snps,arc-angel4", 24 - "snps,arc-ml509", 25 - NULL, 26 - }; 27 - 28 - MACHINE_START(LEGACY_FPGA, "legacy_fpga") 29 - .dt_compat = legacy_fpga_compat, 30 - MACHINE_END 31 21 32 22 static const char *simulation_compat[] __initconst = { 33 23 "snps,nsim",