Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Cypress kernel dependency workaround (#1750)
Browse files Browse the repository at this point in the history 
* From FreeRTOS kernel 10.2.0, copying over Wiced_CY port to vendor directory.

* Make Cortex R4 target use the kernel files at new location.

* The project file update probably won't matter, but in IDE at least you'll now get the correct source files.
  • Loading branch information
@yuhui-zheng
yuhui-zheng committed Feb 12, 2020
1 parent b92209f commit 141ce6f
Show file tree
Hide file tree
Showing 8 changed files with 790 additions and 19 deletions.
8 changes: 4 additions & 4 deletions projects/cypress/CYW943907AEVAL1F/wicedstudio/aws_demos/.project
View file
Expand Up @@ -142,14 +142,14 @@
<locationURI>BASE_DIR/freertos_kernel/portable/MemMang/heap_3.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/port.c</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</name>
<type>1</type>
<locationURI>BASE_DIR/freertos_kernel/portable/GCC/ARM_CM4F/port.c</locationURI>
<locationURI>BASE_DIR/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</name>
<type>1</type>
<locationURI>BASE_DIR/freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</locationURI>
<locationURI>BASE_DIR/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</locationURI>
</link>
<link>
<name>demos/demo_runner/aws_demo_version.c</name>
Expand Down
8 changes: 4 additions & 4 deletions projects/cypress/CYW943907AEVAL1F/wicedstudio/aws_tests/.project
View file
Expand Up @@ -137,14 +137,14 @@
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/include/timers.h</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/port.c</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</name>
<type>1</type>
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/portable/GCC/ARM_CM4F/port.c</locationURI>
<locationURI>AWS_IOT_MCU_ROOT/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</name>
<type>1</type>
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</locationURI>
<locationURI>AWS_IOT_MCU_ROOT/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</locationURI>
</link>
<link>
<name>freertos_kernel/portable/MemMang/heap_3.c</name>
Expand Down
8 changes: 4 additions & 4 deletions projects/cypress/CYW954907AEVAL1F/wicedstudio/aws_demos/.project
View file
Expand Up @@ -142,14 +142,14 @@
<locationURI>BASE_DIR/freertos_kernel/portable/MemMang/heap_3.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/port.c</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</name>
<type>1</type>
<locationURI>BASE_DIR/freertos_kernel/portable/GCC/ARM_CM4F/port.c</locationURI>
<locationURI>BASE_DIR/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</name>
<type>1</type>
<locationURI>BASE_DIR/freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</locationURI>
<locationURI>BASE_DIR/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</locationURI>
</link>
<link>
<name>demos/demo_runner/aws_demo_version.c</name>
Expand Down
8 changes: 4 additions & 4 deletions projects/cypress/CYW954907AEVAL1F/wicedstudio/aws_tests/.project
View file
Expand Up @@ -137,14 +137,14 @@
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/include/timers.h</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/port.c</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</name>
<type>1</type>
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/portable/GCC/ARM_CM4F/port.c</locationURI>
<locationURI>AWS_IOT_MCU_ROOT/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c</locationURI>
</link>
<link>
<name>freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</name>
<name>vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</name>
<type>1</type>
<locationURI>AWS_IOT_MCU_ROOT/freertos_kernel/portable/GCC/ARM_CM4F/portmacro.h</locationURI>
<locationURI>AWS_IOT_MCU_ROOT/vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portmacro.h</locationURI>
</link>
<link>
<name>freertos_kernel/portable/MemMang/heap_3.c</name>
Expand Down
6 changes: 3 additions & 3 deletions vendors/cypress/WICED_SDK/WICED/RTOS/FreeRTOS/FreeRTOS.mk
View file
Expand Up @@ -90,9 +90,9 @@ $(NAME)_ARM_CM4_INCLUDES := $($(NAME)_ARM_CM3_INCLUDES)
# $(AMAZON_FREERTOS_PATH)lib/FreeRTOS/portable/GCC/ARM_CRx_No_GIC/portASM.S
#$(NAME)_ARM_CR4_INCLUDES := $(AMAZON_FREERTOS_PATH)lib/FreeRTOS/portable/GCC/ARM_CRx_No_GIC

$(NAME)_ARM_CR4_SOURCES := $(AMAZON_FREERTOS_PATH)freertos_kernel/portable/ThirdParty/GCC/Wiced_CY/port.c \
$(AMAZON_FREERTOS_PATH)freertos_kernel/portable/ThirdParty/GCC/Wiced_CY/portASM.S
$(NAME)_ARM_CR4_INCLUDES := $(AMAZON_FREERTOS_PATH)freertos_kernel/portable/ThirdParty/GCC/Wiced_CY/
$(NAME)_ARM_CR4_SOURCES := $(AMAZON_FREERTOS_PATH)vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/port.c \
$(AMAZON_FREERTOS_PATH)vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/portASM.S
$(NAME)_ARM_CR4_INCLUDES := $(AMAZON_FREERTOS_PATH)vendors/cypress/freertos_thirdparty_port/GCC/Wiced_CY/

$(NAME)_SOURCES += $($(NAME)_$(HOST_ARCH)_SOURCES)
GLOBAL_INCLUDES += $($(NAME)_$(HOST_ARCH)_INCLUDES)
Expand Down

0 comments on commit 141ce6f

Please sign in to comment.