summaryrefslogtreecommitdiffstats
path: root/arch/mips/pbl
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pbl')
-rw-r--r--arch/mips/pbl/.gitignore2
-rw-r--r--arch/mips/pbl/Makefile3
-rw-r--r--arch/mips/pbl/piggy.gzip.S2
-rw-r--r--arch/mips/pbl/piggy.lz4.S2
-rw-r--r--arch/mips/pbl/piggy.lzo.S2
-rw-r--r--arch/mips/pbl/piggy.shipped.S2
-rw-r--r--arch/mips/pbl/piggy.xzkern.S2
-rw-r--r--arch/mips/pbl/zbarebox.lds.S4
8 files changed, 16 insertions, 3 deletions
diff --git a/arch/mips/pbl/.gitignore b/arch/mips/pbl/.gitignore
index be604a81bf..667b44eaf3 100644
--- a/arch/mips/pbl/.gitignore
+++ b/arch/mips/pbl/.gitignore
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
piggy.gzip
piggy.lzo
piggy.lz4
diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile
index 3bd0df165d..38dfbd4724 100644
--- a/arch/mips/pbl/Makefile
+++ b/arch/mips/pbl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
@@ -31,7 +32,7 @@ zbarebox-lds := $(obj)/zbarebox.lds
quiet_cmd_zbarebox__ ?= LD $@
cmd_zbarebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_zbarebox) -o $@ \
-T $(zbarebox-lds) \
- --whole-archive $(zbarebox-common) --no-while-archive \
+ --whole-archive $(zbarebox-common) --no-whole-archive \
$(filter-out $(zbarebox-lds) $(zbarebox-common) FORCE ,$^)
$(obj)/zbarebox: $(zbarebox-lds) $(zbarebox-common) FORCE
diff --git a/arch/mips/pbl/piggy.gzip.S b/arch/mips/pbl/piggy.gzip.S
index 1e6bbef66c..b99ba8aeab 100644
--- a/arch/mips/pbl/piggy.gzip.S
+++ b/arch/mips/pbl/piggy.gzip.S
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <asm/asm.h>
.section .data
diff --git a/arch/mips/pbl/piggy.lz4.S b/arch/mips/pbl/piggy.lz4.S
index be9425bf00..c3ddbdace0 100644
--- a/arch/mips/pbl/piggy.lz4.S
+++ b/arch/mips/pbl/piggy.lz4.S
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <asm/asm.h>
.section .data
diff --git a/arch/mips/pbl/piggy.lzo.S b/arch/mips/pbl/piggy.lzo.S
index 6f1af1f314..2c1f4cb34e 100644
--- a/arch/mips/pbl/piggy.lzo.S
+++ b/arch/mips/pbl/piggy.lzo.S
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <asm/asm.h>
.section .data
diff --git a/arch/mips/pbl/piggy.shipped.S b/arch/mips/pbl/piggy.shipped.S
index 8a35f6bc05..fc2859e673 100644
--- a/arch/mips/pbl/piggy.shipped.S
+++ b/arch/mips/pbl/piggy.shipped.S
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <asm/asm.h>
.section .data
diff --git a/arch/mips/pbl/piggy.xzkern.S b/arch/mips/pbl/piggy.xzkern.S
index edfa53b86c..8c99d959f8 100644
--- a/arch/mips/pbl/piggy.xzkern.S
+++ b/arch/mips/pbl/piggy.xzkern.S
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <asm/asm.h>
.section .data
diff --git a/arch/mips/pbl/zbarebox.lds.S b/arch/mips/pbl/zbarebox.lds.S
index 04b5b8680f..e3114dfe22 100644
--- a/arch/mips/pbl/zbarebox.lds.S
+++ b/arch/mips/pbl/zbarebox.lds.S
@@ -3,10 +3,10 @@
* (C) Copyright 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*/
-#include <asm-generic/barebox.lds.h>
+#include <asm/barebox.lds.h>
#include <asm-generic/memory_layout.h>
-OUTPUT_ARCH("mips")
+OUTPUT_ARCH(BAREBOX_OUTPUT_ARCH)
ENTRY(pbl_start)
SECTIONS
{