merged trunk changes

This commit is contained in:
Markus Fröschle
2012-12-10 11:31:23 +00:00
parent 3d0a759252
commit ac45a56648
4 changed files with 560 additions and 2 deletions

View File

@@ -60,8 +60,9 @@ CSRCS= \
$(SRCDIR)/BaS.c \
$(SRCDIR)/cache.c \
$(SRCDIR)/sd_card.c \
$(SRCDIR)/mmcbb.c \
$(SRCDIR)/ff.c \
$(SRCDIR)/mmcbb.c
$(SRCDIR)/wait.c
ASRCS= \
$(SRCDIR)/startcf.S \