10000 stm32/mboot: Update to match latest oofatfs version. · micropython/micropython@f2ebee9 · GitHub
[go: up one dir, main page]
Skip to content

Commit f2ebee9

Browse files
jimmodpgeorge
jimmo
authored and
dpgeorge
committed
stm32/mboot: Update to match latest oofatfs version.
See corresponding commit b5f33ac
1 parent 350dbb8 commit f2ebee9

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

‎ports/stm32/mboot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ endif
7474
SRC_LIB = \
7575
lib/libc/string0.c \
7676
lib/oofatfs/ff.c \
77-
lib/oofatfs/option/unicode.c \
77+
lib/oofatfs/ffunicode.c \
7878
extmod/uzlib/crc32.c \
7979
extmod/uzlib/adler32.c \
8080
extmod/uzlib/tinflate.c \

‎ports/stm32/mboot/ffconf.h

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,40 +24,42 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#define _FFCONF 68020
27+
#define FFCONF_DEF 86604
2828

29-
#define _FS_READONLY 1
30-
#define _FS_MINIMIZE 0
31-
#define _USE_STRFUNC 0
29+
#define FF_FS_READONLY 1
30+
#define FF_FS_MINIMIZE 0
31+
#define FF_USE_STRFUNC 0
3232

33-
#define _USE_FIND 0
34-
#define _USE_MKFS 0
35-
#define _USE_FASTSEEK 0
36-
#define _USE_EXPAND 0
37-
#define _USE_CHMOD 0
38-
#define _USE_LABEL 0
39-
#define _USE_FORWARD 0
33+
#define FF_USE_FIND 0
34+
#define FF_USE_MKFS 0
35+
#define FF_USE_FASTSEEK 0
36+
#define FF_USE_EXPAND 0
37+
#define FF_USE_CHMOD 0
38+
#define FF_USE_LABEL 0
39+
#define FF_USE_FORWARD 0
4040

41-
#define _CODE_PAGE 437
42-
#define _USE_LFN 1
43-
#define _MAX_LFN 255
44-
#define _LFN_UNICODE 0
45-
#define _STRF_ENCODE 3
46-
#define _FS_RPATH 0
41+
#define FF_CODE_PAGE 437
42+
#define FF_USE_LFN 1
43+
#define FF_MAX_LFN 255
44+
#define FF_LFN_UNICODE 0
45+
#define FF_LFN_BUF 255
46+
#define FF_SFN_BUF 12
47+
#define FF_STRF_ENCODE 3
48+
#define FF_FS_RPATH 0
4749

48-
#define _VOLUMES 1
49-
#define _STR_VOLUME_ID 0
50-
#define _MULTI_PARTITION 0
51-
#define _MIN_SS 512
52-
#define _MAX_SS 512
53-
#define _USE_TRIM 0
54-
#define _FS_NOFSINFO 0
50+
#define FF_VOLUMES 1
51+
#define FF_STR_VOLUME_ID 0
52+
#define FF_MULTI_PARTITION 0
53+
#define FF_MIN_SS 512
54+
#define FF_MAX_SS 512
55+
#define FF_USE_TRIM 0
56+
#define FF_FS_NOFSINFO 0
5557

56-
#define _FS_TINY 1
57-
#define _FS_EXFAT 0
58-
#define _FS_NORTC 1
59-
#define _NORTC_MON 1
60-
#define _NORTC_MDAY 1
61-
#define _NORTC_YEAR 2019
62-
#define _FS_LOCK 0
63-
#define _FS_REENTRANT 0
58+
#define FF_FS_TINY 1
59+
#define FF_FS_EXFAT 0
60+
#define FF_FS_NORTC 1
61+
#define FF_NORTC_MON 1
62+
#define FF_NORTC_MDAY 1
63+
#define FF_NORTC_YEAR 2019
64+
#define FF_FS_LOCK 0
65+
#define FF_FS_REENTRANT 0

0 commit comments

Comments
 (0)
0