aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/arch/arm/plat-d02/link.mk1
-rw-r--r--core/arch/arm/plat-hikey/link.mk1
-rw-r--r--core/arch/arm/plat-imx/link.mk1
-rw-r--r--core/arch/arm/plat-ls/link.mk1
-rw-r--r--core/arch/arm/plat-mediatek/link.mk1
-rw-r--r--core/arch/arm/plat-rockchip/link.mk1
-rw-r--r--core/arch/arm/plat-rpi3/link.mk1
-rw-r--r--core/arch/arm/plat-sam/link.mk1
-rw-r--r--core/arch/arm/plat-sprd/link.mk1
-rw-r--r--core/arch/arm/plat-stm/link.mk1
-rw-r--r--core/arch/arm/plat-ti/link.mk1
-rw-r--r--core/arch/arm/plat-vexpress/link.mk1
-rw-r--r--core/arch/arm/plat-zynq7k/link.mk1
-rw-r--r--core/arch/arm/plat-zynqmp/link.mk1
-rw-r--r--core/core.mk4
-rw-r--r--documentation/porting_guidelines.md10
16 files changed, 4 insertions, 24 deletions
diff --git a/core/arch/arm/plat-d02/link.mk b/core/arch/arm/plat-d02/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-d02/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-hikey/link.mk b/core/arch/arm/plat-hikey/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-hikey/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-imx/link.mk b/core/arch/arm/plat-imx/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-imx/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-ls/link.mk b/core/arch/arm/plat-ls/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-ls/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-mediatek/link.mk b/core/arch/arm/plat-mediatek/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-mediatek/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-rockchip/link.mk b/core/arch/arm/plat-rockchip/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-rockchip/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-rpi3/link.mk b/core/arch/arm/plat-rpi3/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-rpi3/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-sam/link.mk b/core/arch/arm/plat-sam/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-sam/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-sprd/link.mk b/core/arch/arm/plat-sprd/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-sprd/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-stm/link.mk b/core/arch/arm/plat-stm/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-stm/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-ti/link.mk b/core/arch/arm/plat-ti/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-ti/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-vexpress/link.mk b/core/arch/arm/plat-vexpress/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-vexpress/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-zynq7k/link.mk b/core/arch/arm/plat-zynq7k/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-zynq7k/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/arch/arm/plat-zynqmp/link.mk b/core/arch/arm/plat-zynqmp/link.mk
deleted file mode 100644
index 448ab89f..00000000
--- a/core/arch/arm/plat-zynqmp/link.mk
+++ /dev/null
@@ -1 +0,0 @@
-include core/arch/arm/kernel/link.mk
diff --git a/core/core.mk b/core/core.mk
index 507c78d6..7eb90e3a 100644
--- 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
index 62d55a51..a395a5af 100644
--- 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