callback addr as u32 not a void ptr

[my-code/arm.git] / betty / Makefile

diff --git a/betty/Makefile b/betty/Makefile
index ad7c7d4..4d2a1aa 100644 (file)
--- a/betty/Makefile
+++ b/betty/Makefile
@@ -1,6 +1,6 @@
 # native builds
 CC = gcc
-CFLAGS = -Wall
+CFLAGS = -Wall -I/usr/src/linux/include
 
 # cross build
 ARCH = arm-elf
@@ -11,20 +11,31 @@ CROSS_OBJCOPY = $(ARCH)-objcopy
 CROSS_OPTS = -mcpu=arm7tdmi-s
 CROSS_CFLAGS = $(CROSS_OPTS) -Wall -Os
 CROSS_ASLAGS = $(CROSS_OPTS) --gstabs
-CROSS_RAM_LDFLAGS = -Tlpc2220_ram.ld -nostartfiles -nostdlib
+CROSS_RAM_LDFLAGS = -Tlpc2220_ram.ld -nostartfiles -nostdlib 
 CROSS_ROM_LDFLAGS = -Tlpc2220_rom.ld -nostartfiles -nostdlib
 
 # build objects
-HOST_TARGET = lpcload fwdump
+HOST_TARGET = lpcload fwdump font2b
 CROSS_TARGET = fwbc.hex fwflash.hex betty.hex
 
 # betty deps
 BETTY_DEPS = system.o uart.o buttons.o spi.o display.o flash.o functions.o
-#BETTY_DEPS += pffs.o
+BETTY_DEPS += interrupts.o #pffs.o
 
 # all projects
 all: $(HOST_TARGET) $(CROSS_TARGET)
 
+# bmp2b / font2b
+links:
+       ln -sfv ../../api/bmp/bmp.{c,h} .
+
+bmp.c: links
+
+bmp.o: bmp.c
+       $(CC) -c $(CFLAGS) -o $@ $<
+
+bmp2b: bmp.o
+
 # arm code
 arm: arm_clean $(CROSS_TARGET)
 
@@ -37,8 +48,8 @@ arm: arm_clean $(CROSS_TARGET)
        $(CROSS_AS) $(CROSS_ASLAGS) -o $@ $<
 
 # .elf out of .o
-%.elf: %.o startup.o
-       $(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o -o $@ $<
+%.elf: %.o startup.o interrupts.o
+       $(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o interrupts.o -o $@ $<
 
 # betty is special ;)
 betty.elf: betty.o startup.o $(BETTY_DEPS)