Fix Pi3

pottendo · Feb 3, 2024 · 6989137 · 6989137
1 parent 31c453a
commit 6989137
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -62,6 +62,7 @@ ifeq ($(strip $(AARCH)),64)
 TARGET_CIRCLE ?= kernel8.img
 else
 TARGET_CIRCLE ?= kernel8-32.img
+COMMON_OBJS += SpinLock.o
 endif
 else ifeq ($(strip $(RASPPI)),4)
 ifeq ($(strip $(AARCH)),64)

diff --git a/src/circle-kernel.h b/src/circle-kernel.h
@@ -25,7 +25,9 @@
 #include <circle/serial.h>
 #include <circle/exceptionhandler.h>
 #include <circle/interrupt.h>
+#if RASPPI <= 3
 #include <circle/spinlock.h>
+#endif
 #include <circle/memio.h>
 #include <circle/timer.h>
 #include <circle/logger.h>

diff --git a/src/main.cpp b/src/main.cpp
@@ -24,6 +24,11 @@
 #include "SpinLock.h"
 #else 
 #include "circle-kernel.h"
+#if RASPPI <= 3
+#include "SpinLock.h"
+#else
+#define SpinLock CSpinLock
+#endif
 #endif
 #include "ROMs.h"
 #include "stb_image.h"
@@ -61,7 +66,6 @@ unsigned versionMajor = 1;
 unsigned versionMinor = 24;
 #if defined (__CIRCLE__)
 #define CV "c"
-#define SpinLock CSpinLock
 #else
 #define CV
 #endif