make it compile with latest libopencm3

amitesh-singh · Jan 6, 2019 · 74f9119 · 74f9119
1 parent 161f4f7
commit 74f9119
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libopencm3_f1.ld b/libopencm3_f1.ld
@@ -4,5 +4,5 @@ MEMORY
     ram (xrw)  : ORIGIN = 0x20000000, LENGTH = 20K
 }
 
-INCLUDE libopencm3_stm32f1.ld
+INCLUDE stm32f103xc.ld
 
diff --git a/meson.build b/meson.build
@@ -41,6 +41,7 @@ srcfiles = ['main.cpp']
 
 libocm3IncPath = libocm3Path + '/include'
 libocm3LibPath = libocm3Path + '/lib'
+libocm3LdPath = libocm3Path + '/lib/stm32/f1'
 
 # check for libopencm3 library
 libocm3lib_obj = compiler_obj.find_library(libocm3cputype, required: true, dirs: libocm3LibPath)
@@ -82,6 +83,7 @@ stm32f1linkargs = ['-Os',
                    '-nostartfiles',
                    '-Wl,--gc-sections',
                    '-L' + libocm3LibPath,
+                   '-L' + libocm3LdPath,
 #               '-l' + libocm3cputype,
                   ]