diff --git a/ld/devices.data b/ld/devices.data index 5574161f..f8882a33 100644 --- a/ld/devices.data +++ b/ld/devices.data @@ -1,28 +1,28 @@ ################################################################################ # # Device chip tree definition file. -# +# # Copyright (c) 2013 Frantisek Burian # Copyright (C) 2013 Werner Almesberger # # Line description: # ( ...) # -# : is the pattern for the chip description to be searched for. +# : is the pattern for the chip description to be searched for. # The case of the pattern string is ignored. # Pattern match symbols: # ? - matches exactly one character # * - matches none or more characters # + - matches single or more characters # -# : is the parent group name, where the search will continue. +# : is the parent group name, where the search will continue. # There are special parents names that controls traversing: # "END" - Exit traversal. # "+" - Don't change the parent. Use for split long line to two. # # : space-separated list of preprocessor symbols supplied to the linker. # -D option name is automatically prepended to each symbol definition -# +# # All lines starting with # symbol are treated as Comments # # Recommended tree hierarchy: @@ -33,14 +33,14 @@ # +- END # # You can split the long line into two or more by using "+" in the parent field, -# and defining same regex with appropriate parent on the next line. Example: +# and defining same regex with appropriate parent on the next line. Example: # # device + PARAM1=aaa PARAM2=bbbb PARAM3=ccc PARAM4=dddd PARAM5=eeee # device parent PARAM6=ffff PARAM7=gggg PARAM8=hhhh # parent END # -# The order of the lines is important. After the regex match, its parent will -# be used for match on the next line. If two regexp lines matches input, only +# The order of the lines is important. After the regex match, its parent will +# be used for match on the next line. If two regexp lines matches input, only # the first will be evaluated, except special group definition "+" # # The regex matches entire sym @@ -268,7 +268,7 @@ lm3s8962 lm3fury ROM=256K RAM=64K ################################################################################ # the TI cortex R4F chips -rm46l852* rm46l ROM=1280K RAM=192K +rm46l852* rm46l ROM=1280K RAM=192K ################################################################################ ################################################################################ @@ -314,13 +314,13 @@ sam3x sam3 ROM_OFF=0x00800000 RAM_OFF=0x20000000 ################################################################################ # the lpc families -lpc13 lpc ROM_OFF=0x00000000 RAM_OFF=0x10000000 RAM1_OFF=0x20000000 +lpc13 lpc ROM_OFF=0x00000000 RAM_OFF=0x10000000 RAM1_OFF=0x20000000 lpc17 lpc ROM_OFF=0x00000000 RAM_OFF=0x10000000 ################################################################################ # the efm32 Gecko families -efm32zg efm32 ROM_OFF=0x00000000 RAM_OFF=0x20000000 RAM1_OFF=0x10000000 +efm32zg efm32 ROM_OFF=0x00000000 RAM_OFF=0x20000000 RAM1_OFF=0x10000000 efm32tg efm32 ROM_OFF=0x00000000 RAM_OFF=0x20000000 RAM1_OFF=0x10000000 efm32g efm32 ROM_OFF=0x00000000 RAM_OFF=0x20000000 RAM1_OFF=0x10000000 efm32lg efm32 ROM_OFF=0x00000000 RAM_OFF=0x20000000 RAM1_OFF=0x10000000 @@ -338,7 +338,7 @@ lm3sandstorm lm3 ROM_OFF=0x00000000 RAM_OFF=0x20000000 # Cortex R4F families rm46l rm4 ROM_OFF=0x00000000 RAM_OFF=0x08000000 RAM1_OFF=0x08400000 - + ################################################################################ ################################################################################ ################################################################################ @@ -350,4 +350,4 @@ lpc END efm32 END lm3 END rm4 END - + diff --git a/lib/linker.ld.S b/lib/linker.ld.S index 2542495c..7618d158 100644 --- a/lib/linker.ld.S +++ b/lib/linker.ld.S @@ -2,7 +2,7 @@ * This file is part of the libopencm3 project. * * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2013 Frantisek Burian + * Copyright (C) 2013 Frantisek Burian * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -69,8 +69,9 @@ SECTIONS . = ALIGN(4); } >rom - /* C++ Static constructors/destructors, also used for - * __attribute__((constructor)) and the likes */ + /* C++ Static constructors/destructors, also used for + * __attribute__((constructor)) and the likes. + */ .preinit_array : { . = ALIGN(4); __preinit_array_start = .; diff --git a/scripts/genlink.awk b/scripts/genlink.awk index ba038c0d..1550d883 100644 --- a/scripts/genlink.awk +++ b/scripts/genlink.awk @@ -1,4 +1,4 @@ -# This program converts chip name to the series of definitions for make of +# This program converts chip name to the series of definitions for make of # automatic linker script. # # Copyright (C) 2013 Frantisek Burian @@ -18,7 +18,7 @@ BEGIN { if (PAT ~ tmp) { if ($2 != "+") PAT=$2; - $1=""; + $1=""; $2=""; for (i = 3; i <= NF; i = i + 1) $i = "-D"$i;