diff --git a/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.mld b/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.mld index c0904cbf..9ffee57b 100755 --- a/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.mld +++ b/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.mld @@ -25,7 +25,7 @@ OPTION supported_peripherals = (microblaze ps7_cortexa9 psu_cortexr5); OPTION COPYFILES = all; OPTION NAME = freertos821_xilinx; OPTION VERSION = 1.0; -OPTION DEPENDS = (standalone_v5_2); +OPTION DEPENDS = (standalone_v5_3); OPTION APP_LINKER_FLAGS = "-Wl,--start-group,-lxil,-lfreertos,-lgcc,-lc,--end-group"; OPTION DESC = "FreeRTOS is a market leading open source RTOS"; diff --git a/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.tcl b/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.tcl index 655f7f66..b5eb7598 100755 --- a/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.tcl +++ b/ThirdParty/bsp/freertos821_xilinx/data/freertos821_xilinx.tcl @@ -19,7 +19,7 @@ # standalone bsp version. set this to the latest "ACTIVE" version. -set standalone_version standalone_v5_2 +set standalone_version standalone_v5_3 proc FreeRTOS_drc {os_handle} { @@ -99,7 +99,8 @@ proc generate {os_handle} { } file delete -force "../${standalone_version}/src/gcc" - + file delete -force "../${standalone_version}/src/iccarm" + file delete -force "../${standalone_version}/src/armcc" set need_config_file "true" set file_handle [::hsi::utils::open_include_file "xparameters.h"] diff --git a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_microblaze b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_microblaze index e404db99..5e6cdaf6 100644 --- a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_microblaze +++ b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_microblaze @@ -103,7 +103,7 @@ KERNEL_AR_OBJS = *.c *.S OUTS = *.o libs: $(KERNEL_AR_OBJS) - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src libs + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src libs @echo "Compiling FreeRTOS" @$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $^ @$(ARCHIVER) -r ${LIBFREERTOS} ${OUTS} @@ -117,14 +117,14 @@ libs: $(KERNEL_AR_OBJS) include_standalone: @echo "includes" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include $(CP) -rf $(INCLUDEFILES) $(INCLUDEDIR) .PHONY: include include: @echo "include" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include ${CP} ${INCLUDEFILES} ${INCLUDEDIR} clean: diff --git a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_ps7_cortexa9 b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_ps7_cortexa9 index c3c6963f..6815fb95 100644 --- a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_ps7_cortexa9 +++ b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_ps7_cortexa9 @@ -105,7 +105,7 @@ OUTS = *.o libs: $(KERNEL_AR_OBJS) - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src libs + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src libs @echo "Compiling FreeRTOS" @$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $^ @$(ARCHIVER) -r ${LIBFREERTOS} ${OUTS} @@ -119,14 +119,14 @@ libs: $(KERNEL_AR_OBJS) include_standalone: @echo "includes" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include $(CP) -rf $(INCLUDEFILES) $(INCLUDEDIR) .PHONY: include include: @echo "include" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include ${CP} ${INCLUDEFILES} ${INCLUDEDIR} clean: diff --git a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_psu_cortexr5 b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_psu_cortexr5 index 96ded738..c7f7a94e 100644 --- a/ThirdParty/bsp/freertos821_xilinx/src/Makefile_psu_cortexr5 +++ b/ThirdParty/bsp/freertos821_xilinx/src/Makefile_psu_cortexr5 @@ -114,7 +114,7 @@ OUTS = *.o libs: $(KERNEL_AR_OBJS) - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src libs + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src libs @echo "Compiling FreeRTOS" @$(COMPILER) $(COMPILER_FLAGS) $(CC_FLAG) $(EXTRA_COMPILER_FLAGS) -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=softfp $(INCLUDES) $^ @$(ARCHIVER) -r ${LIBFREERTOS} ${OUTS} @@ -128,14 +128,14 @@ libs: $(KERNEL_AR_OBJS) include_standalone: @echo "includes" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include $(CP) -rf $(INCLUDEFILES) $(INCLUDEDIR) .PHONY: include include: @echo "include" - $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_2/src include + $(MAKE) -f Makefile_depends -e "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" -C ../../standalone_v5_3/src include ${CP} ${INCLUDEFILES} ${INCLUDEDIR} clean: