git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1294 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 5 insertions, 2 deletions

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
index 85a8880f1..afb044c49 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
@@ -60,12 +60,14 @@ CHIBIOS = ../..
 include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk

 include ${CHIBIOS}/os/kernel/kernel.mk

 include ${CHIBIOS}/test/test.mk

+include ${CHIBIOS}/ext/fatfs/fatfs.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

+       ${FATFSSRC} \

        ${CHIBIOS}/os/io/pal.c \

        ${CHIBIOS}/os/io/serial.c \

        ${CHIBIOS}/os/io/spi.c \

@@ -108,7 +110,8 @@ ASMSRC = $(PORTASM) \
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          ${CHIBIOS}/os/io \

          ${CHIBIOS}/os/io/platforms/STM32 \

-         ${CHIBIOS}/os/various

+         ${CHIBIOS}/os/various \

+         $(FATFSINC)

 

 #

 # Project, sources and paths

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
index 914eea1e2..a41d666f8 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
@@ -44,7 +44,7 @@ static SPIConfig ls_spicfg = {
 /*

  * MMC driver instance.
  */

-static MMCDriver MMCD1;

+MMCDriver MMCD1;

 

 /*

  * MMC configuration (empty).
diff --git a/ext/ff007e-patched.zip b/ext/ff007e-patched.zip
new file mode 100644
index 000000000..971dcc321
--- /dev/null
+++ b/ext/ff007e-patched.zip