summaryrefslogtreecommitdiff
path: root/src/nucleao-32
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2019-01-02 22:23:04 -0700
committerBdale Garbee <bdale@gag.com>2019-01-02 22:23:04 -0700
commitb340cbf1403a5f5b181a215935f713a50da8e5e4 (patch)
tree8c0d2afbe8168c29584e0d568b80353fdf555883 /src/nucleao-32
parent1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff)
parent95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff)
Merge branch 'branch-1.9' into debian
Diffstat (limited to 'src/nucleao-32')
-rw-r--r--src/nucleao-32/Makefile2
-rw-r--r--src/nucleao-32/load.ld4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nucleao-32/Makefile b/src/nucleao-32/Makefile
index 2b9fe14f..1ab2eea1 100644
--- a/src/nucleao-32/Makefile
+++ b/src/nucleao-32/Makefile
@@ -26,7 +26,7 @@ ALTOS_SRC = \
ao_cmd.c \
ao_config.c \
ao_task.c \
- ao_led.c \
+ ao_led_stmf0.c \
ao_beep_stm.c \
ao_dma_stm.c \
ao_stdio.c \
diff --git a/src/nucleao-32/load.ld b/src/nucleao-32/load.ld
index 02a23a95..945f7c60 100644
--- a/src/nucleao-32/load.ld
+++ b/src/nucleao-32/load.ld
@@ -82,10 +82,10 @@ SECTIONS {
/* Data -- relocated to RAM, but written to ROM
*/
.data : {
- __data_start__ = .;
+ _start__ = .;
*(.data) /* initialized data */
. = ALIGN(4);
- __data_end__ = .;
+ _end__ = .;
} >ram AT>rom
.bss : {