From 13ab41904f6a477a9cab9e7ea82eba45d30a2e2e Mon Sep 17 00:00:00 2001
From: Wim Rijnders <wrijnders@gmail.com>
Date: Thu, 5 Jul 2018 10:53:05 +0200
Subject: [PATCH 1/4] Fixed typo in testMain

---
 Tests/testMain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/testMain.cpp b/Tests/testMain.cpp
index 43bf7f1..c0cbe48 100644
--- a/Tests/testMain.cpp
+++ b/Tests/testMain.cpp
@@ -30,7 +30,7 @@
 //
 // This is a good place to put simple, global tests
 //
-const char *AUTOTEST_PATH = "obj" POSTFIX_DEBUG POSTFIX_DEBUG "/bin/AutoTest";
+const char *AUTOTEST_PATH = "obj" POSTFIX_DEBUG POSTFIX_QPU "/bin/AutoTest";
 
 
 TEST_CASE("Check random specifications for interpreter and emulator2", "[specs]") {

From 3b59588a1bc76d2e84c82a1f311c8941fead0772 Mon Sep 17 00:00:00 2001
From: Wim Rijnders <wrijnders@gmail.com>
Date: Sun, 15 Jul 2018 22:38:07 +0200
Subject: [PATCH 2/4] Small fix in unit tests

---
 Tests/testMain.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Tests/testMain.cpp b/Tests/testMain.cpp
index f304f10..b6f1bbc 100644
--- a/Tests/testMain.cpp
+++ b/Tests/testMain.cpp
@@ -35,8 +35,6 @@ using RegMap = QPULib::RegisterMap;
 	#define POSTFIX_QPU ""
 #endif
 
-const char *AUTOTEST_PATH = "obj" POSTFIX_DEBUG POSTFIX_QPU "/bin/AutoTest";
-
 
 //
 // This is a good place to put simple, global tests

From 613007ea37c1bb191696ebd36ad226527c34f800 Mon Sep 17 00:00:00 2001
From: Wim Rijnders <wrijnders@gmail.com>
Date: Sun, 15 Jul 2018 22:49:00 +0200
Subject: [PATCH 3/4] Restore check on platform

---
 Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Makefile b/Makefile
index b841713..644135f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,16 @@ endif
 
 # QPU or emulation mode
 ifeq ($(QPU), 1)
+
+# Check platform before building. Can't be indented, otherwise make complains.
+RET := $(shell Tools/detectPlatform.sh 1>/dev/null && echo "yes" || echo "no")
+#$(info  info: '$(RET)')
+ifneq ($(RET), yes)
+$(error QPU-mode specified on a non-Pi platform; aborting)
+else
+$(info Building on a Pi platform)
+endif
+
   CXX_FLAGS += -DQPU_MODE -I /opt/vc/include
   OBJ_DIR := $(OBJ_DIR)-qpu
 	LIBS := -L /opt/vc/lib -l bcm_host

From 2af03cbd4c46da7737fd67bd4d0352367e5c97b2 Mon Sep 17 00:00:00 2001
From: wimrijnders <wimrijnders@gmail.com>
Date: Sun, 15 Jul 2018 22:51:01 +0200
Subject: [PATCH 4/4] Restored RegisterMap

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index b841713..3889394 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@ OBJ =                         \
   Target/Emulator.o           \
   Target/Encode.o             \
   VideoCore/Mailbox.o         \
+  VideoCore/RegisterMap.o     \
   VideoCore/Invoke.o          \
   VideoCore/VideoCore.o