diff options
| author | Damien George | 2017-01-24 23:53:53 +1100 |
|---|---|---|
| committer | Damien George | 2017-01-27 13:19:11 +1100 |
| commit | 8d5c6332c035e2b7d919616905d0aef37827585a (patch) | |
| tree | 0ebd393ca4e0cf9ee09c35f102ad208cbbc62a33 | |
| parent | 94d87fbb308bf26e35cbb50f294fb06f178df871 (diff) | |
esp8266: Switch to use OO version of FatFs library.
| -rw-r--r-- | esp8266/Makefile | 4 | ||||
| -rw-r--r-- | esp8266/esp8266_common.ld | 2 | ||||
| -rw-r--r-- | esp8266/mpconfigport.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index d63d5c255..5e61fc16d 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -133,8 +133,8 @@ LIB_SRC_C = $(addprefix lib/,\ ifeq ($(MICROPY_FATFS), 1) LIB_SRC_C += \ - lib/fatfs/ff.c \ - lib/fatfs/option/ccsbcs.c + lib/oofatfs/ff.c \ + lib/oofatfs/option/unicode.c endif DRIVERS_SRC_C = $(addprefix drivers/,\ diff --git a/esp8266/esp8266_common.ld b/esp8266/esp8266_common.ld index d22a53865..f721c28b0 100644 --- a/esp8266/esp8266_common.ld +++ b/esp8266/esp8266_common.ld @@ -113,7 +113,7 @@ SECTIONS *extmod/*.o*(.literal* .text*) - *lib/fatfs/*.o*(.literal*, .text*) + *lib/oofatfs/*.o*(.literal*, .text*) */libaxtls.a:(.literal*, .text*) *lib/berkeley-db-1.xx/*.o(.literal*, .text*) *lib/libm/*.o*(.literal*, .text*) diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 0c4bda6bd..952e6bec9 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -94,6 +94,7 @@ #define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32 #define MICROPY_QSTR_EXTRA_POOL mp_qstr_frozen_const_pool +#define MICROPY_FATFS_OO (1) #define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_RPATH (2) #define MICROPY_FATFS_VOLUMES (2) |