Skip to content

Commit 5ce8db4

Browse files
committed
Update to 2.1
https://github.com/ARMmbed/littlefs/releases/tag/v2.1.0 CL: vfs-fs-lfs: Update to 2.1
1 parent 7dc9f22 commit 5ce8db4

31 files changed

+1986
-1253
lines changed

littlefs/.travis.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,20 @@ script:
2323
- make test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023 -DLFS_LOOKAHEAD_SIZE=256"
2424

2525
- make clean test QUIET=1 CFLAGS+="-DLFS_INLINE_MAX=0"
26+
- make clean test QUIET=1 CFLAGS+="-DLFS_EMUBD_ERASE_VALUE=0xff"
2627
- make clean test QUIET=1 CFLAGS+="-DLFS_NO_INTRINSICS"
2728

29+
# additional configurations that don't support all tests (this should be
30+
# fixed but at the moment it is what it is)
31+
- make test_files QUIET=1
32+
CFLAGS+="-DLFS_READ_SIZE=1 -DLFS_BLOCK_SIZE=4096"
33+
- make test_files QUIET=1
34+
CFLAGS+="-DLFS_READ_SIZE=\(2*1024\) -DLFS_BLOCK_SIZE=\(64*1024\)"
35+
- make test_files QUIET=1
36+
CFLAGS+="-DLFS_READ_SIZE=\(8*1024\) -DLFS_BLOCK_SIZE=\(64*1024\)"
37+
- make test_files QUIET=1
38+
CFLAGS+="-DLFS_READ_SIZE=11 -DLFS_BLOCK_SIZE=704"
39+
2840
# compile and find the code size with the smallest configuration
2941
- make clean size
3042
OBJ="$(ls lfs*.o | tr '\n' ' ')"
@@ -66,7 +78,10 @@ jobs:
6678
- CC="arm-linux-gnueabi-gcc --static -mthumb"
6779
- EXEC="qemu-arm"
6880
install:
69-
- sudo apt-get install gcc-arm-linux-gnueabi qemu-user
81+
- sudo apt-get install
82+
gcc-arm-linux-gnueabi
83+
libc6-dev-armel-cross
84+
qemu-user
7085
- arm-linux-gnueabi-gcc --version
7186
- qemu-arm -version
7287

@@ -78,7 +93,10 @@ jobs:
7893
- CC="powerpc-linux-gnu-gcc --static"
7994
- EXEC="qemu-ppc"
8095
install:
81-
- sudo apt-get install gcc-powerpc-linux-gnu qemu-user
96+
- sudo apt-get install
97+
gcc-powerpc-linux-gnu
98+
libc6-dev-powerpc-cross
99+
qemu-user
82100
- powerpc-linux-gnu-gcc --version
83101
- qemu-ppc -version
84102

@@ -90,9 +108,10 @@ jobs:
90108
- CC="mips-linux-gnu-gcc --static"
91109
- EXEC="qemu-mips"
92110
install:
93-
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe"
94-
- sudo apt-get -qq update
95-
- sudo apt-get install gcc-mips-linux-gnu qemu-user
111+
- sudo apt-get install
112+
gcc-mips-linux-gnu
113+
libc6-dev-mips-cross
114+
qemu-user
96115
- mips-linux-gnu-gcc --version
97116
- qemu-mips -version
98117

@@ -104,7 +123,7 @@ jobs:
104123
if: branch !~ -prefix$
105124
install:
106125
- sudo apt-get install libfuse-dev
107-
- git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2-alpha
126+
- git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2
108127
- fusermount -V
109128
- gcc --version
110129
before_script:
@@ -139,7 +158,7 @@ jobs:
139158
if: branch !~ -prefix$
140159
install:
141160
- sudo apt-get install libfuse-dev
142-
- git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2-alpha v2
161+
- git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2 v2
143162
- git clone --depth 1 https://github.com/geky/littlefs-fuse -b v1 v1
144163
- fusermount -V
145164
- gcc --version

littlefs/Makefile

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ endif
2424
ifdef WORD
2525
override CFLAGS += -m$(WORD)
2626
endif
27+
ifdef TRACE
28+
override CFLAGS += -DLFS_YES_TRACE
29+
endif
2730
override CFLAGS += -I.
2831
override CFLAGS += -std=c99 -Wall -pedantic
2932
override CFLAGS += -Wextra -Wshadow -Wjump-misses-init
@@ -39,14 +42,25 @@ size: $(OBJ)
3942
$(SIZE) -t $^
4043

4144
.SUFFIXES:
42-
test: test_format test_dirs test_files test_seek test_truncate \
43-
test_entries test_interspersed test_alloc test_paths test_attrs \
44-
test_move test_orphan test_corrupt
45+
test: \
46+
test_format \
47+
test_dirs \
48+
test_files \
49+
test_seek \
50+
test_truncate \
51+
test_entries \
52+
test_interspersed \
53+
test_alloc \
54+
test_paths \
55+
test_attrs \
56+
test_move \
57+
test_orphan \
58+
test_corrupt
4559
@rm test.c
4660
test_%: tests/test_%.sh
4761

4862
ifdef QUIET
49-
@./$< | sed -n '/^[-=]/p'
63+
@./$< | sed -nu '/^[-=]/p'
5064
else
5165
./$<
5266
endif

0 commit comments

Comments
 (0)