RadioLib: Use EXTERN_LIBS instead of Makefile paths

Signed-off-by: Alistair Francis <[email protected]>

Author: alistair23

.gitmodules

@@ -7,6 +7,6 @@
 [submodule "libopenthread/openthread"]
 	path = libopenthread/openthread
 	url = https://github.com/openthread/openthread.git
-[submodule "libradio/RadioLib"]
-	path = libradio/RadioLib
+[submodule "RadioLib/RadioLib"]
+	path = RadioLib/RadioLib
 	url = https://github.com/jgromes/RadioLib.git

RadioLib/Makefile

@@ -0,0 +1,39 @@
+LIBNAME := RadioLib
+
+TOCK_USERLAND_BASE_DIR ?= ..
+
+$(LIBNAME)_DIR := $(TOCK_USERLAND_BASE_DIR)/$(LIBNAME)
+
+# We ideally want this:
+#     $(LIBNAME)_SRCS  :=                                     \
+#     $($(LIBNAME)_DIR)/$(LIBNAME)/src/Module.cpp             \
+#     $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/*.cpp)      \
+#     $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/*/*.cpp)    \
+#     $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/*/*/*.cpp)
+#
+# But due to this in the GCC arm binary in the CI:
+#
+# ```
+# (insn 179 178 46 8 (set (reg:SI 3 r3 [168])
+#         (mem/u/c:SI (plus:SI (reg:SI 12 ip [169])
+#                 (unspec:SI [
+#                         (symbol_ref/u:SI ("*.LC1") [flags 0x2])
+#                     ] UNSPEC_PIC_SYM)) [0  S4 A32])) "../../../RadioLib/src/modules/LR11x0/LR11x0.cpp":638:16 929 {*thumb1_movsi_insn}
+#      (expr_list:REG_EQUAL (symbol_ref/u:SI ("*.LC1") [flags 0x2])
+#         (nil)))
+# during RTL pass: postreload
+# ../../../RadioLib/src/modules/LR11x0/LR11x0.cpp:650:1: internal compiler error: in extract_constrain_insn, at recog.c:2195
+# ```
+#
+# we need to drop LR11x0
+$(LIBNAME)_SRCS  :=                                                \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/*.cpp)             \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/utils/*.cpp)       \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/modules/C*/.cpp)   \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/modules/LL*/*.cpp) \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/modules/RF*/*.cpp) \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/modules/S*/*.cpp)  \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/modules/n*/*.cpp)  \
+    $(wildcard $($(LIBNAME)_DIR)/$(LIBNAME)/src/protocols/*/*.cpp) \
+
+include $(TOCK_USERLAND_BASE_DIR)/TockLibrary.mk

RadioLib/Makefile.app

@@ -0,0 +1,5 @@
+# Include the core RadioLib headers
+override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/src
+
+# Include the Tock specific headers
+override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/examples/NonArduino/Tock

RadioLib/Makefile.setup

@@ -0,0 +1,14 @@
+.PHONY: clean
+
+TOCK_USERLAND_BASE_DIR ?= ../
+
+
+all: $(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/README.md
+
+clean::
+	rm -rf build
+
+# confirm RadioLib git submodule is checked out. 
+$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/README.md:
+	git submodule update --init -- $(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib
+

libradio/RadioLib renamed to RadioLib/RadioLib

@@ -7,8 +7,6 @@ TOCK_USERLAND_BASE_DIR = ../../..
 CXX_SRCS := $(wildcard *.cc)
 
 # Use the libtock-c Make system
-include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
-
-include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app
+EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/RadioLib
 
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk

examples/lora/sensor-receive/Makefile

@@ -7,8 +7,6 @@ TOCK_USERLAND_BASE_DIR = ../../..
 CXX_SRCS := $(wildcard *.cc)
 
 # Use the libtock-c Make system
-include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
-
-include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile.app
+EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/RadioLib
 
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk