Updated make files

vanvught · Nov 16, 2024 · 950cce5 · 950cce5
1 parent b3dba55
commit 950cce5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/firmware-template-h3/Rules.mk b/firmware-template-h3/Rules.mk
@@ -27,10 +27,6 @@ ifeq ($(findstring ORANGE_PI,$(PLATFORM)),ORANGE_PI)
 	COND=1
 endif
 
-include ../firmware-template/libs.mk
-
-LIBS+=h3 clib arm
-
 # Output 
 TARGET=$(SUFFIX).img
 LIST=$(SUFFIX).list
@@ -64,8 +60,12 @@ ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
 	endif
 endif
 
+include ../firmware-template/libs.mk
+
+LIBS+=h3 clib arm
+
 # The variable for the firmware include directories
-INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include)  ../firmware-template-h3/include ../lib-h3/CMSIS/Core_A/Include
+INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include)  ../firmware-template-h3/include ../lib-h3/CMSIS/Core_A/Include -I../lib-flashcodeinstall/include
 INCDIRS:=$(addprefix -I,$(INCDIRS))
 
 # The variable for the libraries include directory

diff --git a/firmware-template-h3/lib/Rules.mk b/firmware-template-h3/lib/Rules.mk
@@ -25,7 +25,8 @@ SRCDIR+=src/debug
 
 $(info [${SRCDIR}])
 
-INCLUDES:=-I./include -I../include -I../lib-device/include -I../lib-flash/include -I../lib-configstore/include -I../lib-hal/include -I../lib-debug/include -I../lib-h3/include -I../lib-arm/include 
+INCLUDES:=-I./include -I../include -I../lib-device/include -I../lib-configstore/include -I../lib-hal/include -I../lib-debug/include -I../lib-h3/include -I../lib-arm/include 
+INCLUDES+=-I../lib-flash/include -I../lib-flashcodeinstall/include
 INCLUDES+=-I../lib-h3/CMSIS/Core_A/Include
 INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 

diff --git a/firmware-template/libs.mk b/firmware-template/libs.mk
@@ -154,10 +154,6 @@ else
 	LIBS+=flashcodeinstall flashcode flash
 endif	
 
-ifeq ($(findstring NODE_LTC_SMPTE,$(DEFINES)),NODE_LTC_SMPTE)
-	DEFINES+=CONFIG_DISPLAY_ENABLE_SSD1311 CONFIG_DISPLAY_ENABLE_HD44780 CONFIG_DISPLAY_ENABLE_CURSOR_MODE
-endif
-
 ifneq ($(findstring network,$(LIBS)),network)
 	LIBS+=network
 endif

diff --git a/opi_emac_ltc_smpte/Makefile.H3 b/opi_emac_ltc_smpte/Makefile.H3
@@ -3,6 +3,8 @@ PLATFORM=ORANGE_PI
 DEFINES =NODE_LTC_SMPTE ARM_ALLOW_MULTI_CORE
 DEFINES+=CONFIG_LTC_USE_DAC
 
+DEFINES+=CONFIG_DISPLAY_ENABLE_SSD1311 CONFIG_DISPLAY_ENABLE_HD44780 CONFIG_DISPLAY_ENABLE_CURSOR_MODE
+
 DEFINES+=NODE_RDMNET_LLRP_ONLY
 
 DEFINES+=NODE_ARTNET ARTNET_VERSION=3