Skip to content

Commit 01448d0

Browse files
VynDragondpgeorge
authored andcommitted
zephyr: Remove defaulting to newlib.
Remove CONFIG_NEWLIB_LIBC=y, as it seems it is now unecessary. Signed-off-by: Vdragon <[email protected]>
1 parent ddd6ca7 commit 01448d0

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

ports/zephyr/mpconfigport.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
#define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
6262
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
6363
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
64-
#define MICROPY_PY_MATH_POW_FIX_NAN (1)
6564
#define MICROPY_PY_MACHINE (1)
6665
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/zephyr/modmachine.c"
6766
#define MICROPY_PY_MACHINE_I2C (1)
@@ -173,3 +172,9 @@ typedef long mp_off_t;
173172
k_msleep(1); \
174173
} while (0);
175174
#endif
175+
176+
// Compatibility switches
177+
178+
#ifdef CONFIG_NEWLIB_LIBC
179+
#define MICROPY_PY_MATH_POW_FIX_NAN (1)
180+
#endif

ports/zephyr/mpconfigport_minimal.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
5151
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
5252
#define MICROPY_PY_BUILTINS_COMPLEX (0)
53-
#define MICROPY_PY_MATH_POW_FIX_NAN (1)
5453

5554
// These features are enabled to get the test suite passing.
5655
#define MICROPY_FULL_CHECKS (1)
@@ -80,3 +79,9 @@ typedef long mp_off_t;
8079
#define MP_STATE_PORT MP_STATE_VM
8180

8281
#define MICROPY_EVENT_POLL_HOOK
82+
83+
// Compatibility switches
84+
85+
#ifdef CONFIG_NEWLIB_LIBC
86+
#define MICROPY_PY_MATH_POW_FIX_NAN (1)
87+
#endif

ports/zephyr/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
66
CONFIG_CONSOLE_HANDLER=y
77
CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
88

9-
CONFIG_NEWLIB_LIBC=y
109
CONFIG_FPU=y
1110
CONFIG_MAIN_STACK_SIZE=4736
1211
CONFIG_POLL=y

ports/zephyr/prj_minimal.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_NEWLIB_LIBC=y
21
CONFIG_FPU=y
32
CONFIG_MAIN_STACK_SIZE=4096
43
CONFIG_POLL=y

0 commit comments

Comments
 (0)