From cfd87f6b9df350bb16d796717178ed82551a9085 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 25 Jul 2009 00:05:06 +0200 Subject: [PATCH] Add mini ld scripts in the example which include the global one. --- examples/fancyblink/Makefile | 2 +- examples/fancyblink/fancyblink.ld | 31 +++++++++++++++++++++++++++++++ examples/miniblink/Makefile | 2 +- examples/miniblink/miniblink.ld | 31 +++++++++++++++++++++++++++++++ lib/libopenstm32.ld | 8 +------- 5 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 examples/fancyblink/fancyblink.ld create mode 100644 examples/miniblink/miniblink.ld diff --git a/examples/fancyblink/Makefile b/examples/fancyblink/Makefile index a5527be5..5dff6b24 100644 --- a/examples/fancyblink/Makefile +++ b/examples/fancyblink/Makefile @@ -30,7 +30,7 @@ OBJDUMP = $(PREFIX)-objdump TOOLCHAIN_DIR = ../.. CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/libopenstm32.ld +LDSCRIPT = $(BINARY).ld LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles OBJS = $(BINARY).o OPENOCD = openocd diff --git a/examples/fancyblink/fancyblink.ld b/examples/fancyblink/fancyblink.ld new file mode 100644 index 00000000..0445bab3 --- /dev/null +++ b/examples/fancyblink/fancyblink.ld @@ -0,0 +1,31 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2009 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 Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K +} + +/* Include the common ld script from libopenstm32. */ +INCLUDE libopenstm32.ld + diff --git a/examples/miniblink/Makefile b/examples/miniblink/Makefile index 88d7606f..13b0b0cf 100644 --- a/examples/miniblink/Makefile +++ b/examples/miniblink/Makefile @@ -30,7 +30,7 @@ OBJDUMP = $(PREFIX)-objdump TOOLCHAIN_DIR = ../.. CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/libopenstm32.ld +LDSCRIPT = $(BINARY).ld LDFLAGS = -L$(TOOLCHAIN_DIR)/lib -T$(LDSCRIPT) -nostartfiles OBJS = $(BINARY).o OPENOCD = openocd diff --git a/examples/miniblink/miniblink.ld b/examples/miniblink/miniblink.ld new file mode 100644 index 00000000..0445bab3 --- /dev/null +++ b/examples/miniblink/miniblink.ld @@ -0,0 +1,31 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2009 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 Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K +} + +/* Include the common ld script from libopenstm32. */ +INCLUDE libopenstm32.ld + diff --git a/lib/libopenstm32.ld b/lib/libopenstm32.ld index 5f5e398a..9ea3b17e 100644 --- a/lib/libopenstm32.ld +++ b/lib/libopenstm32.ld @@ -19,13 +19,7 @@ /* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ -/* Define memory regions. */ -/* TODO: Make this overridable by the application code, it's MCU specific. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K -} +/* Memory regions must be defined in the ld script which includes this one. */ /* Define sections. */ SECTIONS