From e318b3891d8d78cde61146bbbf6264e3cff4a208 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sat, 8 Jun 2019 18:20:13 +0200
Subject: [PATCH] build: Explicitly & individually include startup code

Signed-off-by: Rahix <rahix@rahix.de>
---
 hw-tests/bmatest/meson.build        | 2 +-
 hw-tests/bmetest/meson.build        | 2 +-
 hw-tests/ecgtest/meson.build        | 2 +-
 hw-tests/hello-freertos/meson.build | 2 +-
 hw-tests/hello-world/meson.build    | 2 +-
 hw-tests/imutest/meson.build        | 2 +-
 hw-tests/ips/meson.build            | 2 +-
 lib/card10/meson.build              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw-tests/bmatest/meson.build b/hw-tests/bmatest/meson.build
index 6fafa0c6..ad46a417 100644
--- a/hw-tests/bmatest/meson.build
+++ b/hw-tests/bmatest/meson.build
@@ -3,7 +3,7 @@ name = 'bmatest'
 executable(
   name + '.elf',
   'main.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/bmetest/meson.build b/hw-tests/bmetest/meson.build
index 485d0a78..31ad3585 100644
--- a/hw-tests/bmetest/meson.build
+++ b/hw-tests/bmetest/meson.build
@@ -3,7 +3,7 @@ name = 'bmetest'
 executable(
   name + '.elf',
   'main.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/ecgtest/meson.build b/hw-tests/ecgtest/meson.build
index 3210e186..e7cff9b5 100644
--- a/hw-tests/ecgtest/meson.build
+++ b/hw-tests/ecgtest/meson.build
@@ -3,7 +3,7 @@ name = 'ecgtest'
 executable(
   name + '.elf',
   'main.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/hello-freertos/meson.build b/hw-tests/hello-freertos/meson.build
index 7a8b45bc..4f6446c9 100644
--- a/hw-tests/hello-freertos/meson.build
+++ b/hw-tests/hello-freertos/meson.build
@@ -20,7 +20,7 @@ executable(
   name + '.elf',
   sources,
   include_directories: freertos_sdk_includes,
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_with: freertos,
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
diff --git a/hw-tests/hello-world/meson.build b/hw-tests/hello-world/meson.build
index cbd33f2e..f559d149 100644
--- a/hw-tests/hello-world/meson.build
+++ b/hw-tests/hello-world/meson.build
@@ -3,7 +3,7 @@ name = 'hello-world'
 executable(
   name + '.elf',
   'main.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/imutest/meson.build b/hw-tests/imutest/meson.build
index 9aa7c194..a25bc729 100644
--- a/hw-tests/imutest/meson.build
+++ b/hw-tests/imutest/meson.build
@@ -3,7 +3,7 @@ name = 'imutest'
 executable(
   name + '.elf',
   'main.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/ips/meson.build b/hw-tests/ips/meson.build
index 59dfcded..5a777d59 100644
--- a/hw-tests/ips/meson.build
+++ b/hw-tests/ips/meson.build
@@ -5,7 +5,7 @@ executable(
   'main.c',
   'image/image.c',
   'image/image2.c',
-  dependencies: [libcard10],
+  dependencies: [libcard10, max32665_startup],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/lib/card10/meson.build b/lib/card10/meson.build
index 3413a9d3..07c9e3e3 100644
--- a/lib/card10/meson.build
+++ b/lib/card10/meson.build
@@ -29,5 +29,5 @@ lib = static_library(
 libcard10 = declare_dependency(
   include_directories: includes,
   link_with: lib,
-  dependencies: [deps, max32665_startup],
+  dependencies: deps,
 )
-- 
GitLab