diff options
| author | Ha Thach <[email protected]> | 2020-03-10 14:33:26 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-10 14:33:26 +0700 |
| commit | 41d9ab5056c63dc0ecf4b60d55a5f653b561a0c5 (patch) | |
| tree | 1427e6e4bc21eec52ca591665ba3a73d4a7d93e4 /hw | |
| parent | cddbc86dc9403b26b9dda7f0cf141a593e4e89ab (diff) | |
| parent | 9a0c02236e1647bbbeaf3284ab9ba4da0caf56f1 (diff) | |
Merge pull request #295 from hathach/develop
add webserver into ci build
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/bsp/samg55xplained/samg55xplained.c | 3 | ||||
| -rw-r--r-- | hw/bsp/spresense/board.mk | 4 | ||||
| -rw-r--r-- | hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/hw/bsp/samg55xplained/samg55xplained.c b/hw/bsp/samg55xplained/samg55xplained.c index a5e145734..66a3d137f 100644 --- a/hw/bsp/samg55xplained/samg55xplained.c +++ b/hw/bsp/samg55xplained/samg55xplained.c @@ -24,13 +24,14 @@ */ #include "sam.h" +#include "bsp/board.h" + #include "peripheral_clk_config.h" #include "hal/include/hal_init.h" #include "hal/include/hpl_usart_sync.h" #include "hpl/pmc/hpl_pmc.h" #include "hal/include/hal_gpio.h" -#include "bsp/board.h" //--------------------------------------------------------------------+ // MACRO TYPEDEF CONSTANT ENUM DECLARATION diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk index 2e88cf994..c6b5ce12a 100644 --- a/hw/bsp/spresense/board.mk +++ b/hw/bsp/spresense/board.mk @@ -1,5 +1,4 @@ CFLAGS += \ - -DCONFIG_WCHAR_BUILTIN \ -DCONFIG_HAVE_DOUBLE \ -Dmain=spresense_main \ -pipe \ @@ -14,6 +13,9 @@ CFLAGS += \ -fomit-frame-pointer \ -DCFG_TUSB_MCU=OPT_MCU_CXD56 \ +# lwip/src/core/raw.c:334:43: error: declaration of 'recv' shadows a global declaration +CFLAGS += -Wno-error=shadow + SPRESENSE_SDK = $(TOP)/hw/mcu/sony/cxd56/spresense-exported-sdk INC += \ diff --git a/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld b/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld index 7ae8e5960..59e18f375 100644 --- a/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld +++ b/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld @@ -55,8 +55,8 @@ ENTRY(Reset_Handler) /* Highest address of the user mode stack */ _estack = 0x20004000; /* end of "RAM" Ram type memory */ -_Min_Heap_Size = 0x400; /* required amount of heap */ -_Min_Stack_Size = 0x600; /* required amount of stack */ +_Min_Heap_Size = 0x200; /* required amount of heap */ +_Min_Stack_Size = 0x400; /* required amount of stack */ /* Memories definition */ MEMORY |