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] 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