diff options
author | Raghu Nambiath | 2017-10-18 14:18:28 -0500 |
---|---|---|
committer | Raghu Nambiath | 2017-10-18 14:18:28 -0500 |
commit | 2ddd9e632539763c7bcc377e00150b502146c702 (patch) | |
tree | cbebb91332c5235bdff73ad6ff485235f0d93e75 | |
parent | 636bb5645014723c54c08245cf8c2ee401eceb4f (diff) | |
parent | 0671c472d0d9f58758656f675228b2cf001953c3 (diff) | |
download | pruss-lld-2ddd9e632539763c7bcc377e00150b502146c702.tar.gz pruss-lld-2ddd9e632539763c7bcc377e00150b502146c702.tar.xz pruss-lld-2ddd9e632539763c7bcc377e00150b502146c702.zip |
Merge pull request #28 in PROCESSOR-SDK/pruss-lld from rtos-next to master
* commit '0671c472d0d9f58758656f675228b2cf001953c3':
PRSDK-3120: Removed fpu library path from ARM project text files, update linker flags for GCC 6.3.1 ARM toolchain
7 files changed, 7 insertions, 7 deletions
diff --git a/example/apps/sorte/master/makefile b/example/apps/sorte/master/makefile index 79f2fe7..dbc4e82 100644 --- a/example/apps/sorte/master/makefile +++ b/example/apps/sorte/master/makefile | |||
@@ -9,7 +9,7 @@ INCDIR = ../src | |||
9 | SRCS_COMMON += main.c | 9 | SRCS_COMMON += main.c |
10 | 10 | ||
11 | CFLAGS_LOCAL_COMMON = -finstrument-functions -DSORTE_MASTER | 11 | CFLAGS_LOCAL_COMMON = -finstrument-functions -DSORTE_MASTER |
12 | LNKFLAGS_LOCAL_COMMON = -g -gdwarf-3 -gstrict-dwarf -Wall -Wl,--defsym,STACKSIZE=0x1C000 -Wl,--defsym,HEAPSIZE=0x400 | 12 | LNKFLAGS_LOCAL_COMMON = -g -gdwarf-3 -gstrict-dwarf -Wall -Wl,--defsym,STACKSIZE=0x1C000 -Wl,--defsym,HEAPSIZE=0x400 --specs=nano.specs |
13 | 13 | ||
14 | ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x)) | 14 | ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x)) |
15 | EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd | 15 | EXTERNAL_LNKCMD_FILE_LOCAL = ${PDK_INSTALL_PATH}/ti/build/pruss/lnk_a8_a9_a15_REV1.cmd |
diff --git a/example/apps/sorte/slave/makefile b/example/apps/sorte/slave/makefile index 65a4dce..58fe2ed 100644 --- a/example/apps/sorte/slave/makefile +++ b/example/apps/sorte/slave/makefile | |||
@@ -11,7 +11,7 @@ SRCS_COMMON += main.c | |||
11 | CFLAGS_LOCAL_COMMON = -finstrument-functions -DSORTE_SLAVE | 11 | CFLAGS_LOCAL_COMMON = -finstrument-functions -DSORTE_SLAVE |
12 | EXTERNAL_LNKCMD_FILE_LOCAL = $(pruss_app_sorte_slave_PATH)/../src/lnk.cmd | 12 | EXTERNAL_LNKCMD_FILE_LOCAL = $(pruss_app_sorte_slave_PATH)/../src/lnk.cmd |
13 | 13 | ||
14 | LNKFLAGS_LOCAL_COMMON = -g -gdwarf-3 -gstrict-dwarf -Wall -Wl,--defsym,STACKSIZE=0x1C000 -Wl,--defsym,HEAPSIZE=0x400 | 14 | LNKFLAGS_LOCAL_COMMON = -g -gdwarf-3 -gstrict-dwarf -Wall -Wl,--defsym,STACKSIZE=0x1C000 -Wl,--defsym,HEAPSIZE=0x400 --specs=nano.specs |
15 | 15 | ||
16 | 16 | ||
17 | ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x)) | 17 | ifeq ($(BOARD),$(filter $(BOARD), icev2AM335x)) |
diff --git a/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCFile_armTestproject.txt b/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCFile_armTestproject.txt index 25984eb..1ee6d71 100755 --- a/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCFile_armTestproject.txt +++ b/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCFile_armTestproject.txt | |||
@@ -3,5 +3,5 @@ | |||
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am571x/UART_soc.c" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am571x/UART_soc.c" |
4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am571x/armv7/bios/pruss_test_wSoCFile.cfg" | 4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am571x/armv7/bios/pruss_test_wSoCFile.cfg" |
5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM571x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc | 5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM571x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc |
6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections -L$(BIOS_INSTALL_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu " | 6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
7 | 7 | ||
diff --git a/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCLib_armTestproject.txt b/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCLib_armTestproject.txt index a96a798..48ec706 100755 --- a/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCLib_armTestproject.txt +++ b/test/am571x/armv7/bios/PRUSS_BasicExample_idkAM571x_wSoCLib_armTestproject.txt | |||
@@ -2,5 +2,5 @@ | |||
2 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am571x/UART_soc.c" | 2 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am571x/UART_soc.c" |
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am571x/armv7/bios/pruss_test_wSoCLib.cfg" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am571x/armv7/bios/pruss_test_wSoCLib.cfg" |
4 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM571x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc | 4 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM571x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc |
5 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections -L$(BIOS_INSTALL_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu " | 5 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
6 | 6 | ||
diff --git a/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCFile_armTestproject.txt b/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCFile_armTestproject.txt index 1a15660..0e7aa18 100644 --- a/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCFile_armTestproject.txt +++ b/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCFile_armTestproject.txt | |||
@@ -3,5 +3,5 @@ | |||
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" |
4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am572x/armv7/bios/pruss_arm_wSoCFile.cfg" | 4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am572x/armv7/bios/pruss_arm_wSoCFile.cfg" |
5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc | 5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DDRA7xx -DSOC_AM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc |
6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections -L$(BIOS_INSTALL_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu " | 6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
7 | 7 | ||
diff --git a/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCLib_armTestproject.txt b/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCLib_armTestproject.txt index 5a39947..bc8351d 100755 --- a/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCLib_armTestproject.txt +++ b/test/am572x/armv7/bios/PRUSS_BasicExample_idkAM572x_wSoCLib_armTestproject.txt | |||
@@ -2,5 +2,5 @@ | |||
2 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" | 2 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/am572x/UART_soc.c" |
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am572x/armv7/bios/pruss_arm_wSoCLib.cfg" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/am572x/armv7/bios/pruss_arm_wSoCLib.cfg" |
4 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DSOC_AM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc | 4 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DSOC_AM572x -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc |
5 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections -L$(BIOS_INSTALL_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu " | 5 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
6 | 6 | ||
diff --git a/test/k2g/armv7/bios/PRUSS_BasicExample_iceK2G_wSoCFile_armTestproject.txt b/test/k2g/armv7/bios/PRUSS_BasicExample_iceK2G_wSoCFile_armTestproject.txt index 401178c..8ff6ad7 100644 --- a/test/k2g/armv7/bios/PRUSS_BasicExample_iceK2G_wSoCFile_armTestproject.txt +++ b/test/k2g/armv7/bios/PRUSS_BasicExample_iceK2G_wSoCFile_armTestproject.txt | |||
@@ -3,5 +3,5 @@ | |||
3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/k2g/UART_soc.c" | 3 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/uart/soc/k2g/UART_soc.c" |
4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/k2g/armv7/bios/pruss_arm_wSoCFile.cfg" | 4 | -ccs.linkFile "PDK_INSTALL_PATH/ti/drv/pruss/test/k2g/armv7/bios/pruss_arm_wSoCFile.cfg" |
5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DSOC_K2G -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc | 5 | -ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard -DSOC_K2G -g -gstrict-dwarf -gdwarf-3 -finstrument-functions -Wall -MMD -MP -I${PDK_INSTALL_PATH}/ti/drv/pruss " -rtsc.enableRtsc |
6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections -L$(BIOS_INSTALL_PATH)/packages/gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu " | 6 | -ccs.setLinkerOptions " -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections " |
7 | 7 | ||