altos: Allow building with newlib + avr stdio on ARM

[fw/altos] / src / lambdakey-v1.0 / Makefile

diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile
index ef03527ee2c2265eb5d71b33a15e92b77edcbc5a..4eb045b6ff8d9a10df326e383ae273aa8929e437 100644 (file)
--- a/src/lambdakey-v1.0/Makefile
+++ b/src/lambdakey-v1.0/Makefile
@@ -5,6 +5,12 @@
 
 include ../stmf0/Makefile.defs
 
+include ../scheme/Makefile-inc
+
+NEWLIB_FULL=-lm -lc -lgcc
+
+LIBS=$(NEWLIB_FULL)
+
 INC = \
        ao.h \
        ao_arch.h \
@@ -13,8 +19,7 @@ INC = \
        ao_pins.h \
        ao_product.h \
        ao_task.h \
-       ao_lisp.h \
-       ao_lisp_const.h \
+       $(SCHEME_HDRS) \
        stm32f0.h \
        Makefile
 
@@ -29,32 +34,27 @@ ALTOS_SRC = \
        ao_led.c \
        ao_dma_stm.c \
        ao_stdio.c \
+       ao_mutex.c \
        ao_panic.c \
        ao_timer.c \
-       ao_mutex.c \
        ao_usb_stm.c \
-       ao_serial_stm.c \
-       ao_lisp_lex.c \
-       ao_lisp_mem.c \
-       ao_lisp_cons.c \
-       ao_lisp_eval.c \
-       ao_lisp_string.c \
-       ao_lisp_atom.c \
-       ao_lisp_int.c \
-       ao_lisp_prim.c \
-       ao_lisp_builtin.c \
-       ao_lisp_read.c \
-       ao_lisp_rep.c \
-       ao_lisp_frame.c \
-       ao_lisp_error.c \
-       ao_lisp_lambda.c \
-       ao_exti_stm.c
+       ao_flash_stm.c \
+       $(SCHEME_SRCS) \
+       ao_scheme_os_save.c
 
 PRODUCT=LambdaKey-v1.0
 PRODUCT_DEF=-DLAMBDAKEY
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g
+CFLAGS = $(PRODUCT_DEF) -I. $(STMF0_CFLAGS) -Os -g
+
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tlambda.ld
+
+MAP=$(PROG).map
+NEWLIB=/local/newlib-mini
+MAPFILE=-Wl,-M=$(MAP)
+LDFLAGS=-L../stmf0 -L$(NEWLIB)/arm-none-eabi/lib/thumb/v6-m/ -Wl,-Tlambda.ld $(MAPFILE) -nostartfiles
+AO_CFLAGS=-I. -I../stmf0 -I../kernel -I../drivers -I.. -I../scheme -isystem $(NEWLIB)/arm-none-eabi/include -DNEWLIB
 
 PROGNAME=lambdakey-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
@@ -65,7 +65,7 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
-$(PROG): Makefile $(OBJ) altos.ld
+$(PROG): Makefile $(OBJ) lambda.ld altos.ld
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)