From f29b4a041f211cbba18a659d9f2a45c799982d24 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 28 Jul 2010 09:29:11 +0200 Subject: [PATCH] --- yaml --- r: 204647 b: refs/heads/master c: ca28b510163a55df6260652056bfc60c4cf8aca1 h: refs/heads/master i: 204645: ab45ca8d3cf32576a984accb0b43dc3b36dfa304 204643: 1697109c49faa015e09f996a1ccb21219aa2237d 204639: 81d17d6b5f9554ce9548fa8bfc734abe689bc3cf v: v3 --- [refs] | 2 +- trunk/arch/microblaze/boot/Makefile | 2 +- trunk/arch/microblaze/kernel/vmlinux.lds.S | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9f635bb101b4..8cef413118e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61b403af8b0af4225802da60406045faf0e5d612 +refs/heads/master: ca28b510163a55df6260652056bfc60c4cf8aca1 diff --git a/trunk/arch/microblaze/boot/Makefile b/trunk/arch/microblaze/boot/Makefile index 745a7f145fbe..be01d78750d9 100644 --- a/trunk/arch/microblaze/boot/Makefile +++ b/trunk/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/trunk/arch/microblaze/kernel/vmlinux.lds.S b/trunk/arch/microblaze/kernel/vmlinux.lds.S index b0de1a6b5513..a09f2962fbec 100644 --- a/trunk/arch/microblaze/kernel/vmlinux.lds.S +++ b/trunk/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 #include @@ -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 = . ;