Adapt makefile
This commit is contained in:
Telekatz
parent
3c44927e0a
commit
66cb742a67
5 changed files with 29 additions and 99 deletions
78
.cproject
78
.cproject
|
|
@ -1,78 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
|
||||||
<cconfiguration id="0.481883884">
|
|
||||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.481883884" moduleId="org.eclipse.cdt.core.settings" name="Default">
|
|
||||||
<externalSettings/>
|
|
||||||
<extensions>
|
|
||||||
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
</extensions>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<configuration buildProperties="" description="" id="0.481883884" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
|
|
||||||
<folderInfo id="0.481883884." name="/" resourcePath="">
|
|
||||||
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1715436414" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
|
|
||||||
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1715436414.885904395" name=""/>
|
|
||||||
<builder id="org.eclipse.cdt.build.core.settings.default.builder.1224554298" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.736682923" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.1273008438" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.937300672" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.772385457" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1269038295" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.2137323592" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1752191090" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
</toolChain>
|
|
||||||
</folderInfo>
|
|
||||||
</configuration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
|
||||||
</cconfiguration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<project id="Boop.null.506503339" name="Boop"/>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="scannerConfiguration">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
|
||||||
<scannerConfigBuildInfo instanceId="0.481883884">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
|
||||||
</scannerConfigBuildInfo>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
|
||||||
<storageModule moduleId="refreshScope"/>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
|
||||||
<buildTargets>
|
|
||||||
<target name="debug" path="boop/trunk" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
|
||||||
<buildCommand>make</buildCommand>
|
|
||||||
<buildArguments/>
|
|
||||||
<buildTarget>debug</buildTarget>
|
|
||||||
<stopOnError>true</stopOnError>
|
|
||||||
<useDefaultCommand>true</useDefaultCommand>
|
|
||||||
<runAllBuilders>true</runAllBuilders>
|
|
||||||
</target>
|
|
||||||
<target name="clean" path="boop/trunk" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
|
||||||
<buildCommand>make</buildCommand>
|
|
||||||
<buildArguments/>
|
|
||||||
<buildTarget>clean</buildTarget>
|
|
||||||
<stopOnError>true</stopOnError>
|
|
||||||
<useDefaultCommand>true</useDefaultCommand>
|
|
||||||
<runAllBuilders>true</runAllBuilders>
|
|
||||||
</target>
|
|
||||||
<target name="program" path="boop/trunk" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
|
||||||
<buildCommand>make</buildCommand>
|
|
||||||
<buildArguments/>
|
|
||||||
<buildTarget>program</buildTarget>
|
|
||||||
<stopOnError>true</stopOnError>
|
|
||||||
<useDefaultCommand>true</useDefaultCommand>
|
|
||||||
<runAllBuilders>true</runAllBuilders>
|
|
||||||
</target>
|
|
||||||
</buildTargets>
|
|
||||||
</storageModule>
|
|
||||||
</cproject>
|
|
||||||
|
|
@ -18,14 +18,15 @@
|
||||||
#####
|
#####
|
||||||
###############################################################
|
###############################################################
|
||||||
|
|
||||||
ARMBASE = /opt/toolchains/gcc-arm-none-eabi-4_9-2014q4
|
|
||||||
INCLUDEPATH = $(ARMBASE)/include
|
#ARMBASE = F:/Tools/GNU_Tools_ARM_Embedded/5.4
|
||||||
#LIBGCCPATH = $(ARMBASE)/lib/gcc/arm-none-eabi/4.7.3/thumb/arm7tdmi-s
|
#INCLUDEPATH = $(ARMBASE)/arm-none-eabi/include
|
||||||
#LIBCPATH = $(ARMBASE)/arm-none-eabi/lib/thumb/arm7tdmi-s
|
#LIBPATH = $(ARMBASE)/arm-none-eabi/lib
|
||||||
ARMPATH = $(ARMBASE)/bin
|
#ARMPATH = $(ARMBASE)/bin/
|
||||||
TOOLPREFIX = arm-none-eabi-
|
TOOLPREFIX = arm-none-eabi-
|
||||||
LPCTOOL = lpctool
|
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
|
CC = $(ARMPATH)$(TOOLPREFIX)gcc
|
||||||
AS = $(ARMPATH)/$(TOOLPREFIX)as
|
AS = $(ARMPATH)$(TOOLPREFIX)gcc
|
||||||
#LD = $(ARMPATH)/$(TOOLPREFIX)ld
|
LD = $(ARMPATH)$(TOOLPREFIX)gcc
|
||||||
LD = $(ARMPATH)/$(TOOLPREFIX)gcc
|
OC = $(ARMPATH)$(TOOLPREFIX)objcopy
|
||||||
OC = $(ARMPATH)/$(TOOLPREFIX)objcopy
|
OD = $(ARMPATH)$(TOOLPREFIX)objdump
|
||||||
OD = $(ARMPATH)/$(TOOLPREFIX)objdump
|
SIZE = $(ARMPATH)$(TOOLPREFIX)size
|
||||||
|
|
||||||
CPUFLAGS = -mcpu=arm7tdmi-s
|
CPUFLAGS = -mcpu=arm7tdmi-s
|
||||||
OPTFLAGS = -Os
|
OPTFLAGS = -Os
|
||||||
CFLAGS = -Wall -mthumb-interwork -msoft-float
|
CFLAGS = -Wall -mthumb-interwork
|
||||||
INC = -I$(INCLUDEPATH) -I. -Iinterrupt -Idisplay -Ikeyboard -Iaudio -Iinfrared -Iserial -Iflash -Icc1100 -Igui -Itimer -Igames -Iadc -Irtc -Itools
|
INC = -I. -Iinterrupt -Idisplay -Ikeyboard -Iaudio -Iinfrared -Iserial -Iflash -Icc1100 -Igui -Itimer -Igames -Iadc -Irtc -Itools
|
||||||
ASFLAGS = -D --gstabs -mthumb-interwork -mfpu=softfpa
|
ASFLAGS = -g -I. -mthumb-interwork
|
||||||
#LDFLAGS = -Tlpc2220_rom.ld -Map boop.map
|
#LDFLAGS = -Tlpc2220_rom.ld -Map boop.map
|
||||||
#LIBS = -lc -lgcc
|
#LIBS = -lc -lgcc
|
||||||
LDFLAGS = -mthumb-interwork -nostartfiles -Xlinker -Map -Xlinker boop.map -Tlpc2220_rom.ld
|
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)
|
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
|
release: clean version $(DEPS) boop_rom.bin boop_rom.hex
|
||||||
@echo -n '\n\nRelease erstellt SVN Version ++'
|
@echo -n '\n\nRelease erstellt SVN Version ++'
|
||||||
|
|
@ -120,9 +121,10 @@ test: boop_rom.elf
|
||||||
|
|
||||||
boop_rom.elf: $(OBJS)
|
boop_rom.elf: $(OBJS)
|
||||||
$(LD) $(LDFLAGS) -L$(LIBGCCPATH) -L$(LIBCPATH) -o $@ $^ $(LIBS)
|
$(LD) $(LDFLAGS) -L$(LIBGCCPATH) -L$(LIBCPATH) -o $@ $^ $(LIBS)
|
||||||
|
arm-none-eabi-size $@
|
||||||
|
|
||||||
%.o: %.s
|
%.o: %.s
|
||||||
$(AS) $(CPUFLAGS) $(ASFLAGS) -o $@ $<
|
$(CC) $(ASFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(COMPILE) $(OPTFLAGS) -c -MMD -MF $(dir $<).deps/$(notdir $@) -o $@ $<
|
$(COMPILE) $(OPTFLAGS) -c -MMD -MF $(dir $<).deps/$(notdir $@) -o $@ $<
|
||||||
|
|
@ -145,6 +147,10 @@ program: boop_rom.bin
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -Rf $(DEPS)
|
-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:=/*)
|
-include $(DEPS:=/*)
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ void waitKeyDown(void)
|
||||||
setBacklight(BL_AUTO); // pwm value
|
setBacklight(BL_AUTO); // pwm value
|
||||||
}
|
}
|
||||||
|
|
||||||
inline char isKeyPressed (void)
|
char isKeyPressed (void)
|
||||||
{
|
{
|
||||||
return ((keys[0] != 0) || (keys[1] != 0));
|
return ((keys[0] != 0) || (keys[1] != 0));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@ void scanKeys(void);
|
||||||
void waitKeyUp(void);
|
void waitKeyUp(void);
|
||||||
void waitKeyDown(void);
|
void waitKeyDown(void);
|
||||||
/// Return 1 if any key is pressed.
|
/// Return 1 if any key is pressed.
|
||||||
inline char isKeyPressed (void);
|
char isKeyPressed (void);
|
||||||
signed char getNumKeyValue(void);
|
signed char getNumKeyValue(void);
|
||||||
unsigned char getKeynum(void);
|
unsigned char getKeynum(void);
|
||||||
|
|
||||||
|
|
|
||||||
2
boop/version.h
Normal file
2
boop/version.h
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
#define SVNVERSION 00
|
||||||
|
|
||||||
Loading…
Reference in a new issue