From 7ff14a652ba1348f863338479eb3347a06fcc80a Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 1 Mar 2021 22:13:21 +0700 Subject: [PATCH] add submodule lib/FreeRTOS-Kernel --- .github/workflows/build.yml | 5 +- .gitmodules | 3 ++ examples/device/cdc_msc_freertos/Makefile | 2 +- .../ses/lpc175x_6x/lpc175x_6x.emProject | 50 +++++++++---------- .../ses/nrf5x/nrf5x.emProject | 48 +++++++++--------- .../ses/samd21/samd21.emProject | 48 +++++++++--------- .../ses/samd51/samd51.emProject | 48 +++++++++--------- .../cdc_msc_freertos/src/freertos_hook.c | 2 +- .../device/hid_composite_freertos/Makefile | 2 +- .../src/freertos_hook.c | 2 +- lib/FreeRTOS-Kernel | 1 + 11 files changed, 106 insertions(+), 105 deletions(-) create mode 160000 lib/FreeRTOS-Kernel diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0698e6385..b63a9a031 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,11 +130,8 @@ jobs: with: submodules: 'true' - - name: Checkout Sub-Submodules + - name: Setup Env run: | - # some submodule has it own submodules that need to be fetched as well - git submodule update --init --recursive lib/FreeRTOS - # Add msp430-gcc url to env echo >> $GITHUB_ENV MSP430_GCC_URL=http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2 diff --git a/.gitmodules b/.gitmodules index 1ec196a48..e33532c4e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -114,3 +114,6 @@ url = https://github.com/raspberrypi/pico-sdk.git fetchRecurseSubmodules = false +[submodule "lib/FreeRTOS-Kernel"] + path = lib/FreeRTOS-Kernel + url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/examples/device/cdc_msc_freertos/Makefile b/examples/device/cdc_msc_freertos/Makefile index 3570daa41..36174b5e1 100644 --- a/examples/device/cdc_msc_freertos/Makefile +++ b/examples/device/cdc_msc_freertos/Makefile @@ -1,7 +1,7 @@ include ../../../tools/top.mk include ../../make.mk -FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source +FREERTOS_SRC = lib/FreeRTOS-Kernel INC += \ src \ diff --git a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject index 4dc111f2e..691f8c3b0 100644 --- a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject +++ b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject @@ -20,7 +20,7 @@ arm_target_interface_type="SWD" build_treat_warnings_as_errors="No" c_preprocessor_definitions="LPC175x_6x;__LPC1700_FAMILY;__LPC176x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC175X_6X" - c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS/Source/include;$(rootDir)/lib/FreeRTOS/Source/portable/GCC/ARM_CM3" + c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS-Kernel/include;$(rootDir)/lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3" debug_register_definition_file="LPC176x5x_Registers.xml" debug_target_connection="J-Link" gcc_enable_all_warnings="Yes" @@ -92,39 +92,39 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + diff --git a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject index f01b26d23..e964d6fb5 100644 --- a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject +++ b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject @@ -107,39 +107,39 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + diff --git a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject index b8b099b68..b3db856d3 100644 --- a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject +++ b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject @@ -100,39 +100,39 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + diff --git a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject index d84d070c0..77ff38b62 100644 --- a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject +++ b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject @@ -104,39 +104,39 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + diff --git a/examples/device/cdc_msc_freertos/src/freertos_hook.c b/examples/device/cdc_msc_freertos/src/freertos_hook.c index 423bad4d3..df15a8de7 100644 --- a/examples/device/cdc_msc_freertos/src/freertos_hook.c +++ b/examples/device/cdc_msc_freertos/src/freertos_hook.c @@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void) TU_ASSERT(false, ); } -void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName) +void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName) { (void) pxTask; (void) pcTaskName; diff --git a/examples/device/hid_composite_freertos/Makefile b/examples/device/hid_composite_freertos/Makefile index cef1af5a6..db7dfd345 100644 --- a/examples/device/hid_composite_freertos/Makefile +++ b/examples/device/hid_composite_freertos/Makefile @@ -1,7 +1,7 @@ include ../../../tools/top.mk include ../../make.mk -FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source +FREERTOS_SRC = lib/FreeRTOS-Kernel INC += \ src \ diff --git a/examples/device/hid_composite_freertos/src/freertos_hook.c b/examples/device/hid_composite_freertos/src/freertos_hook.c index 423bad4d3..df15a8de7 100644 --- a/examples/device/hid_composite_freertos/src/freertos_hook.c +++ b/examples/device/hid_composite_freertos/src/freertos_hook.c @@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void) TU_ASSERT(false, ); } -void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName) +void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName) { (void) pxTask; (void) pcTaskName; diff --git a/lib/FreeRTOS-Kernel b/lib/FreeRTOS-Kernel new file mode 160000 index 000000000..2a604f4a2 --- /dev/null +++ b/lib/FreeRTOS-Kernel @@ -0,0 +1 @@ +Subproject commit 2a604f4a2818b8354b5e1a39e388eb5e16cfbc1f