summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2020-03-09 15:51:29 +0700
committerhathach <[email protected]>2020-03-09 15:51:29 +0700
commit85a3315a998ce7c625796177a665e6f4cd373e73 (patch)
treea7e50a3577f046362b672675c09ca45aa26cac2c
parente764421164926f1d50db5daecf30893954b18289 (diff)
Adding lwip_webserver to ci
- buil_al.py skip specific MCU if .skip.MCU_ exists - reduce stm32f070 heap & stack size to compile webserver
-rw-r--r--examples/device/lwip_webserver/.skip.MCU_LPC11UXX0
-rw-r--r--examples/device/lwip_webserver/.skip.MCU_LPC13XX0
-rw-r--r--examples/device/lwip_webserver/.skip.MCU_NUC1210
-rw-r--r--examples/device/lwip_webserver/.skip.MCU_STM32L00
-rw-r--r--hw/bsp/samg55xplained/samg55xplained.c3
-rw-r--r--hw/bsp/spresense/board.mk4
-rw-r--r--hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld4
-rw-r--r--src/class/net/net_device.h2
-rw-r--r--tools/build_all.py56
-rw-r--r--tools/build_success.sh10
10 files changed, 48 insertions, 31 deletions
diff --git a/examples/device/lwip_webserver/.skip.MCU_LPC11UXX b/examples/device/lwip_webserver/.skip.MCU_LPC11UXX
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/lwip_webserver/.skip.MCU_LPC11UXX
diff --git a/examples/device/lwip_webserver/.skip.MCU_LPC13XX b/examples/device/lwip_webserver/.skip.MCU_LPC13XX
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/lwip_webserver/.skip.MCU_LPC13XX
diff --git a/examples/device/lwip_webserver/.skip.MCU_NUC121 b/examples/device/lwip_webserver/.skip.MCU_NUC121
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/lwip_webserver/.skip.MCU_NUC121
diff --git a/examples/device/lwip_webserver/.skip.MCU_STM32L0 b/examples/device/lwip_webserver/.skip.MCU_STM32L0
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/lwip_webserver/.skip.MCU_STM32L0
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
diff --git a/src/class/net/net_device.h b/src/class/net/net_device.h
index fee54163f..71483364d 100644
--- a/src/class/net/net_device.h
+++ b/src/class/net/net_device.h
@@ -31,6 +31,8 @@
#include "common/tusb_common.h"
#include "device/usbd.h"
#include "class/cdc/cdc.h"
+
+// TODO should not include external files
#include "lwip/pbuf.h"
#include "netif/ethernet.h"
diff --git a/tools/build_all.py b/tools/build_all.py
index 97294a9a3..45ae8d4d5 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -1,5 +1,5 @@
import os
-import shutil
+import glob
import sys
import subprocess
import time
@@ -10,9 +10,8 @@ exit_status = 0
total_time = time.monotonic()
+# 1st Argument is Example, build all examples if not existed
all_examples = []
-
-# build all example if input not existed
if len(sys.argv) > 1:
all_examples.append(sys.argv[1])
else:
@@ -22,11 +21,17 @@ else:
# TODO update freeRTOS example to work with all boards (only nrf52840 now)
all_examples.remove("cdc_msc_hid_freertos")
+all_examples.sort()
+# 2nd Argument is Board, build all boards if not existed
all_boards = []
-for entry in os.scandir("hw/bsp"):
- if entry.is_dir():
- all_boards.append(entry.name)
+if len(sys.argv) > 2:
+ all_boards.append(sys.argv[2])
+else:
+ for entry in os.scandir("hw/bsp"):
+ if entry.is_dir():
+ all_boards.append(entry.name)
+all_boards.sort()
def build_example(example, board):
@@ -35,6 +40,16 @@ def build_example(example, board):
return subprocess.run("make -j 4 -C examples/device/{} BOARD={} all".format(example, board), shell=True,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+def skip_example(example, board):
+ ex_dir = 'examples/device/' + example
+ board_mk = 'hw/bsp/{}/board.mk'.format(board)
+ for skip_file in glob.iglob(ex_dir + '/.skip.MCU_*'):
+ mcu_cflag = '-DCFG_TUSB_MCU=OPT_' + os.path.basename(skip_file).split('.')[2]
+ with open(board_mk) as mk:
+ if mcu_cflag in mk.read():
+ return 1
+
+ return 0
build_format = '| {:30} | {:30} | {:9} '
build_separator = '-' * 87
@@ -44,20 +59,27 @@ for example in all_examples:
print(build_separator)
for board in all_boards:
start_time = time.monotonic()
- build_result = build_example(example, board)
- build_duration = time.monotonic() - start_time
- if build_result.returncode == 0:
- success = "\033[32msucceeded\033[0m"
- success_count += 1
+ # Check if board is skipped
+ if skip_example(example, board):
+ success = "\033[33mskipped\033[0m "
+ print((build_format + '| {:.2f}s |').format(example, board, success, 0))
else:
- exit_status = build_result.returncode
- success = "\033[31mfailed\033[0m "
- fail_count += 1
+ build_result = build_example(example, board)
+
+ if build_result.returncode == 0:
+ success = "\033[32msucceeded\033[0m"
+ success_count += 1
+ else:
+ exit_status = build_result.returncode
+ success = "\033[31mfailed\033[0m "
+ fail_count += 1
+
+ build_duration = time.monotonic() - start_time
+ print((build_format + '| {:.2f}s |').format(example, board, success, build_duration))
- print((build_format + '| {:.2f}s |').format(example, board, success, build_duration))
- if build_result.returncode != 0:
- print(build_result.stdout.decode("utf-8"))
+ if build_result.returncode != 0:
+ print(build_result.stdout.decode("utf-8"))
# FreeRTOS example
# example = 'cdc_msc_hid_freertos'
diff --git a/tools/build_success.sh b/tools/build_success.sh
deleted file mode 100644
index df725bdce..000000000
--- a/tools/build_success.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Trigger mynewt-tinyusb-example repo each push
-curl -s -X POST \
- -H "Content-Type: application/json" \
- -H "Accept: application/json" \
- -H "Travis-API-Version: 3" \
- -H "Authorization: token $TRAVIS_TOKEN" \
- -d '{ "request": { "branch":"master" }}' \
- https://api.travis-ci.com/repo/hathach%2Fmynewt-tinyusb-example/requests \ No newline at end of file