From ac45a566488d4c4e643553d1f74f21cf51d283fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Mon, 10 Dec 2012 11:31:23 +0000 Subject: [PATCH] merged trunk changes --- SD_CARD/BaS_gcc/.cproject | 554 ++++++++++++++++++++++++++++++++++++++ SD_CARD/BaS_gcc/.gdbinit | 4 +- SD_CARD/BaS_gcc/Makefile | 3 +- SD_CARD/BaS_gcc/bas.lk.in | 1 + 4 files changed, 560 insertions(+), 2 deletions(-) diff --git a/SD_CARD/BaS_gcc/.cproject b/SD_CARD/BaS_gcc/.cproject index 6b08a81..9d6a853 100644 --- a/SD_CARD/BaS_gcc/.cproject +++ b/SD_CARD/BaS_gcc/.cproject @@ -43,6 +43,283 @@ + + + + make + + ram + true + true + true + + + make + + clean + true + true + true + + + make + + all + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,6 +377,283 @@ + + + + make + + ram + true + true + true + + + make + + clean + true + true + true + + + make + + all + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SD_CARD/BaS_gcc/.gdbinit b/SD_CARD/BaS_gcc/.gdbinit index 1a0b467..b9bcbf8 100644 --- a/SD_CARD/BaS_gcc/.gdbinit +++ b/SD_CARD/BaS_gcc/.gdbinit @@ -7,6 +7,8 @@ define tbtr end tr +define run + continue +end source mcf5474.gdb - diff --git a/SD_CARD/BaS_gcc/Makefile b/SD_CARD/BaS_gcc/Makefile index c0d32f9..f1a25d9 100644 --- a/SD_CARD/BaS_gcc/Makefile +++ b/SD_CARD/BaS_gcc/Makefile @@ -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 \ diff --git a/SD_CARD/BaS_gcc/bas.lk.in b/SD_CARD/BaS_gcc/bas.lk.in index 21b70f5..4fe84da 100644 --- a/SD_CARD/BaS_gcc/bas.lk.in +++ b/SD_CARD/BaS_gcc/bas.lk.in @@ -31,6 +31,7 @@ SECTIONS AT (ALIGN(ADDR(.text) + SIZEOF(.text), 4)) { objs/BaS.o(.text) + objs/wait.o(.text) /* put other routines into the same segment (RAM) as BaS.o */ objs/sd_card_asm.o(.text) objs/bas_printf.o(.text)