diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-05-28 19:25:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 19:25:53 -0400 |
| commit | d98151a434106f54dc267b387e19f7ee6c512332 (patch) | |
| tree | d5fbbc64a7b688bfe3a50be8b8cc03c3e42f6e61 /py | |
| parent | b901def8b300c122139145d7b7d8c423f2b95de3 (diff) | |
| parent | 796373b8be015644425a1167c5c3b64f7a010c8d (diff) | |
Merge pull request #2972 from tannewt/esp32s2_fixes1
A number of small ESP32S2 fixes
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_defns.mk | 1 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 9e36f2e6a..46e8d43d3 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -48,7 +48,6 @@ BASE_CFLAGS = \ -D__$(CHIP_VARIANT)__ \ -ffunction-sections \ -fdata-sections \ - -fshort-enums \ -DCIRCUITPY_SOFTWARE_SAFE_MODE=0x0ADABEEF \ -DCIRCUITPY_CANARY_WORD=0xADAF00 \ -DCIRCUITPY_SAFE_RESTART_WORD=0xDEADBEEF \ diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 5f2605c92..62ef9062d 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -121,7 +121,9 @@ #define MICROPY_REPL_EVENT_DRIVEN (0) #define MICROPY_STACK_CHECK (1) #define MICROPY_STREAMS_NON_BLOCK (1) +#ifndef MICROPY_USE_INTERNAL_PRINTF #define MICROPY_USE_INTERNAL_PRINTF (1) +#endif // fatfs configuration used in ffconf.h // |