Fixed compilation system.

diff --git a/refs/armcl.pdf b/refs/armcl.pdf
new file mode 100644 (file)
index 0000000..49aa7da
Binary files /dev/null and b/refs/armcl.pdf differ

diff --git a/rpp/rpp/rpp.tmf b/rpp/rpp/rpp.tmf
index 7565da9af4c3a0984876a216f6644c03f21edc70..9a2ada6ed018d23977244c13471215784d399289 100644 (file)
--- a/rpp/rpp/rpp.tmf
+++ b/rpp/rpp/rpp.tmf
@@ -228,14 +228,12 @@ $(PRODUCT) : $(OBJS) $(SHARED_LIB)
        @echo "### Created $(PRODUCT)"
 endif
 
-# Commented to remove warning when PROGRAM_FILE_EXT = EXE_FILE_EXT
-# But actually useful. Consider convert to final binary form here if needed.
-#ifeq ($(BUILD_MODE), real_time)
-#$(PRODUCT) : $(MODEL)$(PROGRAM_FILE_EXT)
-#      @echo "### BUILD_MODE $(BUILD_MODE)"
-#      $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
-#      @echo "### Generated $(PRODUCT)"
-#endif
+ifeq ($(BUILD_MODE), real_time)
+$(PRODUCT) : $(MODEL)$(PROGRAM_FILE_EXT)
+       @echo "### BUILD_MODE $(BUILD_MODE)"
+       $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
+       @echo "### Generated $(PRODUCT)"
+endif
 
 ifeq ($(BUILD_MODE), pil_application)
 $(PRODUCT) : $(MODEL)$(PROGRAM_FILE_EXT)
@@ -255,34 +253,34 @@ endif
 ifeq ($(BUILD_MODE), pil_application)
 $(MODEL)$(PROGRAM_FILE_EXT): $(PREBUILT_OBJS) $(OBJS) $(MODELLIB) $(MODELREF_LINK_LIBS) $(SHARED_LIB) $(LIBS)
        @echo "### BUILD_MODE $(BUILD_MODE)"
-       $(LD) $^ $(LDFLAGS) $(LDOUTPUTFLAG) $@
+       $(LD) $^ $(LDFLAGS) $(LDOUTPUTFLAG)$@
        @echo "### Generated $@"
 endif
 
 ifeq ($(BUILD_MODE), real_time)
 $(MODEL)$(PROGRAM_FILE_EXT): $(OBJS) $(MODELREF_LINK_LIBS) $(SHARED_LIB) $(LIBS)
        @echo "### BUILD_MODE $(BUILD_MODE)"
-       $(LD) $^ $(LDFLAGS) $(LDOUTPUTFLAG) $@
+       $(LD) $^ $(LDFLAGS) $(LDOUTPUTFLAG)$@
        @echo "### Generated $@"
 endif
 
 %$(OBJ_EXT) : $(RELATIVE_PATH_TO_ANCHOR)/%.c
-       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG)$@
 
 %$(OBJ_EXT): $(RELATIVE_PATH_TO_ANCHOR)/%.cpp
-       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG)$@
 
 %$(OBJ_EXT): %.cpp
-       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG)$@
 
 %$(OBJ_EXT): %.c
-       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG)$@
 
 %$(OBJ_EXT): $(TARGET_SRC_DIR)/%.cpp
-       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CXX) -c $(CXXFLAGS) $< $(CCOUTPUTFLAG)$@
 
 %$(OBJ_EXT): $(TARGET_SRC_DIR)/%.c
-       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG) $@
+       $(CC) -c $(CFLAGS) $< $(CCOUTPUTFLAG)$@
 
 |>START_EXPAND_RULES<|%$(OBJ_EXT) : |>EXPAND_DIR_NAME<|/%.cpp
        $(CXX) -c $(CXXFLAGS) $<

diff --git a/rpp/rpp/rpp_make_rtw_hook.m b/rpp/rpp/rpp_make_rtw_hook.m
index e1a2e7e535df766dc903ab8a3e1897d10d11ef29..1725bbb3ba6cdf942a45fd8a93b0ee8a9046e056 100644 (file)
--- a/rpp/rpp/rpp_make_rtw_hook.m
+++ b/rpp/rpp/rpp_make_rtw_hook.m
@@ -87,22 +87,22 @@ function i_write_rpp_files
     lCodeGenFolder = Simulink.fileGenControl('getConfig').CodeGenFolder;
     buildAreaDstFolder = fullfile(lCodeGenFolder, 'slprj');
 
-    % Get CSS configuration variables and create configuration makefile
+    % Get CSS configuration variables and create paths configuration makefile
     CompilerRoot = getpref('rpp', 'CompilerRoot');
     TargetRoot = getpref('rpp', 'TargetRoot');
 
     TargetPaths = fullfile(buildAreaDstFolder, 'target_paths.mk');
+    RppLibRoot =  fullfile(fileparts(TargetRoot), 'lib');
     fid = fopen(TargetPaths, 'w');
     fwrite(fid, sprintf('%s\n\n', '# RPP paths'));
     fwrite(fid, sprintf('COMPILER_ROOT = %s\n', CompilerRoot));
     fwrite(fid, sprintf('TARGET_ROOT   = %s\n', TargetRoot));
+    fwrite(fid, sprintf('RPP_LIB_ROOT  = %s\n', RppLibRoot));
     fclose(fid);
 
-
     % Copy the RPP version of target_tools.mk into the build area
     tgtToolsFile = 'target_tools.mk';
-    targetToolsFolder = fileparts(mfilename('fullpath'));
-    srcFile = fullfile(targetToolsFolder, tgtToolsFile);
+    srcFile = fullfile(TargetRoot, tgtToolsFile);
     dstFile = fullfile(buildAreaDstFolder, tgtToolsFile);
     copyfile(srcFile, dstFile, 'f');
     % Make sure the file is not read-only

diff --git a/rpp/rpp/rpp_srmain.tlc b/rpp/rpp/rpp_srmain.tlc
index 6882248c5e480b1d3c1b57935a09ae29a5afc8a0..df2e7bed093b756f567f955437485f9691a8ed4d 100644 (file)
--- a/rpp/rpp/rpp_srmain.tlc
+++ b/rpp/rpp/rpp_srmain.tlc
@@ -43,8 +43,11 @@
 
     /* Kernel includes */
     #include "FreeRTOS.h"
-    #include "task.h"
-    #include "semphr.h"
+    #include "os_task.h"
+    #include "os_semphr.h"
+    %% FIXME: Return to original file names
+    %%#include "task.h"
+    %%#include "semphr.h"
 
     /* System includes */
     #include "sys_common.h"

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index bdb6a40edc0c87b49e213f40d0fdca5f5246e8bb..84613ae87cb518a2e21ad62db464673df334f153 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -24,16 +24,22 @@
 
 include $(START_DIR)/slprj/target_paths.mk
 
+# Options for target source files
+TARGET_INCS      =
+TARGET_SRCS      =
+
 # Compiler command and options
 CC      = "$(COMPILER_ROOT)/bin/armcl"
-CFLAGS  = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi \
-          -O2 --diag_warning=225 --display_error_number --enum_type=packed \
+CFLAGS  = -mv7R4 --code_state=32 --float_support=VFPv3D16 \
+          --abi=eabi --compile_only -O2 \
+          --diag_warning=225 --display_error_number --enum_type=packed \
           --include_path="$(COMPILER_ROOT)/include" \
-          --include_path="$(TARGET_ROOT)/lib"
+          --include_path="$(RPP_LIB_ROOT)/tmp"
+          # FIXME: Remove tmp library when library is ordered
 
 CFLAGS          += $(OPTS)
-CDEBUG           = -g --gcc
-CCOUTPUTFLAG     = -o
+CDEBUG           = -g
+CCOUTPUTFLAG     = --output_file=
 
 CXX              =
 CXXFLAGS         =
@@ -48,23 +54,23 @@ LDFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi \
           --reread_libs --warn_sections --display_error_number --rom_model \
           --be32
 
-LDDEBUG          = -g --gcc
-LDOUTPUTFLAG     = -o
+LDDEBUG          = -g
+LDOUTPUTFLAG     = --output_file=
 
 # Archiver command and options
 AR               = "$(COMPILER_ROOT)/bin/armar"
 ARFLAGS          = -r
 
 # Binary file format converter command and options
-OBJCOPY          =
+OBJCOPY          = echo
 OBJCOPYFLAGS     =
 
 # Specify the output extension from compiler
-OBJ_EXT          = .o
+OBJ_EXT          = .obj
 
 # Specify extension from linker
 PROGRAM_FILE_EXT = .out
 
 # Specify extension for final product at end of build
-EXE_FILE_EXT     = $(PROGRAM_FILE_EXT)
+EXE_FILE_EXT     = .hex