From f29a1e2ab7aeff92d93a07145d7e465e08aa597d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 30 Dec 2011 15:46:04 +0100 Subject: Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... Made some helper class for files filtering. platforms.txt now contains only one platform at a time. Some cleanup in Compiler and AvrDudeUploader classes. --- platforms.txt | 72 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) mode change 100755 => 100644 platforms.txt diff --git a/platforms.txt b/platforms.txt old mode 100755 new mode 100644 index ae495d5..a0d60a8 --- a/platforms.txt +++ b/platforms.txt @@ -10,55 +10,55 @@ #default.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex ########avr compile pattern ########## -#avr.recipe.c.o.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-D{7=ARDUINO}={6=Base.REVISION}{7=-I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=OBJECT_NAME} +#recipe.c.o.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-D{7=ARDUINO}={6=Base.REVISION}{7=-I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=OBJECT_NAME} #object name seems to have build path in it. -avr.recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} +recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} ##compile cc object files -#avr.recipe.cc.o.pattern={0=compiler.path}{1=compiler.cc.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-DARDUINO={6=Base.REVISION}{-7=I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=BUILD_PATH}{10=OBJECT_NAME} -avr.recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} +#recipe.cc.o.pattern={0=compiler.path}{1=compiler.cc.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-DARDUINO={6=Base.REVISION}{-7=I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=BUILD_PATH}{10=OBJECT_NAME} +recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} ##create archives -#avr.recipe.ar.pattern={0=compiler.path}{1=compiler.ar.cmd}{2=compiler.ar.flags}{3=BUILD_PATH}{4=CORE_NAME=core.a}{5=BUILD_PATH}{6=OBJECT_NAME} -avr.recipe.ar.pattern={0}{1}|{2}|{3}{4}|{5} +#recipe.ar.pattern={0=compiler.path}{1=compiler.ar.cmd}{2=compiler.ar.flags}{3=BUILD_PATH}{4=CORE_NAME=core.a}{5=BUILD_PATH}{6=OBJECT_NAME} +recipe.ar.pattern={0}{1}|{2}|{3}{4}|{5} ##combine gc-sections| archives, and objects -#avr.recipe.c.combine.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.combine.flags}{3=compiler.cpudef}{4=build.mcu} -o {5=BUILD_PATH}{6=SOURCE_NAME}.elf {7=BUILD_PATH}{8=SOURCE_NAME}.o {9=BUILD_PATH}{10=CORE_NAME=core.a} -L{11=BUILD_PATH} -lm -#avr.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}{8}|{9}|-L{10}|-lm -avr.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}|{8}|-L{9}|-lm +#recipe.c.combine.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.combine.flags}{3=compiler.cpudef}{4=build.mcu} -o {5=BUILD_PATH}{6=SOURCE_NAME}.elf {7=BUILD_PATH}{8=SOURCE_NAME}.o {9=BUILD_PATH}{10=CORE_NAME=core.a} -L{11=BUILD_PATH} -lm +#recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}{8}|{9}|-L{10}|-lm +recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}|{8}|-L{9}|-lm ##create eeprom -#avr.recipe.objcopy.eep.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.eep.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.eep -avr.recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep +#recipe.objcopy.eep.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.eep.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.eep +recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep ##create hex -#avr.recipe.objcopy.hex.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.elf.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.hex -avr.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex +#recipe.objcopy.hex.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.elf.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.hex +recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex ######################################################## -avr.name=Arduino -#avr.compiler.path Official default is correct, only need to change this if you want to overide the initial default -#avr.compiler.path={0}/hardware/tools/avr/bin/ -avr.compiler.c.cmd=avr-gcc -avr.compiler.c.flags=|-c|-g|-Os|-w|-ffunction-sections|-fdata-sections -avr.compiler.c.elf.flags=|-Os|-Wl,--gc-sections -avr.compiler.c.elf.cmd=avr-gcc -avr.compiler.S.flags=|-c|-g|-assembler-with-cpp -avr.compiler.cpp.cmd=avr-g++ -avr.compiler.cpp.flags=|-c|-g|-Os|-w|-fno-exceptions|-ffunction-sections|-fdata-sections -avr.compiler.ar.cmd=avr-ar -avr.compiler.ar.flags=rcs -avr.compiler.objcopy.cmd=avr-objcopy -avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0 -avr.compiler.elf2hex.flags=|-O|ihex|-R|.eeprom -avr.compiler.elf2hex.cmd=avr-objcopy -avr.compiler.ldflags= -avr.compiler.cpudef=-mmcu= -avr.compiler.upload.cmd= -avr.compiler.upload.flags= -avr.compiler.define=-DARDUINO= -avr.library.path=./hardware/arduino/cores/arduino -avr.library.core.path=./libraries +name=Arduino +#compiler.path Official default is correct, only need to change this if you want to overide the initial default +#compiler.path={0}/hardware/tools/avr/bin/ +compiler.c.cmd=avr-gcc +compiler.c.flags=|-c|-g|-Os|-w|-ffunction-sections|-fdata-sections +compiler.c.elf.flags=|-Os|-Wl,--gc-sections +compiler.c.elf.cmd=avr-gcc +compiler.S.flags=|-c|-g|-assembler-with-cpp +compiler.cpp.cmd=avr-g++ +compiler.cpp.flags=|-c|-g|-Os|-w|-fno-exceptions|-ffunction-sections|-fdata-sections +compiler.ar.cmd=avr-ar +compiler.ar.flags=rcs +compiler.objcopy.cmd=avr-objcopy +compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0 +compiler.elf2hex.flags=|-O|ihex|-R|.eeprom +compiler.elf2hex.cmd=avr-objcopy +compiler.ldflags= +compiler.cpudef=-mmcu= +compiler.upload.cmd= +compiler.upload.flags= +compiler.define=-DARDUINO= +library.path=./hardware/arduino/cores/arduino +library.core.path=./libraries -- cgit v1.2.3-18-g5258