renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

ARC: [plat_arcfpga]->[plat_sim]

Browse Source 
* 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>
This commit is contained in:
Vineet Gupta 2015-02-20 19:12:18 +05:30
parent 6623146cb7
commit fd1557923b
9 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arc/Kconfig
View File

@ -81,7 +81,7 @@ menu "ARC Architecture Configuration"
menu "ARC Platform/SoC/Board" menu "ARC Platform/SoC/Board"
source "arch/arc/plat-arcfpga/Kconfig" source "arch/arc/plat-sim/Kconfig"
source "arch/arc/plat-tb10x/Kconfig" source "arch/arc/plat-tb10x/Kconfig"
#New platform adds here #New platform adds here

4
arch/arc/Makefile
View File

@ -81,8 +81,8 @@ core-y += arch/arc/
# w/o this dtb won't embed into kernel binary # w/o this dtb won't embed into kernel binary
core-y += arch/arc/boot/dts/ core-y += arch/arc/boot/dts/
core-$(CONFIG_ARC_PLAT_FPGA_LEGACY) += arch/arc/plat-arcfpga/ core-$(CONFIG_ARC_PLAT_SIM) += arch/arc/plat-sim/
core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/
drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/ drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/

2
arch/arc/boot/dts/Makefile
View File

@ -1,5 +1,5 @@
# Built-in dtb # Built-in dtb
builtindtb-y := angel4 builtindtb-y := nsim_700
ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"")
builtindtb-y := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME)) builtindtb-y := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME))

2
arch/arc/boot/dts/angel4.dts → arch/arc/boot/dts/nsim_700.dts
View File

@ -10,7 +10,7 @@
/include/ "skeleton.dtsi" /include/ "skeleton.dtsi"
/ { / {
compatible = "snps,arc-angel4"; compatible = "snps,nsim";
clock-frequency = <80000000>; /* 80 MHZ */ clock-frequency = <80000000>; /* 80 MHZ */
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arc/configs/nsim_700_defconfig
View File

@ -22,8 +22,8 @@ CONFIG_MODULES=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ 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="angel4" CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700"
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
# CONFIG_COMPACTION is not set # CONFIG_COMPACTION is not set
# CONFIG_CROSS_MEMORY_ATTACH is not set # CONFIG_CROSS_MEMORY_ATTACH is not set

2
arch/arc/configs/nsimosci_defconfig
View File

@ -23,7 +23,7 @@ CONFIG_MODULES=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ 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_ARC_BUILTIN_DTB_NAME="nsimosci"
# CONFIG_COMPACTION is not set # CONFIG_COMPACTION is not set
CONFIG_NET=y CONFIG_NET=y

10
arch/arc/plat-arcfpga/Kconfig → arch/arc/plat-sim/Kconfig
View File

@ -6,11 +6,9 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
menuconfig ARC_PLAT_FPGA_LEGACY menuconfig ARC_PLAT_SIM
bool "\"Legacy\" ARC FPGA dev Boards" bool "ARC nSIM based simulation virtual platforms"
select ARC_HAS_COH_CACHES if SMP select ARC_HAS_COH_CACHES if SMP
help help
Support for ARC development boards, provided by Synopsys. Support for nSIM based ARC simulation platforms
These are based on FPGA or ISS. e.g. This includes the standalone nSIM (uart only) vs. System C OSCI VP
- ARCAngel4
- ML509

0
arch/arc/plat-arcfpga/Makefile → arch/arc/plat-sim/Makefile
View File

12
arch/arc/plat-arcfpga/platform.c → arch/arc/plat-sim/platform.c
View File

@ -1,5 +1,5 @@
/* /*
* ARC FPGA Platform support code * ARC simulation Platform support code
* *
* Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com) * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com)
* *
@ -19,16 +19,6 @@
* callback set, by matching the DT compatible name. * 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 = { static const char *simulation_compat[] __initconst = {
"snps,nsim", "snps,nsim",
"snps,nsimosci", "snps,nsimosci",