Give the HAL functions better names

[pes-rpp/rpp-lib.git] / build / Makefile.rules.arm

diff --git a/build/Makefile.rules.arm b/build/Makefile.rules.arm
index 8c093470229957c305f894920b86500909e72276..96ef96582f71cca36603ecdb77c2326f4b5422d8 100644 (file)
--- a/build/Makefile.rules.arm
+++ b/build/Makefile.rules.arm
@@ -21,20 +21,11 @@ endif
 
 # Code composer studio sets this variable when it invokes make. Let's use it
 # as a hint for where is the compiler installed.
-CCS_UTILS_DIR ?= /opt/ti/ccsv5/utils
+CCS_UTILS_DIR ?= $(or $(wildcard /opt/ti/ccsv5/utils),\
+                                         $(error Please set CCS_UTILS_DIR variable, e.g. by running 'make CCS_UTILS_DIR=$$HOME/ti/ccsv5/utils'))
 
 ARM_COMPILER_DIR ?= $(dir $(CCS_UTILS_DIR))/tools/compiler/arm_5.1.1
 
-ifeq ($(wildcard $(CCS_UTILS_DIR)),)
-define msg
-'$(CCS_UTILS_DIR)' directory does not exist.
-Please set CCS_UTILS_DIR variable, e.g. by running 'make CCS_UTILS_DIR=$$HOME/ti/ccsv5/utils'
-endef
-$(error $(msg))
-endif
-
-include $(makefile_rules_arm_dir)/../common.mk
-
 CC=$(ARM_COMPILER_DIR)/bin/armcl
 AR=$(ARM_COMPILER_DIR)/bin/armar
 LD=$(CC)
@@ -42,10 +33,26 @@ LD=$(CC)
 # Include definition of $(rpp_lib_INCLUDES)
 include $(makefile_rules_arm_dir)/../Makefile.var
 
-RPP_CFLAGS = $(TARGET_CFLAGS) --gcc -I$(ARM_COMPILER_DIR)/include      \
-               $(rpp_lib_INCLUDES:%=-I$(makefile_rules_arm_dir)/../%)                  \
-               --diag_warning=225 --display_error_number --diag_wrap=off               \
-               --gen_func_subsections=on --enum_type=packed
+# Include UPPERCASE function
+include $(makefile_rules_dir)/../common.mk
+
+# Construct target specific CFLAGS. Start from what's in Makefile.config.
+RPP_TARGET_CFLAGS = $(TARGET_CFLAGS)
+
+# Add -DTARGET_<NAME>
+RPP_TARGET_CFLAGS += -DTARGET_$(call UPPERCASE,$(TARGET))
+
+# Then add -DTARGET_HAS_xxx for each make variable named TARGET_HAS_*
+# having value 'y'
+TARGET_HAS_NAMES = $(filter TARGET_HAS_%,$(.VARIABLES))
+RPP_TARGET_CFLAGS += $(foreach name,$(TARGET_HAS_NAMES),$(if $(filter y,$($(name))),-D$(name)))
+
+ARM_COMPILER_CFLAGS = --gcc --diag_warning=225 --display_error_number  \
+                                         --diag_wrap=off --gen_func_subsections=on --enum_type=packed
+
+RPP_CFLAGS = $(RPP_TARGET_CFLAGS) -I$(ARM_COMPILER_DIR)/include        \
+               $(rpp_lib_INCLUDES:%=-I$(makefile_rules_arm_dir)/../%)  \
+               $(ARM_COMPILER_CFLAGS)
 
 RPP_MAKE_CFLAGS = \
                --preproc_dependency=$(@:%=%.dep) --obj_directory=$(dir $@)     \
@@ -65,5 +72,8 @@ RPP_LDFLAGS = \
 
 RPP_LDLIBS = $(makefile_rules_arm_dir)/$(TARGET)/$(TARGET_LDCMD) -l$(RPP_LIB_DIR)/rpp-lib.lib $(TARGET_LDLIBS)
 
+# Do not define any rules when compiling Simulink models
+ifeq ($(MATLAB_ROOT),)
 $(RPP_LIB_DIR)/rpp-lib.lib:
        $(MAKE) -C $(dir $@)
+endif