Skip to content

Commit a37591f

Browse files
committed
Remove FATFS and link to it instead
1 parent 648bee2 commit a37591f

File tree

9 files changed

+22
-23647
lines changed

9 files changed

+22
-23647
lines changed

.github/workflows/test-fatfs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ jobs:
3737
- name: Compile FATFS library
3838
run: |
3939
cd ide/Linux-FATFS
40+
wget http://elm-chan.org/fsw/ff/arc/ff15a.zip
41+
unzip ff15a.zip
42+
cp ffconf.h source/
4043
make
4144
4245
- name: Configure and build wolfSSH with FATFS
4346
run: |
4447
./autogen.sh
4548
export LD_LIBRARY_PATH=$(pwd)/ide/Linux-FATFS
46-
./configure --enable-sftp CFLAGS="-DWOLFSSH_FATFS -Iide/Linux-FATFS -DSTDIN_FILENO=0 -DPRINTF=printf" LDFLAGS="-Lide/Linux-FATFS -lfatfs"
49+
./configure --enable-sftp CFLAGS="-DWOLFSSH_FATFS -Iide/Linux-FATFS/source -DSTDIN_FILENO=0 -DPRINTF=printf" LDFLAGS="-Lide/Linux-FATFS -lfatfs"
4750
make
4851
4952

ide/Linux-FATFS/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Compiler and flags
22
CC = gcc
3-
CFLAGS = -g -Wall -O2 -fPIC
3+
CFLAGS = -g -Wall -O2 -fPIC -Isource
44
LDFLAGS = -shared
55

66
# Source files
7-
SRCS = ff.c ffunicode.c fatfs_example.c
7+
SRCS = source/ff.c source/ffunicode.c fatfs_example.c
88

99
# Object files
1010
OBJS = $(SRCS:.c=.o)

ide/Linux-FATFS/README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33
This is a FATFS example that uses a single file on the Linux filesystem as the
44
FATFS file system.
55

6+
## Obtaining FATFS
7+
8+
You can download the source code from
9+
[The FATFS download site](http://elm-chan.org/fsw/ff/archives.html). Extract it
10+
into this directory.
11+
12+
The example has been tested against FATFS 0.15a
13+
614
## Compiling Library
715

8-
To compile the FATFS library simply run `make`.
16+
First copy the config file into the correct place:
17+
18+
```sh
19+
cp ffconf.h source/
20+
```
21+
22+
Then to compile the FATFS library simply run `make`.
923

1024
## Setup filesystem
1125

@@ -30,6 +44,6 @@ the library.
3044
### wolfSSH
3145

3246
```sh
33-
./configure --enable-sftp CFLAGS="-DWOLFSSH_FATFS -Iide/Linux-FATFS -DSTDIN_FILENO=0 -DPRINTF=printf" LDFLAGS="-Lide/Linux-FATFS -lfatfs"
47+
LD_LIBRARY_PATH=ide/Linux-FATFS ./configure --enable-sftp CFLAGS="-DWOLFSSH_FATFS -Iide/Linux-FATFS/source -DSTDIN_FILENO=0 -DPRINTF=printf" LDFLAGS="-Lide/Linux-FATFS -lfatfs"
3448
```
3549

ide/Linux-FATFS/diskio.c

Lines changed: 0 additions & 228 deletions
This file was deleted.

ide/Linux-FATFS/diskio.h

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)