Skip to content

Commit 1681baa

Browse files
Eugeniy Paltsevvineetgarc
authored andcommitted
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 <[email protected]> Signed-off-by: Vineet Gupta <[email protected]>
1 parent 8ae5bb0 commit 1681baa

File tree

6 files changed

+1
-244
lines changed

6 files changed

+1
-244
lines changed

arch/arc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
44
#
55

6-
KBUILD_DEFCONFIG := nsim_hs_defconfig
6+
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
77

88
ifeq ($(CROSS_COMPILE),)
99
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)

arch/arc/boot/dts/nsim_hs.dts

Lines changed: 0 additions & 67 deletions
This file was deleted.

arch/arc/boot/dts/nsim_hs_idu.dts

Lines changed: 0 additions & 65 deletions
This file was deleted.

arch/arc/configs/nsim_hs_defconfig

Lines changed: 0 additions & 56 deletions
This file was deleted.

arch/arc/configs/nsim_hs_smp_defconfig

Lines changed: 0 additions & 54 deletions
This file was deleted.

arch/arc/plat-sim/platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ static const char *simulation_compat[] __initconst = {
2121
"snps,nsim",
2222
"snps,nsimosci",
2323
#else
24-
"snps,nsim_hs",
2524
"snps,nsimosci_hs",
2625
"snps,zebu_hs",
2726
#endif

0 commit comments

Comments
 (0)