summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-07-28 09:29:11 +0200
committerMichal Simek <monstr@monstr.eu>2010-08-04 10:22:41 +0200
commitca28b510163a55df6260652056bfc60c4cf8aca1 (patch)
treefbf13708f1f5bac0f2a901c1c424312f9d21a7a0
parent61b403af8b0af4225802da60406045faf0e5d612 (diff)
downloadlinux-3.10-ca28b510163a55df6260652056bfc60c4cf8aca1.tar.gz
linux-3.10-ca28b510163a55df6260652056bfc60c4cf8aca1.tar.bz2
linux-3.10-ca28b510163a55df6260652056bfc60c4cf8aca1.zip
microblaze: Do not use _start in vmlinux
_start symbol stores physical address where kernel is. Gdb uses this symbol for their purpose that's why we have to rename it. Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r--arch/microblaze/boot/Makefile2
-rw-r--r--arch/microblaze/kernel/vmlinux.lds.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index 745a7f145fb..be01d78750d 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -35,7 +35,7 @@ quiet_cmd_cp = CP $< $@$2
cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
quiet_cmd_strip = STRIP $@
- cmd_strip = $(STRIP) -K _start -K _end -K __log_buf \
+ cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
-K _fdt_start vmlinux -o $@
quiet_cmd_uimage = UIMAGE $@.ub
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index b0de1a6b551..a09f2962fbe 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -10,7 +10,7 @@
OUTPUT_FORMAT("elf32-microblaze", "elf32-microblaze", "elf32-microblaze")
OUTPUT_ARCH(microblaze)
-ENTRY(_start)
+ENTRY(microblaze_start)
#include <asm/page.h>
#include <asm-generic/vmlinux.lds.h>
@@ -20,7 +20,7 @@ jiffies = jiffies_64 + 4;
SECTIONS {
. = CONFIG_KERNEL_START;
- _start = CONFIG_KERNEL_BASE_ADDR;
+ microblaze_start = CONFIG_KERNEL_BASE_ADDR;
.text : AT(ADDR(.text) - LOAD_OFFSET) {
_text = . ;
_stext = . ;