core: core.mk: make platform specific link.mk optional

Most platform do not need any special linker targets and so most just link back to the default. Lets just have core.mk use the default when a platform does not have this file. Also remove this from the porting guidelines as it is now optional and only needed for advanced use. Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
OP-TEE · Oct 11, 2017 · 71315c3 · 71315c3
1 parent 6afb853
commit 71315c3
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 24 deletions.
diff --git a/core/arch/arm/plat-d02/link.mk b/core/arch/arm/plat-d02/link.mk
diff --git a/core/arch/arm/plat-hikey/link.mk b/core/arch/arm/plat-hikey/link.mk
diff --git a/core/arch/arm/plat-imx/link.mk b/core/arch/arm/plat-imx/link.mk
diff --git a/core/arch/arm/plat-ls/link.mk b/core/arch/arm/plat-ls/link.mk
diff --git a/core/arch/arm/plat-mediatek/link.mk b/core/arch/arm/plat-mediatek/link.mk
diff --git a/core/arch/arm/plat-rockchip/link.mk b/core/arch/arm/plat-rockchip/link.mk
diff --git a/core/arch/arm/plat-rpi3/link.mk b/core/arch/arm/plat-rpi3/link.mk
diff --git a/core/arch/arm/plat-sam/link.mk b/core/arch/arm/plat-sam/link.mk
diff --git a/core/arch/arm/plat-sprd/link.mk b/core/arch/arm/plat-sprd/link.mk
diff --git a/core/arch/arm/plat-stm/link.mk b/core/arch/arm/plat-stm/link.mk
diff --git a/core/arch/arm/plat-ti/link.mk b/core/arch/arm/plat-ti/link.mk
diff --git a/core/arch/arm/plat-vexpress/link.mk b/core/arch/arm/plat-vexpress/link.mk
diff --git a/core/arch/arm/plat-zynq7k/link.mk b/core/arch/arm/plat-zynq7k/link.mk
diff --git a/core/arch/arm/plat-zynqmp/link.mk b/core/arch/arm/plat-zynqmp/link.mk
diff --git a/core/core.mk b/core/core.mk
@@ -110,4 +110,6 @@ include mk/subdir.mk
 asm-defines-file := core/arch/$(ARCH)/kernel/asm-defines.c
 include mk/compile.mk
 
-include $(platform-dir)/link.mk
+include $(if $(wildcard $(platform-dir)/link.mk), \
+		$(platform-dir)/link.mk, \
+		core/arch/$(ARCH)/kernel/link.mk)
diff --git a/documentation/porting_guidelines.md b/documentation/porting_guidelines.md
@@ -43,7 +43,7 @@ where you are supposed to add a new platform or modify an existing one.
 Typically you will find this set of files in a specific platform folder:
 ```bash
 $ ls
-conf.mk  link.mk  main.c  platform_config.h  sub.mk
+conf.mk  main.c  platform_config.h  sub.mk
 ```
 
 So for the gendev platform it means that the files should be placed in this
@@ -95,14 +95,6 @@ There are probably quite a few other flags that could be useful or even
 necessary. Please refer to the other `conf.mk` file in the already existing
 platforms.
 
-##### link.mk
-This is the makefile for the linker, just as for the linker script, most
-platforms use the same and generic makefile for the linker, so adding only this
-should probably be sufficient:
-```Makefile
-include core/arch/arm/kernel/link.mk
-```
-
 ##### main.c
 This platform specific file will contain power management handlers and code
 related to the UART. We will talk more about the information related to the