diff mbox series

ARC: Rename nSIM HS to HAPS HS

Message ID 20210531201210.32006-1-abrodkin@synopsys.com
State New
Headers show
Series ARC: Rename nSIM HS to HAPS HS | expand

Commit Message

Alexey Brodkin May 31, 2021, 8:12 p.m. UTC 
In v5.5 kernel we merged "nsim_hs" config into "haps_hs", see [1],
and from then on we use the same one "haps_hs" for everything simulated:
nSIM/QEMU/FPGA.

Of important notes:
 * We switched from legacy ARC UART to a standard DW UART

 * QEMU port for ARC is under review upstream, see [2].
   But even today with WIP version from our GitHub fork [3] its possible
   to run this image for "hapshs" machine as simple as:
   ----------------------------->8------------------------------
   $ qemu-system-arc -cpu archs -M virt -nographic -no-reboot -monitor none \
     -kernel build/tmp-glibc/deploy/images/hapshs/vmlinux-initramfs-hapshs.bin
   ----------------------------->8------------------------------

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1681baa713aa138d3f0f77f05c3de1cd6416c7d6
[2] https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg00458.html
[3] https://github.com/foss-for-synopsys-dwc-arc-processors/qemu

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
 .../nsimhs-standard.scc => hapshs/hapshs-standard.scc}       |  4 ++--
 bsp/hapshs/hapshs.cfg                                        | 12 ++++++++++++
 bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc}                 |  2 +-
 bsp/nsimhs/nsimhs.cfg                                        | 10 ----------
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename bsp/{nsimhs/nsimhs-standard.scc => hapshs/hapshs-standard.scc} (72%)
 create mode 100644 bsp/hapshs/hapshs.cfg
 rename bsp/{nsimhs/nsimhs.scc => hapshs/hapshs.scc} (54%)
 delete mode 100644 bsp/nsimhs/nsimhs.cfg
diff mbox series

Patch

diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc
similarity index 72%
rename from bsp/nsimhs/nsimhs-standard.scc
rename to bsp/hapshs/hapshs-standard.scc
index 3201ca52..1842b00c 100644
--- a/bsp/nsimhs/nsimhs-standard.scc
+++ b/bsp/hapshs/hapshs-standard.scc
@@ -1,8 +1,8 @@ 
 # SPDX-License-Identifier: MIT
-define KMACHINE nsimhs
+define KMACHINE hapshs
 define KTYPE standard
 define KARCH arc
 
 include ktypes/standard/standard.scc
 
-include nsimhs.scc
+include hapshs.scc
diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg
new file mode 100644
index 00000000..adcc0531
--- /dev/null
+++ b/bsp/hapshs/hapshs.cfg
@@ -0,0 +1,12 @@ 
+# SPDX-License-Identifier: MIT
+# ARCv2 ISA
+CONFIG_ISA_ARCV2=y
+
+# Serial port
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+# Built-in .dtb
+CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs"
diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc
similarity index 54%
rename from bsp/nsimhs/nsimhs.scc
rename to bsp/hapshs/hapshs.scc
index 3c1613a6..ea2b8b6c 100644
--- a/bsp/nsimhs/nsimhs.scc
+++ b/bsp/hapshs/hapshs.scc
@@ -1,2 +1,2 @@ 
 # SPDX-License-Identifier: MIT
-kconf hardware nsimhs.cfg
+kconf hardware hapshs.cfg
diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg
deleted file mode 100644
index 34580a39..00000000
--- a/bsp/nsimhs/nsimhs.cfg
+++ /dev/null
@@ -1,10 +0,0 @@ 
-# SPDX-License-Identifier: MIT
-# ARCv2 ISA
-CONFIG_ISA_ARCV2=y
-
-# Legacy ARC UART
-CONFIG_SERIAL_ARC=y
-CONFIG_SERIAL_ARC_CONSOLE=y
-
-# Built-in .dtb
-CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs"