From 47e8a813c876ab0592d4b2ac756075ee96239a8d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 11 Jan 2012 13:59:16 +0100 Subject: [PATCH] Merge refinements --- hardware/arduino/sam/boards.txt | 3 - hardware/arduino/sam/platform.txt | 99 ++++++++++++++++--------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt index ec43dd61b..3eab06a30 100644 --- a/hardware/arduino/sam/boards.txt +++ b/hardware/arduino/sam/boards.txt @@ -1,7 +1,6 @@ ############################################################## sam3s_ek.name=Atmel SAM3S-EK -sam3s_ek.platform=sam sam3s_ek.upload.protocol=sam-ba sam3s_ek.upload.maximum_size=49152 sam3s_ek.upload.speed=115200 @@ -15,7 +14,6 @@ sam3s_ek.build.pins=sam3s_ek ############################################################## sam3u_ek.name=Atmel SAM3U-EK -sam3u_ek.platform=sam sam3u_ek.upload.protocol=sam-ba sam3u_ek.upload.maximum_size=49152 sam3u_ek.upload.speed=115200 @@ -29,7 +27,6 @@ sam3u_ek.build.pins=sam3u_ek ############################################################## arduino_due.name=Arduino Due -arduino_due.platform=sam arduino_due.uploader=bossac arduino_due.upload.maximum_size=49152 arduino_due.upload.speed=115200 diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt index 3740fdb9e..9176938ad 100644 --- a/hardware/arduino/sam/platform.txt +++ b/hardware/arduino/sam/platform.txt @@ -1,69 +1,72 @@ + + +name=Atmel SAM +#compiler.path Official default is correct, only need to change this if you want to overide the initial default +compiler.path={0}/hardware/tools/CodeSourcery_arm/bin/ +compiler.c.cmd=arm-none-eabi-gcc +compiler.c.flags=-c -g -Os -w -mthumb -mlong-calls -ffunction-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf +compiler.c.elf.flags=-Os -Wl,--gc-sections +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.S.flags=-c -g -assembler-with-cpp +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.cpp.flags=-c -g -Os -w -mthumb -mlong-calls -ffunction-sections -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf +compiler.ar.cmd=arm-none-eabi-ar +compiler.ar.flags=rcs +compiler.objcopy.cmd=arm-none-eabi-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 binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.cpudef=-mcpu= +compiler.size.cmd=arm-none-eabi-size +compiler.upload.cmd= +compiler.upload.flags= +compiler.define=-DARDUINO= +library.path=./hardware/sam/cores/sam +library.core.path=./libraries;./hardware/sam/libraries + + #########Compiler Recipe################################# + ##compile c object files ##Default.recipe, overide if overide exists, these defauls should remain the same, if you need to change them do it as an overide. -#default.recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} -#default.recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} -#default.recipe.ar.pattern={0}{1}|{2}|{3}{4}|{5} -#default.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}|{8}|-L{9}|-lm -#default.recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep -#default.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex +#default.recipe.c.o.pattern={0}{1} {2} {3}{4} -DF_CPU={5} -D{6}={7} {8} {9} -o {10} +#default.recipe.cpp.o.pattern={0}{1} {2} {3}{4} -DF_CPU={5} -D{6}={7} {8} {9} -o {10} +#default.recipe.ar.pattern={0}{1} {2} {3}{4} {5} +#default.recipe.c.combine.pattern={0}{1} {2} {3}{4} -o {5}{6}.elf {7} {8} -L{9} -lm +#default.recipe.objcopy.eep.pattern={0}{1} {2} {3}.elf {4}.eep +#default.recipe.objcopy.hex.pattern={0}{1} {2} {3}.elf {4}.hex ########sam compile pattern ########## -#sam.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. -sam.recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{11}|{8}|{9}|-o|{10} +recipe.c.o.pattern={0}{1} {2} {3}{4} -DF_CPU={5} -D{6}={7} {11} {8} {9} -o {10} ##compile cc object files -#sam.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} -sam.recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{11}|{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} {11} {8} {9} -o {10} ##create archives -#sam.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} -sam.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 -#sam.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 -#sam.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}{8}|{9}|-L{10}|-lm -sam.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-T{11}|-Wl,-Map,{5}{6}.map|-o|{5}{6}.elf|-L{9}|-lm|-lgcc|-mthumb|-Wl,--cref|-Wl,--check-sections|-Wl,--gc-sections|-Wl,--entry=Reset_Handler|-Wl,--unresolved-symbols=report-all|-Wl,--warn-common|-Wl,--warn-section-align|-Wl,--warn-unresolved-symbols|-Wl,--start-group|{7}|{8}|-Wl,--end-group +##combine gc-sections archives, and objects +#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} -T{11} -Wl,-Map,{5}{6}.map -o {5}{6}.elf -L{9} -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group {7} {8} -Wl,--end-group ##create eeprom -#sam.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 -#sam.recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep -sam.recipe.objcopy.eep.pattern= +#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 +recipe.objcopy.eep.pattern= ##create hex -#sam.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 -sam.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.bin +#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}.bin ##compute size -sam.recipe.size.pattern={0}{1}|{2}.elf +recipe.size.pattern={0}{1} {2}.elf -######################################################## -sam.name=Atmel SAM -#sam.compiler.path Official default is correct, only need to change this if you want to overide the initial default -sam.compiler.path={0}/hardware/tools/CodeSourcery_arm/bin/ -sam.compiler.c.cmd=arm-none-eabi-gcc -sam.compiler.c.flags=|-c|-g|-Os|-w|-mthumb|-mlong-calls|-ffunction-sections|-nostdlib|--param|max-inline-insns-single=500|-Dprintf=iprintf -sam.compiler.c.elf.flags=|-Os|-Wl,--gc-sections -sam.compiler.c.elf.cmd=arm-none-eabi-gcc -sam.compiler.S.flags=|-c|-g|-assembler-with-cpp -sam.compiler.cpp.cmd=arm-none-eabi-g++ -sam.compiler.cpp.flags=|-c|-g|-Os|-w|-mthumb|-mlong-calls|-ffunction-sections|-nostdlib|--param|max-inline-insns-single=500|-fno-rtti|-fno-exceptions|-Dprintf=iprintf -sam.compiler.ar.cmd=arm-none-eabi-ar -sam.compiler.ar.flags=rcs -sam.compiler.objcopy.cmd=arm-none-eabi-objcopy -sam.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0 -sam.compiler.elf2hex.flags=|-O|binary -sam.compiler.elf2hex.cmd=arm-none-eabi-objcopy -sam.compiler.ldflags= -sam.compiler.cpudef=-mcpu= -sam.compiler.size.cmd=arm-none-eabi-size -sam.compiler.upload.cmd= -sam.compiler.upload.flags= -sam.compiler.define=-DARDUINO= -sam.library.path=./hardware/sam/cores/sam -sam.library.core.path=./libraries;./hardware/sam/libraries -