From 66cb742a67f48e01e9d9e01a2a26f0af29f79a3e Mon Sep 17 00:00:00 2001 From: Telekatz Date: Sun, 2 Jul 2017 09:40:50 +0200 Subject: [PATCH] Adapt makefile --- .cproject | 78 ---------------------------------------- boop/Makefile | 44 +++++++++++++---------- boop/keyboard/keyboard.c | 2 +- boop/keyboard/keyboard.h | 2 +- boop/version.h | 2 ++ 5 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 .cproject create mode 100644 boop/version.h diff --git a/.cproject b/.cproject deleted file mode 100644 index 6a3b3ee..0000000 --- a/.cproject +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make - - debug - true - true - true - - - make - - clean - true - true - true - - - make - - program - true - true - true - - - - diff --git a/boop/Makefile b/boop/Makefile index 39e0f13..8109d9a 100644 --- a/boop/Makefile +++ b/boop/Makefile @@ -18,14 +18,15 @@ ##### ############################################################### -ARMBASE = /opt/toolchains/gcc-arm-none-eabi-4_9-2014q4 -INCLUDEPATH = $(ARMBASE)/include -#LIBGCCPATH = $(ARMBASE)/lib/gcc/arm-none-eabi/4.7.3/thumb/arm7tdmi-s -#LIBCPATH = $(ARMBASE)/arm-none-eabi/lib/thumb/arm7tdmi-s -ARMPATH = $(ARMBASE)/bin + +#ARMBASE = F:/Tools/GNU_Tools_ARM_Embedded/5.4 +#INCLUDEPATH = $(ARMBASE)/arm-none-eabi/include +#LIBPATH = $(ARMBASE)/arm-none-eabi/lib +#ARMPATH = $(ARMBASE)/bin/ TOOLPREFIX = arm-none-eabi- LPCTOOL = lpctool -OPENOCD = openocd -f betty.cfg -f interface/parport.cfg +OPENOCDPATH = F:\Tools\OpenOCD +OPENOCD = $(OPENOCDPATH)\openocd.exe -f betty.cfg -f $(OPENOCDPATH)\interface\uniprog.cfg ############################################################### ##### @@ -33,18 +34,18 @@ OPENOCD = openocd -f betty.cfg -f interface/parport.cfg ##### ############################################################### -CC = $(ARMPATH)/$(TOOLPREFIX)gcc -AS = $(ARMPATH)/$(TOOLPREFIX)as -#LD = $(ARMPATH)/$(TOOLPREFIX)ld -LD = $(ARMPATH)/$(TOOLPREFIX)gcc -OC = $(ARMPATH)/$(TOOLPREFIX)objcopy -OD = $(ARMPATH)/$(TOOLPREFIX)objdump +CC = $(ARMPATH)$(TOOLPREFIX)gcc +AS = $(ARMPATH)$(TOOLPREFIX)gcc +LD = $(ARMPATH)$(TOOLPREFIX)gcc +OC = $(ARMPATH)$(TOOLPREFIX)objcopy +OD = $(ARMPATH)$(TOOLPREFIX)objdump +SIZE = $(ARMPATH)$(TOOLPREFIX)size CPUFLAGS = -mcpu=arm7tdmi-s OPTFLAGS = -Os -CFLAGS = -Wall -mthumb-interwork -msoft-float -INC = -I$(INCLUDEPATH) -I. -Iinterrupt -Idisplay -Ikeyboard -Iaudio -Iinfrared -Iserial -Iflash -Icc1100 -Igui -Itimer -Igames -Iadc -Irtc -Itools -ASFLAGS = -D --gstabs -mthumb-interwork -mfpu=softfpa +CFLAGS = -Wall -mthumb-interwork +INC = -I. -Iinterrupt -Idisplay -Ikeyboard -Iaudio -Iinfrared -Iserial -Iflash -Icc1100 -Igui -Itimer -Igames -Iadc -Irtc -Itools +ASFLAGS = -g -I. -mthumb-interwork #LDFLAGS = -Tlpc2220_rom.ld -Map boop.map #LIBS = -lc -lgcc LDFLAGS = -mthumb-interwork -nostartfiles -Xlinker -Map -Xlinker boop.map -Tlpc2220_rom.ld @@ -91,9 +92,9 @@ $(eval $(call expand_dir,)) OBJS := $(patsubst %.s,%.o,$(ALLSRCS:.c=.o)) $(ALLTHUMBSRCS:.c=.thumb.o) $(ALLTHUMBSRCSUNOPT:.c=.thumbunopt.o) -all: version $(DEPS) boop_rom.bin boop_rom.hex +all: $(DEPS) boop_rom.bin boop_rom.hex -debug: version.h $(DEPS) boop_rom.bin boop_rom.hex +debug: $(DEPS) boop_rom.bin boop_rom.hex release: clean version $(DEPS) boop_rom.bin boop_rom.hex @echo -n '\n\nRelease erstellt SVN Version ++' @@ -120,9 +121,10 @@ test: boop_rom.elf boop_rom.elf: $(OBJS) $(LD) $(LDFLAGS) -L$(LIBGCCPATH) -L$(LIBCPATH) -o $@ $^ $(LIBS) + arm-none-eabi-size $@ %.o: %.s - $(AS) $(CPUFLAGS) $(ASFLAGS) -o $@ $< + $(CC) $(ASFLAGS) -c -o $@ $< %.o: %.c $(COMPILE) $(OPTFLAGS) -c -MMD -MF $(dir $<).deps/$(notdir $@) -o $@ $< @@ -145,6 +147,10 @@ program: boop_rom.bin clean: -rm -Rf $(DEPS) - -rm -f $(OBJS) *.elf *.bin *.hex *~ + -rm -f $(OBJS) *.elf *.bin *.hex *.map *~ +clean2: + -rm -Rf $(DEPS) + -rm -f $(OBJS) *.elf *.hex *.map *~ + -include $(DEPS:=/*) diff --git a/boop/keyboard/keyboard.c b/boop/keyboard/keyboard.c index 2be0baa..d01eceb 100644 --- a/boop/keyboard/keyboard.c +++ b/boop/keyboard/keyboard.c @@ -52,7 +52,7 @@ void waitKeyDown(void) setBacklight(BL_AUTO); // pwm value } -inline char isKeyPressed (void) +char isKeyPressed (void) { return ((keys[0] != 0) || (keys[1] != 0)); } diff --git a/boop/keyboard/keyboard.h b/boop/keyboard/keyboard.h index d589840..64772a9 100644 --- a/boop/keyboard/keyboard.h +++ b/boop/keyboard/keyboard.h @@ -188,7 +188,7 @@ void scanKeys(void); void waitKeyUp(void); void waitKeyDown(void); /// Return 1 if any key is pressed. -inline char isKeyPressed (void); +char isKeyPressed (void); signed char getNumKeyValue(void); unsigned char getKeynum(void); diff --git a/boop/version.h b/boop/version.h new file mode 100644 index 0000000..b2ffa08 --- /dev/null +++ b/boop/version.h @@ -0,0 +1,2 @@ +#define SVNVERSION 00 +