aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2009-07-25 00:05:06 +0200
committerUwe Hermann2009-07-25 00:05:06 +0200
commitcfd87f6b9df350bb16d796717178ed82551a9085 (patch)
treeca0b71f84a864ef6d2cdfcaf58141efb06d951b9
parent3f12e37531d86d17fb5b3b1e2711d9ff62e00742 (diff)
Add mini ld scripts in the example which include the global one.
-rw-r--r--examples/fancyblink/Makefile2
-rw-r--r--examples/fancyblink/fancyblink.ld31
-rw-r--r--examples/miniblink/Makefile2
-rw-r--r--examples/miniblink/miniblink.ld31
-rw-r--r--lib/libopenstm32.ld8
5 files changed, 65 insertions, 9 deletions
diff --git a/examples/fancyblink/Makefile b/examples/fancyblink/Makefile
index a5527be..5dff6b2 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 0000000..0445bab
--- /dev/null
+++ b/examples/fancyblink/fancyblink.ld
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the libopenstm32 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/* 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 88d7606..13b0b0c 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 0000000..0445bab
--- /dev/null
+++ b/examples/miniblink/miniblink.ld
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the libopenstm32 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/* 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 5f5e398..9ea3b17 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