| From 4119ba211bc4f1bf638f41e50b7a0f329f58aa16 Mon Sep 17 00:00:00 2001 |
| From: Max Filippov <jcmvbkbc@gmail.com> |
| Date: Mon, 29 Oct 2018 18:30:13 -0700 |
| Subject: xtensa: add NOTES section to the linker script |
| |
| From: Max Filippov <jcmvbkbc@gmail.com> |
| |
| commit 4119ba211bc4f1bf638f41e50b7a0f329f58aa16 upstream. |
| |
| This section collects all source .note.* sections together in the |
| vmlinux image. Without it .note.Linux section may be placed at address |
| 0, while the rest of the kernel is at its normal address, resulting in a |
| huge vmlinux.bin image that may not be linked into the xtensa Image.elf. |
| |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/xtensa/boot/Makefile | 2 +- |
| arch/xtensa/kernel/vmlinux.lds.S | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/xtensa/boot/Makefile |
| +++ b/arch/xtensa/boot/Makefile |
| @@ -34,7 +34,7 @@ boot-elf boot-redboot: $(addprefix $(obj |
| $(addprefix $(obj)/,$(host-progs)) |
| $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) |
| |
| -OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary |
| +OBJCOPYFLAGS = --strip-all -R .comment -R .notes -O binary |
| |
| vmlinux.bin: vmlinux FORCE |
| $(call if_changed,objcopy) |
| --- a/arch/xtensa/kernel/vmlinux.lds.S |
| +++ b/arch/xtensa/kernel/vmlinux.lds.S |
| @@ -146,6 +146,7 @@ SECTIONS |
| .fixup : { *(.fixup) } |
| |
| EXCEPTION_TABLE(16) |
| + NOTES |
| /* Data section */ |
| |
| _sdata = .; |