From c3fea659d1313e324bb7512e7e50875e0cb0318a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 13 Nov 2011 12:32:45 +0100 Subject: examples: Remove duplicate example linker scripts. Only add one linker script per eval board, and have the Makefiles use that. This avoids duplication, and various copy-paste errors and left-overs which we already have in the tree. Some of the linker scripts are not really correct, yet. Both, the comments which say which board, chip, and RAM/ROM sizes are used, as well as the actual RAM/ROM size definitions are sometimes copy-pasted from other boards and are thus incorrect. This needs to be fixed. --- examples/stm32/f4/Makefile.include | 2 +- .../stm32/f4/stm32f4-discovery/button/Makefile | 2 ++ .../stm32/f4/stm32f4-discovery/button/button.ld | 32 ---------------------- .../stm32/f4/stm32f4-discovery/fancyblink/Makefile | 2 ++ .../f4/stm32f4-discovery/fancyblink/fancyblink.ld | 32 ---------------------- .../stm32/f4/stm32f4-discovery/miniblink/Makefile | 2 ++ .../f4/stm32f4-discovery/miniblink/miniblink.ld | 32 ---------------------- .../f4/stm32f4-discovery/stm32f4-discovery.ld | 32 ++++++++++++++++++++++ examples/stm32/f4/stm32f4-discovery/usart/Makefile | 2 ++ examples/stm32/f4/stm32f4-discovery/usart/usart.ld | 32 ---------------------- 10 files changed, 41 insertions(+), 129 deletions(-) delete mode 100644 examples/stm32/f4/stm32f4-discovery/button/button.ld delete mode 100644 examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.ld delete mode 100644 examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.ld create mode 100644 examples/stm32/f4/stm32f4-discovery/stm32f4-discovery.ld delete mode 100644 examples/stm32/f4/stm32f4-discovery/usart/usart.ld (limited to 'examples/stm32/f4') diff --git a/examples/stm32/f4/Makefile.include b/examples/stm32/f4/Makefile.include index c3058ee..bed1aa8 100644 --- a/examples/stm32/f4/Makefile.include +++ b/examples/stm32/f4/Makefile.include @@ -31,7 +31,7 @@ GDB = $(PREFIX)-gdb TOOLCHAIN_DIR = ../../../../.. CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F4 -LDSCRIPT = $(BINARY).ld +LDSCRIPT ?= $(BINARY).ld LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib \ -L$(TOOLCHAIN_DIR)/lib/stm32/f4 \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \ diff --git a/examples/stm32/f4/stm32f4-discovery/button/Makefile b/examples/stm32/f4/stm32f4-discovery/button/Makefile index 96731c2..6fc56b8 100644 --- a/examples/stm32/f4/stm32f4-discovery/button/Makefile +++ b/examples/stm32/f4/stm32f4-discovery/button/Makefile @@ -19,5 +19,7 @@ BINARY = button +LDSCRIPT = ../stm32f4-discovery.ld + include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-discovery/button/button.ld b/examples/stm32/f4/stm32f4-discovery/button/button.ld deleted file mode 100644 index 1cb43c6..0000000 --- a/examples/stm32/f4/stm32f4-discovery/button/button.ld +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2011 Stephen Caudle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* Linker script for ST STM32F4DISCOVERY (STM32F407VG, 1024K flash, 128K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 1024K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f4.ld - diff --git a/examples/stm32/f4/stm32f4-discovery/fancyblink/Makefile b/examples/stm32/f4/stm32f4-discovery/fancyblink/Makefile index 1baec4d..b4250da 100644 --- a/examples/stm32/f4/stm32f4-discovery/fancyblink/Makefile +++ b/examples/stm32/f4/stm32f4-discovery/fancyblink/Makefile @@ -19,5 +19,7 @@ BINARY = fancyblink +LDSCRIPT = ../stm32f4-discovery.ld + include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.ld b/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.ld deleted file mode 100644 index 1cb43c6..0000000 --- a/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.ld +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2011 Stephen Caudle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* Linker script for ST STM32F4DISCOVERY (STM32F407VG, 1024K flash, 128K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 1024K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f4.ld - diff --git a/examples/stm32/f4/stm32f4-discovery/miniblink/Makefile b/examples/stm32/f4/stm32f4-discovery/miniblink/Makefile index 24a478b..d6ec46d 100644 --- a/examples/stm32/f4/stm32f4-discovery/miniblink/Makefile +++ b/examples/stm32/f4/stm32f4-discovery/miniblink/Makefile @@ -19,5 +19,7 @@ BINARY = miniblink +LDSCRIPT = ../stm32f4-discovery.ld + include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.ld b/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.ld deleted file mode 100644 index 1cb43c6..0000000 --- a/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.ld +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2011 Stephen Caudle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* Linker script for ST STM32F4DISCOVERY (STM32F407VG, 1024K flash, 128K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 1024K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f4.ld - diff --git a/examples/stm32/f4/stm32f4-discovery/stm32f4-discovery.ld b/examples/stm32/f4/stm32f4-discovery/stm32f4-discovery.ld new file mode 100644 index 0000000..1cb43c6 --- /dev/null +++ b/examples/stm32/f4/stm32f4-discovery/stm32f4-discovery.ld @@ -0,0 +1,32 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * Copyright (C) 2011 Stephen Caudle + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* Linker script for ST STM32F4DISCOVERY (STM32F407VG, 1024K flash, 128K RAM). */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x08000000, LENGTH = 1024K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K +} + +/* Include the common ld script. */ +INCLUDE libopencm3_stm32f4.ld + diff --git a/examples/stm32/f4/stm32f4-discovery/usart/Makefile b/examples/stm32/f4/stm32f4-discovery/usart/Makefile index 2c1e1b1..7d7bc9a 100644 --- a/examples/stm32/f4/stm32f4-discovery/usart/Makefile +++ b/examples/stm32/f4/stm32f4-discovery/usart/Makefile @@ -19,5 +19,7 @@ BINARY = usart +LDSCRIPT = ../stm32f4-discovery.ld + include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-discovery/usart/usart.ld b/examples/stm32/f4/stm32f4-discovery/usart/usart.ld deleted file mode 100644 index 1cb43c6..0000000 --- a/examples/stm32/f4/stm32f4-discovery/usart/usart.ld +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2011 Stephen Caudle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* Linker script for ST STM32F4DISCOVERY (STM32F407VG, 1024K flash, 128K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 1024K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f4.ld - -- cgit v1.2.3