merged trunk changes

2012-12-10 11:31:23 +00:00
parent 3d0a759252
commit ac45a56648
4 changed files with 560 additions and 2 deletions
--- 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)