From 63632cb370f6797a09bd1ca9bf438aa710970ccb Mon Sep 17 00:00:00 2001
From: Kofi Doku Atuah <kofidoku.atuah@data61.csiro.au>
Date: Thu, 24 Jan 2019 09:53:14 +1100
Subject: [PATCH] CMake: Update to use new common, preprocessed ldscripts

---
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fda10420..39cb6072e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,8 +378,14 @@ CPPFile(kernel_all.i kernel_i_wrapper kernel_all.c
 # Explain to cmake that our object file is actually a C input file
 set_property(SOURCE kernel_all.i PROPERTY LANGUAGE C)
 
-set(linker_source "src/plat/${KernelPlatform}/linker.lds")
+if (KernelArchARM)
+    set(linker_source "src/arch/arm/common_arm.lds")
+else()
+    set(linker_source "src/plat/${KernelPlatform}/linker.lds")
+endif()
 set(linker_lds_path "${CMAKE_CURRENT_BINARY_DIR}/linker.lds_pp")
+
+# Preprocess the linker script
 CPPFile("${linker_lds_path}" linker_ld_wrapper "${linker_source}"
     EXTRA_DEPS kernel_headers ${gen_files_list}
     EXTRA_FLAGS -CC -P "${CPPExtraFlags}"