PRSDK-2098: Fix for OMAPL13x ARM9 example build issue

diff --git a/makerules/platform.mk b/makerules/platform.mk
index 247d99f7f7425ac2f8084fb9a9befab345560881..3aa923a034decde7deec8ad9a1b8b4ebfcbc7179 100755 (executable)
--- a/makerules/platform.mk
+++ b/makerules/platform.mk
@@ -183,18 +183,18 @@ ifeq ($(PLATFORM),tci66ak2g02-evm)
  PLATFORM_XDC = "ti.platforms.evmTCI66AK2G02"
 endif
 
+# omapl137 (Primus) EVM
+ifeq ($(PLATFORM),omapl137-evm)
+ SOC = omapl137
+ PLATFORM_XDC = "ti.platforms.evmOMAPL137"
+endif
+
 # omapl138 (Freon) EVM
 ifeq ($(PLATFORM),omapl138-evm)
  SOC = omapl138
  PLATFORM_XDC = "ti.platforms.evmOMAPL138"
 endif
 
-# omapl137 (Freon) EVM
-ifeq ($(PLATFORM),omapl137-evm)
- SOC = omapl137
- PLATFORM_XDC = "ti.platforms.evmOMAPL137"
-endif
-
 # c6748 (Freon) EVM
 ifeq ($(PLATFORM),c6748-evm)
  SOC = omapl138

diff --git a/makerules/rules_arm9.mk b/makerules/rules_arm9.mk
index c09a438a8085d27615031807f3878ba88875b118..e82c339f6ed1e669dfa8497c2f01cf0e8e7faa74 100755 (executable)
--- a/makerules/rules_arm9.mk
+++ b/makerules/rules_arm9.mk
@@ -46,7 +46,7 @@ ifneq ($(XDC_CFG_FILE_$(CORE)),)
   endif\r
   CFG_CFILE_XDC =$(patsubst %.cfg,%_$(CFG_CFILENAMEPART_XDC).c,$(notdir $(XDC_CFG_FILE_$(CORE))))\r
   CFG_C_XDC = $(addprefix $(CONFIGURO_DIR)/package/cfg/,$(CFG_CFILE_XDC))\r
-  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC)_x.xdl, $(CFG_C_XDC))\r
+  XDCLNKCMD_FILE =$(patsubst %.c, %$(CFG_LNKFILENAMEPART_XDC).xdl, $(CFG_C_XDC))\r
   CFG_COBJ_XDC = $(patsubst %.c,%.$(OBJEXT),$(CFG_CFILE_XDC))\r
 #  OBJ_PATHS += $(CFG_COBJ_XDC)\r
   LNKCMD_FILE = $(CONFIGURO_DIR)/linker_mod.cmd\r
@@ -63,7 +63,7 @@ CFLAGS_DIROPTS = -fr=$(OBJDIR) -fs=$(OBJDIR)
 \r
 # CFLAGS based on profile selected\r
 ifeq ($(PROFILE_$(CORE)), debug)\r
- CFLAGS_XDCINTERNAL = -g --symdebug:dwarf -Dxdc_target_name__=Arm9 -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_debug -Dxdc_bld__vers_1_0_4_6_1 -D_DEBUG_=1 \r
+ CFLAGS_XDCINTERNAL = -Dxdc_target_name__=Arm9 -Dxdc_target_types__=ti/targets/arm/elf/std.h -Dxdc_bld__profile_debug -Dxdc_bld__vers_1_0_4_6_1 -D_DEBUG_=1 \r
  ifndef MODULE_NAME\r
   CFLAGS_XDCINTERNAL += -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_xem3.h' --diag_warning=225 -me --abi=eabi --code_state=32 --preproc_with_compile \r
  endif\r
@@ -95,27 +95,27 @@ endif
 #   components are on which core.\r
 ifndef MODULE_NAME\r
   # Derive list of all packages from each of the components needed by the app\r
-  PKG_LIST_A8 = $(foreach COMP,$(COMP_LIST_$(CORE)),$($(COMP)_PKG_LIST))\r
+  PKG_LIST_ARM9_LOCAL = $(foreach COMP,$(COMP_LIST_$(CORE)),$($(COMP)_PKG_LIST))\r
   \r
   # Defines for the app and cfg source code to know which components/packages\r
   # are included in the build for the local CORE...\r
-  CFLAGS_APP_DEFINES = $(foreach PKG,$(PKG_LIST_A8_LOCAL),-D_LOCAL_$(PKG)_)\r
-  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_A8_LOCAL),-D_BUILD_$(PKG)_)\r
+  CFLAGS_APP_DEFINES = $(foreach PKG,$(PKG_LIST_ARM9_LOCAL),-D_LOCAL_$(PKG)_)\r
+  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_ARM9_LOCAL),-D_BUILD_$(PKG)_)\r
   \r
   ifeq ($(CORE),m3vpss)\r
-    PKG_LIST_A8_REMOTE = $(foreach COMP,$(COMP_LIST_m3video),$($(COMP)_PKG_LIST))\r
+    PKG_LIST_ARM9_REMOTE = $(foreach COMP,$(COMP_LIST_m3video),$($(COMP)_PKG_LIST))\r
     CFLAGS_APP_DEFINES += -D_LOCAL_CORE_m3vpss_\r
   endif\r
   ifeq ($(CORE),m3video)\r
-    PKG_LIST_A8_REMOTE = $(foreach COMP,$(COMP_LIST_m3vpss),$($(COMP)_PKG_LIST))\r
+    PKG_LIST_ARM9_REMOTE = $(foreach COMP,$(COMP_LIST_m3vpss),$($(COMP)_PKG_LIST))\r
     CFLAGS_APP_DEFINES += -D_LOCAL_CORE_m3video_\r
   endif\r
-  PKG_LIST_A8_REMOTE = $(foreach COMP,$(COMP_LIST_a8host),$($(COMP)_PKG_LIST))\r
+  PKG_LIST_ARM9_REMOTE = $(foreach COMP,$(COMP_LIST_arm9),$($(COMP)_PKG_LIST))\r
 \r
   # Defines for the app and cfg source code to know which components/packages\r
   # are included in the build for the remote CORE...\r
-  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_A8_REMOTE),-D_REMOTE_$(PKG)_)\r
-  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_A8_REMOTE),-D_BUILD_$(PKG)_)\r
+  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_ARM9_REMOTE),-D_REMOTE_$(PKG)_)\r
+  CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_ARM9_REMOTE),-D_BUILD_$(PKG)_)\r
   CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_A8_REMOTE),-D_REMOTE_$(PKG)_)\r
   CFLAGS_APP_DEFINES += $(foreach PKG,$(PKG_LIST_A8_REMOTE),-D_BUILD_$(PKG)_)\r
 endif\r
@@ -148,7 +148,7 @@ LNKFLAGS_INTERNAL_COMMON = -w -q -u _c_int00 --silicon_version=5e -c --dynamic
 _LNKFLAGS = $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL_PROFILE) $(LNKFLAGS_GLOBAL_$(CORE)) $(LNKFLAGS_LOCAL_COMMON) $(LNKFLAGS_LOCAL_$(CORE)) \r
 \r
 # Path of the RTS library - normally doesn't change for a given tool-chain\r
-#RTSLIB_PATH = $(CODEGEN_PATH_A8)/lib/rtsv5_A_$(RTSLIB_ENDIAN)_$(RTSLIB_FORMAT).lib\r
+RTSLIB_PATH = $(CODEGEN_PATH_ARM9)/lib/libc.a\r
 LIB_PATHS += $(RTSLIB_PATH)\r
 \r
 LNK_LIBS = $(addprefix -l,$(LIB_PATHS))\r
@@ -161,7 +161,7 @@ endif
 $(BINDIR)/$(APP_NAME)_$(CORE)_$(PROFILE_$(CORE)).$(EXEEXT) : $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE) $(OBJDIR)/$(CFG_COBJ_XDC)\r
        $(ECHO) \# Linking into $@\r
        $(ECHO) \#\r
-       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) $(OBJDIR)/$(CFG_COBJ_XDC) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS) -l$(CODEGEN_PATH_A8)/lib/libc.a \r
+       cd $(TMPOBJDIR) && $(LNK) $(_LNKFLAGS) $(OBJ_PATHS) -l$(LNKCMD_FILE) sample_app/linker.cmd -o $@ -m $@.map $(LNK_LIBS)\r
        $(ECHO) \#\r
        $(ECHO) \# $@ created.\r
        $(ECHO) \#\r
@@ -184,15 +184,17 @@ endif
 #           XDC. An egrep to search for these and omit in the .cmd file is added\r
 #           after configuro is done\r
 #$(CFG_CFILE_XDC) : $(XDC_CFG_FILE)\r
-xdc_configuro : $(XDC_CFG_FILE)\r
+xdc_configuro : $(XDC_CFG_FILE) $(CONFIGURO_DIR)\r
        $(ECHO) \# Invoking configuro...\r
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
 ifeq ($(OS),Windows_NT)\r
+       CACLS $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat /E /P Everyone:F\r
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
 else\r
        ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
 endif\r
+\r
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)\r
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat\r
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)\r
@@ -211,6 +213,7 @@ $(OBJDIR)/$(CFG_COBJ_XDC) : $(CFG_C_XDC)
        $(ECHO) \# Compiling generated $< to $@ ...\r
        $(CC) -ppd=$(DEPFILE).P $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)\r
        $(CC) $(_CFLAGS) $(INCLUDES) $(CFLAGS_DIROPTS) -fc $(CFG_C_XDC)\r
+       $(CP) $(OBJDIR)/$(CFG_COBJ_XDC) $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC)\r
 endif\r
 \r
 # Include dependency make files that were generated by $(CC)\r