diff options
| author | Paul Sokolovsky | 2017-01-21 00:26:03 +0300 |
|---|---|---|
| committer | Paul Sokolovsky | 2017-01-21 00:26:03 +0300 |
| commit | f1f2a3cebf607f920cfa44f6aeffe847844edb02 (patch) | |
| tree | 2350520d162c2d5b9a9cf0cc21e985000c4d9119 | |
| parent | 58722103e10fa53e502febf8684c741171416179 (diff) | |
zephyr: Remove deprecated .mdef file.
| -rw-r--r-- | zephyr/Makefile.zephyr | 1 | ||||
| -rw-r--r-- | zephyr/main.c | 4 | ||||
| -rw-r--r-- | zephyr/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/prj.mdef | 5 |
4 files changed, 3 insertions, 8 deletions
diff --git a/zephyr/Makefile.zephyr b/zephyr/Makefile.zephyr index ad905a4db..214767bea 100644 --- a/zephyr/Makefile.zephyr +++ b/zephyr/Makefile.zephyr @@ -18,7 +18,6 @@ KERNEL_TYPE = micro # BOARD must be passed on command line from main Makefile #BOARD = CONF_FILE = prj.conf -MDEF_FILE = prj.mdef #export SOURCE_DIR = $(ZEPHYR_BASE)/samples/static_lib/hello_world export LDFLAGS_zephyr += -L$(CURDIR) diff --git a/zephyr/main.c b/zephyr/main.c index 2c7f3fc47..d812f9609 100644 --- a/zephyr/main.c +++ b/zephyr/main.c @@ -64,8 +64,8 @@ int real_main(void) { int stack_dummy; stack_top = (char*)&stack_dummy; mp_stack_set_top(stack_top); - // Should be set to stack size in prj.mdef minus fuzz factor - mp_stack_set_limit(3584); + // Make MicroPython's stack limit somewhat smaller than full stack available + mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512); soft_reset: #if MICROPY_ENABLE_GC diff --git a/zephyr/prj.conf b/zephyr/prj.conf index 0b0827d25..5d6b353ba 100644 --- a/zephyr/prj.conf +++ b/zephyr/prj.conf @@ -3,3 +3,4 @@ CONFIG_CONSOLE_HANDLER=y CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y CONFIG_NEWLIB_LIBC=y CONFIG_FLOAT=y +CONFIG_MAIN_STACK_SIZE=4096 diff --git a/zephyr/prj.mdef b/zephyr/prj.mdef deleted file mode 100644 index 5a7312f89..000000000 --- a/zephyr/prj.mdef +++ /dev/null @@ -1,5 +0,0 @@ -% Application : MicroPython - -% TASK NAME PRIO ENTRY STACK GROUPS -% ================================== - TASK MAIN 7 main 4096 [EXE] |