diff --git a/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld b/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld index 114fc85c..bca5282c 100644 --- a/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld +++ b/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -/* Linker script for LM3S3748-EVB */ +/* Linker script for Luminary Micro (now TI) Stellaris LM3S3748-EVB. */ /* Define memory regions. */ MEMORY diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld index 08414769..54e5dac7 100644 --- a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld +++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld @@ -20,7 +20,7 @@ /* Define memory regions. */ MEMORY { - rom (rx) : ORIGIN = 0x08000000, LENGTH =8K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 8K ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K } diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.ld b/examples/stm32/lisa-m/usb_hid/usbhid.ld index b3483ac1..928c898a 100644 --- a/examples/stm32/lisa-m/usb_hid/usbhid.ld +++ b/examples/stm32/lisa-m/usb_hid/usbhid.ld @@ -26,7 +26,6 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } - /* Include the common ld script. */ INCLUDE libopencm3_stm32.ld diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.ld b/examples/stm32/other/usb_cdcacm/cdcacm.ld index 49303940..1c20282d 100644 --- a/examples/stm32/other/usb_cdcacm/cdcacm.ld +++ b/examples/stm32/other/usb_cdcacm/cdcacm.ld @@ -20,7 +20,7 @@ /* Define memory regions. */ MEMORY { - rom (rx) : ORIGIN = 0x08000000, LENGTH =64K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 64K ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } diff --git a/examples/stm32/other/usb_dfu/usbdfu.ld b/examples/stm32/other/usb_dfu/usbdfu.ld index 08414769..54e5dac7 100644 --- a/examples/stm32/other/usb_dfu/usbdfu.ld +++ b/examples/stm32/other/usb_dfu/usbdfu.ld @@ -20,7 +20,7 @@ /* Define memory regions. */ MEMORY { - rom (rx) : ORIGIN = 0x08000000, LENGTH =8K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 8K ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K } diff --git a/examples/stm32/other/usb_hid/usbhid.ld b/examples/stm32/other/usb_hid/usbhid.ld index 49303940..1c20282d 100644 --- a/examples/stm32/other/usb_hid/usbhid.ld +++ b/examples/stm32/other/usb_hid/usbhid.ld @@ -20,7 +20,7 @@ /* Define memory regions. */ MEMORY { - rom (rx) : ORIGIN = 0x08000000, LENGTH =64K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 64K ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld index b3483ac1..928c898a 100644 --- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld +++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld @@ -26,7 +26,6 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } - /* Include the common ld script. */ INCLUDE libopencm3_stm32.ld diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld index 08414769..54e5dac7 100644 --- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld +++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld @@ -20,7 +20,7 @@ /* Define memory regions. */ MEMORY { - rom (rx) : ORIGIN = 0x08000000, LENGTH =8K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 8K ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K } diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.ld b/examples/stm32/stm32-h103/usb_hid/usbhid.ld index b3483ac1..928c898a 100644 --- a/examples/stm32/stm32-h103/usb_hid/usbhid.ld +++ b/examples/stm32/stm32-h103/usb_hid/usbhid.ld @@ -26,7 +26,6 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } - /* Include the common ld script. */ INCLUDE libopencm3_stm32.ld diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.ld b/examples/stm32/stm32-h103/usb_iap/usbiap.ld index b3483ac1..928c898a 100644 --- a/examples/stm32/stm32-h103/usb_iap/usbiap.ld +++ b/examples/stm32/stm32-h103/usb_iap/usbiap.ld @@ -26,7 +26,6 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K } - /* Include the common ld script. */ INCLUDE libopencm3_stm32.ld diff --git a/include/libopencm3/cm3/scs.h b/include/libopencm3/cm3/scs.h index d3424dce..5646a186 100644 --- a/include/libopencm3/cm3/scs.h +++ b/include/libopencm3/cm3/scs.h @@ -58,4 +58,3 @@ #define SCS_DEMCR_VC_MON_PEND 0x00020000 #endif - diff --git a/lib/lm3s/Makefile b/lib/lm3s/Makefile index 7197ec31..25c57ec7 100644 --- a/lib/lm3s/Makefile +++ b/lib/lm3s/Makefile @@ -28,8 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ -ffunction-sections -fdata-sections # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = gpio.o \ - vector.o +OBJS = gpio.o vector.o # VPATH += ../usb diff --git a/lib/lm3s/gpio.c b/lib/lm3s/gpio.c index 34df295f..88e105f3 100644 --- a/lib/lm3s/gpio.c +++ b/lib/lm3s/gpio.c @@ -29,4 +29,3 @@ void gpio_clear(u32 gpioport, u8 gpios) { GPIO_DATA(gpioport)[gpios] = 0; } - diff --git a/lib/lm3s/libopencm3_lm3s.ld b/lib/lm3s/libopencm3_lm3s.ld index 58711387..ebb79df1 100644 --- a/lib/lm3s/libopencm3_lm3s.ld +++ b/lib/lm3s/libopencm3_lm3s.ld @@ -21,7 +21,7 @@ /* Memory regions must be defined in the ld script which includes this one. */ -/* Enforce emmition of the vector table */ +/* Enforce emmition of the vector table. */ EXTERN (vector_table) /* Define sections. */ diff --git a/lib/lpc13xx/libopencm3_lpc13xx.ld b/lib/lpc13xx/libopencm3_lpc13xx.ld index c709a8ce..f10246d1 100644 --- a/lib/lpc13xx/libopencm3_lpc13xx.ld +++ b/lib/lpc13xx/libopencm3_lpc13xx.ld @@ -21,7 +21,7 @@ /* Memory regions must be defined in the ld script which includes this one. */ -/* Enforce emmition of the vector table */ +/* Enforce emmition of the vector table. */ EXTERN (vector_table) /* Define sections. */ diff --git a/lib/stm32/libopencm3_stm32.ld b/lib/stm32/libopencm3_stm32.ld index b0e202e9..fda7d023 100644 --- a/lib/stm32/libopencm3_stm32.ld +++ b/lib/stm32/libopencm3_stm32.ld @@ -21,7 +21,7 @@ /* Memory regions must be defined in the ld script which includes this one. */ -/* Enforce emmition of the vector table */ +/* Enforce emmition of the vector table. */ EXTERN (vector_table) /* Define sections. */