From 603909f2d603e2f538ebb006dc4d0fb3e0248cf1 Mon Sep 17 00:00:00 2001 From: Michal Horn Date: Fri, 17 Apr 2015 17:05:50 +0200 Subject: [PATCH] Add hidden rpp rtwoption for platform dependent linker script --- rpp/rpp/rpp.tlc | 9 +++++++++ rpp/rpp/rpp.tmf | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rpp/rpp/rpp.tlc b/rpp/rpp/rpp.tlc index 517283f..2707567 100644 --- a/rpp/rpp/rpp.tlc +++ b/rpp/rpp/rpp.tlc @@ -98,6 +98,15 @@ oIdx = oIdx + 1; + rtwoptions(oIdx).prompt = 'Linker script file name'; + rtwoptions(oIdx).type = 'NonUI'; + rtwoptions(oIdx).default = 'RM48L952FlashLnk.cmd'; + rtwoptions(oIdx).tlcvariable = 'rppLdScriptFileName'; + rtwoptions(oIdx).makevariable = 'RPP_LD_SCRIPT_FILE_NAME'; + rtwoptions(oIdx).tooltip = ['The name of the platform specific linker script.']; + + oIdx = oIdx + 1; + rtwoptions(oIdx).prompt = 'Download compiled binary to RPP.'; rtwoptions(oIdx).type = 'Checkbox'; diff --git a/rpp/rpp/rpp.tmf b/rpp/rpp/rpp.tmf index 0618943..c1105a1 100644 --- a/rpp/rpp/rpp.tmf +++ b/rpp/rpp/rpp.tmf @@ -81,6 +81,9 @@ MODELREF_INC_PATH = |>START_MDLREFINC_EXPAND_INCLUDES<|-I|>MODELREF_INC_ RELATIVE_PATH_TO_ANCHOR = |>RELATIVE_PATH_TO_ANCHOR<| MODELREF_TARGET_TYPE = |>MODELREF_TARGET_TYPE<| +#--------------------------- Linker script value ------------------------------- +RPP_LD_SCRIPT_FILE_NAME = |>RPP_LD_SCRIPT_FILE_NAME<| + #-- In the case when directory name contains space --- ifneq ($(MATLAB_ROOT),$(ALT_MATLAB_ROOT)) MATLAB_ROOT := $(ALT_MATLAB_ROOT) @@ -306,7 +309,7 @@ $(MODEL)$(PROGRAM_FILE_EXT): $(PREBUILT_OBJS) $(OBJS) $(MODELLIB) $(MODELREF_LIN endif ifeq ($(BUILD_MODE), real_time) -$(OBJS): $(RPP_LIB_ROOT)/$(RPP_STATIC_LIB) $(RPP_LIB_ROOT)/rpp/RM48L952FlashLnk.cmd +$(OBJS): $(RPP_LIB_ROOT)/$(RPP_STATIC_LIB) $(RPP_LIB_ROOT)/rpp/$(RPP_LD_SCRIPT_FILE_NAME) $(MODEL)$(PROGRAM_FILE_EXT): $(OBJS) $(MODELREF_LINK_LIBS) $(SHARED_LIB) $(LIBS) @echo "### BUILD_MODE $(BUILD_MODE)" -- 2.39.2