From afe67e77eeac8f1a42beb10661cdcbbd703aa81e Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 13:44:17 -0700
Subject: [PATCH 1/5] sim: Add a "make sim" target

This allows users without hardware to simulate Linux on Spike.
---
 .gitmodules   |  6 ++++++
 Makefile      | 33 +++++++++++++++++++++++++++++++++
 riscv-fesvr   |  1 +
 riscv-isa-sim |  1 +
 4 files changed, 41 insertions(+)
 create mode 160000 riscv-fesvr
 create mode 160000 riscv-isa-sim

diff --git a/.gitmodules b/.gitmodules
index b723b02..c245a1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,9 @@
 [submodule "riscv-gnu-toolchain"]
 	path = riscv-gnu-toolchain
 	url = https://github.com/riscv/riscv-gnu-toolchain.git
+[submodule "riscv-isa-sim"]
+	path = riscv-isa-sim
+	url = https://github.com/riscv/riscv-isa-sim.git
+[submodule "riscv-fesvr"]
+	path = riscv-fesvr
+	url = https://github.com/riscv/riscv-fesvr.git
diff --git a/Makefile b/Makefile
index 1f11db5..21eb461 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,14 @@ bbl := $(pk_wrkdir)/bbl
 bin := $(wrkdir)/bbl.bin
 hex := $(wrkdir)/bbl.hex
 
+fesvr_srcdir := $(srcdir)/riscv-fesvr
+fesvr_wrkdir := $(wrkdir)/riscv-fesvr
+libfesvr := $(fesvr_wrkdir)/prefix/lib/libfesvr.so
+
+spike_srcdir := $(srcdir)/riscv-isa-sim
+spike_wrkdir := $(wrkdir)/riscv-isa-sim
+spike := $(spike_wrkdir)/prefix/bin/spike
+
 target := riscv64-unknown-linux-gnu
 
 .PHONY: all
@@ -91,6 +99,27 @@ $(bin): $(bbl)
 $(hex):	$(bin)
 	xxd -c1 -p $< > $@
 
+$(libfesvr): $(fesvr_srcdir)
+	rm -rf $(fesvr_wrkdir)
+	mkdir -p $(fesvr_wrkdir)
+	mkdir -p $(dir $@)
+	cd $(fesvr_wrkdir) && $</configure \
+		--prefix=$(dir $(abspath $(dir $@)))
+	$(MAKE) -C $(fesvr_wrkdir)
+	$(MAKE) -C $(fesvr_wrkdir) install
+	touch -c $@
+
+$(spike): $(spike_srcdir) $(libfesvr)
+	rm -rf $(spike_wrkdir)
+	mkdir -p $(spike_wrkdir)
+	mkdir -p $(dir $@)
+	cd $(spike_wrkdir) && $</configure \
+		--prefix=$(dir $(abspath $(dir $@))) \
+		--with-fesvr=$(dir $(abspath $(dir $(libfesvr))))
+	$(MAKE) -C $(spike_wrkdir)
+	$(MAKE) -C $(spike_wrkdir) install
+	touch -c $@
+
 .PHONY: sysroot vmlinux bbl
 sysroot: $(sysroot)
 vmlinux: $(vmlinux)
@@ -99,3 +128,7 @@ bbl: $(bbl)
 .PHONY: clean
 clean:
 	rm -rf -- $(wrkdir) $(toolchain_dest)
+
+.PHONY: sim
+sim: $(spike) $(bbl)
+	$(spike) -p4 $(bbl)
diff --git a/riscv-fesvr b/riscv-fesvr
new file mode 160000
index 0000000..f683e01
--- /dev/null
+++ b/riscv-fesvr
@@ -0,0 +1 @@
+Subproject commit f683e01542acf60e50774d061bcb396b628e3e67
diff --git a/riscv-isa-sim b/riscv-isa-sim
new file mode 160000
index 0000000..a327416
--- /dev/null
+++ b/riscv-isa-sim
@@ -0,0 +1 @@
+Subproject commit a327416eac285f50dcbb04e8ddf89204c66ece02

From ac75f6e497509f35bb2b427190dffb98c018729d Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 17:32:24 -0700
Subject: [PATCH 2/5] spike: Update, to put a HTIF node in the device tree

---
 riscv-isa-sim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/riscv-isa-sim b/riscv-isa-sim
index a327416..092b464 160000
--- a/riscv-isa-sim
+++ b/riscv-isa-sim
@@ -1 +1 @@
-Subproject commit a327416eac285f50dcbb04e8ddf89204c66ece02
+Subproject commit 092b464c06d2eba580b95a3ac7013449cb2687e4

From 266201ede75fce6dfe23c068f781707de272f4dc Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 17:06:23 -0700
Subject: [PATCH 3/5] pk: Update to autodetect the set of enabled harts

---
 Makefile             |  6 ++++--
 conf/sifive_logo.txt | 26 ++++++++++++++++++++++++++
 riscv-pk             |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 conf/sifive_logo.txt

diff --git a/Makefile b/Makefile
index 21eb461..3ba025a 100644
--- a/Makefile
+++ b/Makefile
@@ -90,8 +90,10 @@ $(bbl): $(pk_srcdir) $(vmlinux_stripped)
 	mkdir -p $(pk_wrkdir)
 	cd $(pk_wrkdir) && $</configure \
 		--host=$(target) \
-		--with-payload=$(vmlinux_stripped)
-	CFLAGS="-mabi=lp64d -march=rv64imafdc -DDISABLED_HART_MASK=1" $(MAKE) -C $(pk_wrkdir)
+		--with-payload=$(vmlinux_stripped) \
+		--enable-logo \
+		--with-logo=$(abspath conf/sifive_logo.txt)
+	CFLAGS="-mabi=lp64d -march=rv64imafdc" $(MAKE) -C $(pk_wrkdir)
 
 $(bin): $(bbl)
 	$(target)-objcopy -S -O binary --change-addresses -0x80000000 $< $@
diff --git a/conf/sifive_logo.txt b/conf/sifive_logo.txt
new file mode 100644
index 0000000..3b639ab
--- /dev/null
+++ b/conf/sifive_logo.txt
@@ -0,0 +1,26 @@
+
+                SIFIVE, INC.
+
+         5555555555555555555555555
+        5555                   5555
+       5555                     5555
+      5555                       5555
+     5555       5555555555555555555555
+    5555       555555555555555555555555
+   5555                             5555
+  5555                               5555
+ 5555                                 5555
+5555555555555555555555555555          55555
+ 55555           555555555           55555
+   55555           55555           55555
+     55555           5           55555
+       55555                   55555
+         55555               55555
+           55555           55555
+             55555       55555
+               55555   55555
+                 555555555
+                   55555
+                     5
+
+           SiFive RISC-V Coreplex
diff --git a/riscv-pk b/riscv-pk
index 66701f8..e22aaec 160000
--- a/riscv-pk
+++ b/riscv-pk
@@ -1 +1 @@
-Subproject commit 66701f82f88d08d3700d8b0bc5d5306abfd0044f
+Subproject commit e22aaec27f16d5f36f4a2947a7b6d4de8c922b38

From 2cada6d807759497aa1b2805fd23a2bce90f138a Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 14:11:20 -0700
Subject: [PATCH 4/5] travis: Don't do anything

---
 .travis.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..272517b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+addons:
+  apt:
+    packages:
+      - autoconf
+      - automake
+      - autotools-dev
+      - bc
+      - bison
+      - build-essential
+      - curl
+      - flex
+      - gawk
+      - gperf
+      - libgmp-dev
+      - libmpc-dev
+      - libmpfr-dev
+      - libtool
+      - patchutils
+      - texinfo
+before_install:
+  - export MAKEFLAGS="-j3"
+install: true
+script:
+   - true
+#  - (make > /dev/null) || (make -j1 && exit 1)

From 141ad52a69935d3c35d6cdf3d352b1af9953121f Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Mon, 6 Nov 2017 10:02:00 -0800
Subject: [PATCH 5/5] pk: Bump for two small fixes

57740d97cdec Un-break "--enable-32bit"
e22aaec27f16 Fix line endings in the logo
---
 riscv-pk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/riscv-pk b/riscv-pk
index e22aaec..57740d9 160000
--- a/riscv-pk
+++ b/riscv-pk
@@ -1 +1 @@
-Subproject commit e22aaec27f16d5f36f4a2947a7b6d4de8c922b38
+Subproject commit 57740d97cdec928c372d8e752c04a691418cbfa1