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/lm3s/Makefile.include | 2 +- examples/lm3s/lm3s3748-evb/lm3s3748-evb.ld | 31 +++++++++++++++++++++++ examples/lm3s/lm3s3748-evb/miniblink/Makefile | 2 ++ examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld | 31 ----------------------- 4 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 examples/lm3s/lm3s3748-evb/lm3s3748-evb.ld delete mode 100644 examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld (limited to 'examples/lm3s') diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include index 0eafe7d..1e89988 100644 --- a/examples/lm3s/Makefile.include +++ b/examples/lm3s/Makefile.include @@ -29,7 +29,7 @@ OBJDUMP = $(PREFIX)-objdump TOOLCHAIN_DIR = ../../../.. CFLAGS += -O0 -g3 -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb -MD -LDSCRIPT = $(BINARY).ld +LDSCRIPT ?= $(BINARY).ld LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/lm3s \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections OBJS += $(BINARY).o diff --git a/examples/lm3s/lm3s3748-evb/lm3s3748-evb.ld b/examples/lm3s/lm3s3748-evb/lm3s3748-evb.ld new file mode 100644 index 0000000..bca5282 --- /dev/null +++ b/examples/lm3s/lm3s3748-evb/lm3s3748-evb.ld @@ -0,0 +1,31 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Uwe Hermann + * + * 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 Luminary Micro (now TI) Stellaris LM3S3748-EVB. */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K +} + +/* Include the common ld script. */ +INCLUDE libopencm3_lm3s.ld + diff --git a/examples/lm3s/lm3s3748-evb/miniblink/Makefile b/examples/lm3s/lm3s3748-evb/miniblink/Makefile index 110e69e..3229fe6 100644 --- a/examples/lm3s/lm3s3748-evb/miniblink/Makefile +++ b/examples/lm3s/lm3s3748-evb/miniblink/Makefile @@ -19,5 +19,7 @@ BINARY = miniblink +LDSCRIPT = ../lm3s3748-evb.ld + include ../../Makefile.include diff --git a/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld b/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld deleted file mode 100644 index bca5282..0000000 --- a/examples/lm3s/lm3s3748-evb/miniblink/miniblink.ld +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Uwe Hermann - * - * 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 Luminary Micro (now TI) Stellaris LM3S3748-EVB. */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_lm3s.ld - -- cgit v1.2.3