mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 12:14:10 +08:00
ARC: merge HAPS-HS with nSIM-HS configs
Starting from nSIM 2019.06 is possible to use DW UART instead of ARC UART. That allows us to merge "nsim_hs" with "haps_hs" and "nsim_hs_smp" with "haps_hs_smp" with minor changes which were done in previous commits. We eliminate nsim_hs_defconfig and nsim_hs_smp_defconfig and leave haps_hs_defconfig and haps_hs_smp_defconfig which can be used on HAPS / nSIM / ZEBU / QEMU platforms without additional changes in Linux kernel. For nSIM we should now use UART property values "-prop=nsim_mem-dev=uart0,kind=dwuart,base=0xf0000000" instead of previously used "-prop=nsim_mem-dev=uart0,base=0xc0fc1000" "use_connect" and "irq" values of UART property remains untouched. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
Eugeniy Paltsev
Vineet Gupta
parent
8ae5bb05d7
commit
1681baa713
@ -3,7 +3,7 @@
|
|||||||
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
|
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
|
||||||
#
|
#
|
||||||
|
|
||||||
KBUILD_DEFCONFIG := nsim_hs_defconfig
|
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
|
||||||
|
|
||||||
ifeq ($(CROSS_COMPILE),)
|
ifeq ($(CROSS_COMPILE),)
|
||||||
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)
|
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2014-15 Synopsys, Inc. (www.synopsys.com)
|
|
||||||
*/
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/include/ "skeleton_hs.dtsi"
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "snps,nsim_hs";
|
|
||||||
compatible = "snps,nsim_hs";
|
|
||||||
#address-cells = <2>;
|
|
||||||
#size-cells = <2>;
|
|
||||||
interrupt-parent = <&core_intc>;
|
|
||||||
|
|
||||||
memory {
|
|
||||||
device_type = "memory";
|
|
||||||
/* CONFIG_LINUX_RAM_BASE needs to match low mem start */
|
|
||||||
reg = <0x0 0x80000000 0x0 0x20000000 /* 512 MB low mem */
|
|
||||||
0x1 0x00000000 0x0 0x40000000>; /* 1 GB highmem */
|
|
||||||
};
|
|
||||||
|
|
||||||
chosen {
|
|
||||||
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
|
|
||||||
};
|
|
||||||
|
|
||||||
aliases {
|
|
||||||
serial0 = &arcuart0;
|
|
||||||
};
|
|
||||||
|
|
||||||
fpga {
|
|
||||||
compatible = "simple-bus";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
/* only perip space at end of low mem accessible
|
|
||||||
bus addr, parent bus addr, size */
|
|
||||||
ranges = <0x80000000 0x0 0x80000000 0x80000000>;
|
|
||||||
|
|
||||||
core_clk: core_clk {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <80000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
core_intc: core-interrupt-controller {
|
|
||||||
compatible = "snps,archs-intc";
|
|
||||||
interrupt-controller;
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
};
|
|
||||||
|
|
||||||
arcuart0: serial@c0fc1000 {
|
|
||||||
compatible = "snps,arc-uart";
|
|
||||||
reg = <0xc0fc1000 0x100>;
|
|
||||||
interrupts = <24>;
|
|
||||||
clock-frequency = <80000000>;
|
|
||||||
current-speed = <115200>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
arcpct0: pct {
|
|
||||||
compatible = "snps,archs-pct";
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
interrupts = <20>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2014-15 Synopsys, Inc. (www.synopsys.com)
|
|
||||||
*/
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
/include/ "skeleton_hs_idu.dtsi"
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "snps,nsim_hs-smp";
|
|
||||||
compatible = "snps,nsim_hs";
|
|
||||||
interrupt-parent = <&core_intc>;
|
|
||||||
|
|
||||||
chosen {
|
|
||||||
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
|
|
||||||
};
|
|
||||||
|
|
||||||
aliases {
|
|
||||||
serial0 = &arcuart0;
|
|
||||||
};
|
|
||||||
|
|
||||||
fpga {
|
|
||||||
compatible = "simple-bus";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
/* child and parent address space 1:1 mapped */
|
|
||||||
ranges;
|
|
||||||
|
|
||||||
core_clk: core_clk {
|
|
||||||
#clock-cells = <0>;
|
|
||||||
compatible = "fixed-clock";
|
|
||||||
clock-frequency = <80000000>;
|
|
||||||
};
|
|
||||||
|
|
||||||
core_intc: core-interrupt-controller {
|
|
||||||
compatible = "snps,archs-intc";
|
|
||||||
interrupt-controller;
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
};
|
|
||||||
|
|
||||||
idu_intc: idu-interrupt-controller {
|
|
||||||
compatible = "snps,archs-idu-intc";
|
|
||||||
interrupt-controller;
|
|
||||||
interrupt-parent = <&core_intc>;
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
};
|
|
||||||
|
|
||||||
arcuart0: serial@c0fc1000 {
|
|
||||||
compatible = "snps,arc-uart";
|
|
||||||
reg = <0xc0fc1000 0x100>;
|
|
||||||
interrupt-parent = <&idu_intc>;
|
|
||||||
interrupts = <0>;
|
|
||||||
clock-frequency = <80000000>;
|
|
||||||
current-speed = <115200>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
arcpct0: pct {
|
|
||||||
compatible = "snps,archs-pct";
|
|
||||||
#interrupt-cells = <1>;
|
|
||||||
interrupts = <20>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
# CONFIG_LOCALVERSION_AUTO is not set
|
|
||||||
# CONFIG_SWAP is not set
|
|
||||||
CONFIG_SYSVIPC=y
|
|
||||||
CONFIG_POSIX_MQUEUE=y
|
|
||||||
# CONFIG_CROSS_MEMORY_ATTACH is not set
|
|
||||||
CONFIG_HIGH_RES_TIMERS=y
|
|
||||||
CONFIG_PREEMPT=y
|
|
||||||
CONFIG_IKCONFIG=y
|
|
||||||
CONFIG_IKCONFIG_PROC=y
|
|
||||||
CONFIG_NAMESPACES=y
|
|
||||||
# CONFIG_UTS_NS is not set
|
|
||||||
# CONFIG_PID_NS is not set
|
|
||||||
CONFIG_BLK_DEV_INITRD=y
|
|
||||||
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y
|
|
||||||
CONFIG_KALLSYMS_ALL=y
|
|
||||||
CONFIG_EMBEDDED=y
|
|
||||||
CONFIG_PERF_EVENTS=y
|
|
||||||
# CONFIG_SLUB_DEBUG is not set
|
|
||||||
# CONFIG_COMPAT_BRK is not set
|
|
||||||
CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs"
|
|
||||||
CONFIG_KPROBES=y
|
|
||||||
CONFIG_MODULES=y
|
|
||||||
CONFIG_MODULE_FORCE_LOAD=y
|
|
||||||
CONFIG_MODULE_UNLOAD=y
|
|
||||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
||||||
# CONFIG_BLK_DEV_BSG is not set
|
|
||||||
# CONFIG_COMPACTION is not set
|
|
||||||
CONFIG_NET=y
|
|
||||||
CONFIG_PACKET=y
|
|
||||||
CONFIG_UNIX=y
|
|
||||||
CONFIG_UNIX_DIAG=y
|
|
||||||
CONFIG_NET_KEY=y
|
|
||||||
CONFIG_INET=y
|
|
||||||
# CONFIG_IPV6 is not set
|
|
||||||
CONFIG_DEVTMPFS=y
|
|
||||||
# CONFIG_STANDALONE is not set
|
|
||||||
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
|
|
||||||
# CONFIG_BLK_DEV is not set
|
|
||||||
# CONFIG_INPUT_KEYBOARD is not set
|
|
||||||
# CONFIG_INPUT_MOUSE is not set
|
|
||||||
# CONFIG_SERIO is not set
|
|
||||||
# CONFIG_LEGACY_PTYS is not set
|
|
||||||
CONFIG_SERIAL_ARC=y
|
|
||||||
CONFIG_SERIAL_ARC_CONSOLE=y
|
|
||||||
# CONFIG_HW_RANDOM is not set
|
|
||||||
# CONFIG_HWMON is not set
|
|
||||||
# CONFIG_HID is not set
|
|
||||||
# CONFIG_USB_SUPPORT is not set
|
|
||||||
# CONFIG_IOMMU_SUPPORT is not set
|
|
||||||
CONFIG_EXT2_FS=y
|
|
||||||
CONFIG_EXT2_FS_XATTR=y
|
|
||||||
CONFIG_TMPFS=y
|
|
||||||
# CONFIG_MISC_FILESYSTEMS is not set
|
|
||||||
CONFIG_NFS_FS=y
|
|
||||||
# CONFIG_ENABLE_MUST_CHECK is not set
|
|
||||||
# CONFIG_DEBUG_PREEMPT is not set
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
# CONFIG_LOCALVERSION_AUTO is not set
|
|
||||||
# CONFIG_SWAP is not set
|
|
||||||
# CONFIG_CROSS_MEMORY_ATTACH is not set
|
|
||||||
CONFIG_HIGH_RES_TIMERS=y
|
|
||||||
CONFIG_PREEMPT=y
|
|
||||||
CONFIG_IKCONFIG=y
|
|
||||||
CONFIG_IKCONFIG_PROC=y
|
|
||||||
CONFIG_NAMESPACES=y
|
|
||||||
# CONFIG_UTS_NS is not set
|
|
||||||
# CONFIG_PID_NS is not set
|
|
||||||
CONFIG_BLK_DEV_INITRD=y
|
|
||||||
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y
|
|
||||||
CONFIG_KALLSYMS_ALL=y
|
|
||||||
CONFIG_EMBEDDED=y
|
|
||||||
CONFIG_PERF_EVENTS=y
|
|
||||||
# CONFIG_SLUB_DEBUG is not set
|
|
||||||
# CONFIG_COMPAT_BRK is not set
|
|
||||||
CONFIG_SMP=y
|
|
||||||
CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs_idu"
|
|
||||||
CONFIG_KPROBES=y
|
|
||||||
CONFIG_MODULES=y
|
|
||||||
CONFIG_MODULE_FORCE_LOAD=y
|
|
||||||
CONFIG_MODULE_UNLOAD=y
|
|
||||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
||||||
# CONFIG_BLK_DEV_BSG is not set
|
|
||||||
# CONFIG_COMPACTION is not set
|
|
||||||
CONFIG_NET=y
|
|
||||||
CONFIG_PACKET=y
|
|
||||||
CONFIG_UNIX=y
|
|
||||||
CONFIG_UNIX_DIAG=y
|
|
||||||
CONFIG_NET_KEY=y
|
|
||||||
CONFIG_INET=y
|
|
||||||
# CONFIG_IPV6 is not set
|
|
||||||
CONFIG_DEVTMPFS=y
|
|
||||||
# CONFIG_STANDALONE is not set
|
|
||||||
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
|
|
||||||
# CONFIG_BLK_DEV is not set
|
|
||||||
# CONFIG_INPUT_KEYBOARD is not set
|
|
||||||
# CONFIG_INPUT_MOUSE is not set
|
|
||||||
# CONFIG_SERIO is not set
|
|
||||||
# CONFIG_LEGACY_PTYS is not set
|
|
||||||
CONFIG_SERIAL_ARC=y
|
|
||||||
CONFIG_SERIAL_ARC_CONSOLE=y
|
|
||||||
# CONFIG_HW_RANDOM is not set
|
|
||||||
# CONFIG_HWMON is not set
|
|
||||||
# CONFIG_HID is not set
|
|
||||||
# CONFIG_USB_SUPPORT is not set
|
|
||||||
# CONFIG_IOMMU_SUPPORT is not set
|
|
||||||
CONFIG_EXT2_FS=y
|
|
||||||
CONFIG_EXT2_FS_XATTR=y
|
|
||||||
CONFIG_TMPFS=y
|
|
||||||
# CONFIG_MISC_FILESYSTEMS is not set
|
|
||||||
CONFIG_NFS_FS=y
|
|
||||||
# CONFIG_ENABLE_MUST_CHECK is not set
|
|
||||||
@ -21,7 +21,6 @@ static const char *simulation_compat[] __initconst = {
|
|||||||
"snps,nsim",
|
"snps,nsim",
|
||||||
"snps,nsimosci",
|
"snps,nsimosci",
|
||||||
#else
|
#else
|
||||||
"snps,nsim_hs",
|
|
||||||
"snps,nsimosci_hs",
|
"snps,nsimosci_hs",
|
||||||
"snps,zebu_hs",
|
"snps,zebu_hs",
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user