Change required for moving to new BIOS version

[keystone-rtos/edma3_lld.git] / makerules / rules_a15.mk

diff --git a/makerules/rules_a15.mk b/makerules/rules_a15.mk
index a2b376c9c1ede7452c1dc2869ba766cfaee96ab3..7e0929f731e4da4b91037023e7d26ce5f66a2b2c 100644 (file)
--- a/makerules/rules_a15.mk
+++ b/makerules/rules_a15.mk
@@ -13,7 +13,8 @@
 CODEGEN_INCLUDE = $(CODEGEN_PATH_A15)/arm-none-eabi/include\r
 CC = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc \r
 AR = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ar\r
-LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld\r
+#LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-ld\r
+LNK = $(CODEGEN_PATH_A15)/bin/arm-none-eabi-gcc\r
 \r
 # XDC Specific defines\r
 ifneq ($(XDC_CFG_FILE_$(CORE)),)\r
@@ -43,11 +44,11 @@ ifneq ($(XDC_CFG_FILE_$(CORE)),)
 #  XDC_GREP_STRING += \|$(CONFIGURO_DIRNAME)\r
 endif\r
 # Internal CFLAGS - normally doesn't change\r
-CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame  \r
+CFLAGS_INTERNAL = -Wall -Wunknown-pragmas -c -mcpu=cortex-a15 -g -mfpu=neon -mfloat-abi=hard -mabi=aapcs -mapcs-frame  -Wswitch\r
 #-ffunction-sections -fdata-sections\r
 CFLAGS_DIROPTS =\r
 \r
-#LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections\r
+LNKFLAGS_INTERNAL = -nostartfiles -static -Wl,--gc-sections -mfloat-abi=hard\r
 \r
 # CFLAGS based on profile selected\r
 CFLAGS_XDCINTERNAL = -Dxdc_target_name__=A15F -Dxdc_target_types__=gnu/targets/arm/std.h -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_xem3.h'\r
@@ -118,7 +119,7 @@ _LNKFLAGS = $(LNKFLAGS_INTERNAL) $(LNKFLAGS_INTERNAL_COMMON) $(LNKFLAGS_INTERNAL
 \r
 # Path of the RTS library - normally doesn't change for a given tool-chain\r
 RTSLIB_PATH =\r
-LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/lib/gcc/arm-none-eabi/4.7.3/fpu/libgcc.a\r
+LIB_PATHS += $(EXT_LIB_a15host) $(CODEGEN_PATH_A15)/lib/gcc/arm-none-eabi/4.7.3/fpu/libgcc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libc.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libm.a  $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/librdimon.a $(CODEGEN_PATH_A15)/arm-none-eabi/lib/fpu/libg.a\r
 \r
 \r
 LNK_LIBS = $(addprefix -l,$(LIB_PATHS))\r
@@ -137,7 +138,7 @@ endif
 $(EXE_NAME) : $(OBJ_PATHS_ASM) $(OBJ_PATHS) $(LIB_PATHS) $(LNKCMD_FILE)  $(CONFIGURO_DIR)/package/cfg/$(CFG_COBJ_XDC)\r
        $(ECHO) \# Linking into $(EXE_NAME)...\r
        $(ECHO) \#\r
-       $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -T $(LNKCMD_FILE) -Map $@.map $(LIB_PATHS) -o $@ \r
+       $(LNK) $(_LNKFLAGS) $(OBJ_PATHS_ASM) $(OBJ_PATHS) -Wl,-T,$(LNKCMD_FILE) -Wl,-Map,$@.map $(LIB_PATHS) -o $@\r
        $(ECHO) \#\r
        $(ECHO) \# $@ created.\r
        $(ECHO) \#\r
@@ -155,7 +156,7 @@ endif
 \r
 # XDC specific - assemble XDC-Configuro command\r
 CONFIGURO_CMD = $(xdc_PATH)/xs xdc.tools.configuro --generationOnly -o $(CONFIGURO_DIR) -t $(TARGET_XDC) -p "$(PLATFORM_XDC_NAME)" \\r
-               -r debug -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)\r
+               -r $(PROFILE_$(CORE)) -c $(CODEGEN_PATH_A15) -b $(CONFIG_BLD_FILE) $(XDC_CFG_FILE_NAME)\r
 _XDC_GREP_STRING = \"$(XDC_GREP_STRING)\"\r
 EGREP_CMD = $(EGREP) -ivw $(XDC_GREP_STRING) $(XDCLNKCMD_FILE)\r
 \r