X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2FMakefile;h=0a3558655c6ae0399a029599149731ce95a10f90;hp=4e07f98d74c36f4e1675c3ec99beb13f85811a6e;hb=bbf7d44cf935538f5a353665f160e5cd3ed59da8;hpb=126d76a189309089c2cd4110d8cca1b68e35002c

diff --git a/betty/Makefile b/betty/Makefile
index 4e07f98..0a35586 100644
--- a/betty/Makefile
+++ b/betty/Makefile
@@ -1,36 +1,58 @@
+# native builds
 CC = gcc
 CFLAGS = -Wall
 
-ARMCC = /scratch/arm-elf/bin/arm-elf-gcc
-ARMCFLAGS = -Wall -mcpu=arm7tdmi-s -nostartfiles -nostdlib
-ARMOBJCOPY = /scratch/arm-elf/bin/arm-elf-objcopy
-
-HOSTOBJECTS = lpcload fwdump
-
-ARMOBJECTS = fwbc.hex fwflash.hex
+# cross build
+ARCH = arm-elf
+CROSS_CC = $(ARCH)-gcc
+CROSS_AS = $(ARCH)-as
+CROSS_LD = $(ARCH)-ld
+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_ROM_LDFLAGS = -Tlpc2220_rom.ld -nostartfiles -nostdlib
+
+# build objects
+HOST_TARGET = lpcload fwdump
+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 #pffs.o
 
 # all projects
-all: $(HOSTOBJECTS) $(ARMOBJECTS)
+all: $(HOST_TARGET) $(CROSS_TARGET)
 
 # arm code
-arm: arm_clean $(ARMOBJECTS)
+arm: arm_clean $(CROSS_TARGET)
 
-# fwbc
-fwbc:
-	$(ARMCC) $(ARMCFLAGS) -c fwbc.c -o fwbc
+# .o out of .c
+%.o: %.c
+	$(CROSS_CC) -c $(CROSS_CFLAGS) -o $@ $<
 
-fwbc.hex: fwbc
-	$(ARMOBJCOPY) -O ihex fwbc fwbc.hex
+# .o out of .s
+%.o: %.s
+	$(CROSS_AS) $(CROSS_ASLAGS) -o $@ $<
 
-# fwflash
-fwflash:
-	$(ARMCC) $(ARMCFLAGS) -c fwflash.c -o fwflash
+# .elf out of .o
+%.elf: %.o startup.o
+	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o -o $@ $<
 
-fwflash.hex: fwflash
-	$(ARMOBJCOPY) -O ihex fwflash fwflash.hex
+# betty is special ;)
+betty.elf: betty.o startup.o $(BETTY_DEPS)
+	#$(CROSS_LD) $(CROSS_ROM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
+	$(CROSS_LD) $(CROSS_RAM_LDFLAGS) startup.o $(BETTY_DEPS) -o $@ $<
 
+# .hex out of .elf
+%.hex: %.elf
+	$(CROSS_OBJCOPY) -O ihex $< $@
+
+# host clean
 clean:
-	rm -f lpcload fwdump
+	rm -vf lpcload fwdump
 
+# arm clean
 arm_clean:
-	rm -f $(ARMOBJECTS) fwbc fwflash
+	rm -vf *.o *.hex *.elf
+