Eric Lee / smarc-uboot

29
Download as
Browse Code ยป

Commit 2024b968ee9476bb7809e472a693120e775bbbbb

Authored by Nobuhiro Iwamatsu
Committed by Nobuhiro Iwamatsu
1 parent d0d2271f8c

sh: Fix build in start.S 

By commit 6d8962e814c15807dd6ac5757904be2a02d187b8,
label of _start was not usable in start.S and build fail.
This change label from  _start to _sh_start.

----
arch/sh/cpu/sh4/libsh4.o: In function `_start':
(.text+0x204): multiple definition of `_start'
arch/sh/cpu/sh4/start.o:(.text+0x0): first defined here
----

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

Showing 3 changed files with 13 additions and 13 deletions Side-by-side Diff

arch/sh/cpu/sh2/start.S
Diff comments   View file @ 2024b96
... ... @@ -26,7 +26,7 @@
26 26 .align 2
27 27  
28 28 .global _start
29   -_start:
  29 +_sh_start:
30 30 .long 0x00000010 /* Ppower ON reset PC*/
31 31 .long 0x00000000
32 32 .long 0x00000010 /* Manual reset PC */
... ... @@ -39,7 +39,7 @@
39 39 nop
40 40 1: sts pr, r5
41 41 mov.l ._reloc_dst, r4
42   - add #(_start-1b), r5
  42 + add #(_sh_start-1b), r5
43 43 mov.l ._reloc_dst_end, r6
44 44  
45 45 2: mov.l @r5+, r1
... ... @@ -74,7 +74,7 @@
74 74 ._reloc_dst_end: .long reloc_dst_end
75 75 ._bss_start: .long bss_start
76 76 ._bss_end: .long bss_end
77   -._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
78   -._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
  77 +._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
  78 +._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
79 79 ._sh_generic_init: .long sh_generic_init
arch/sh/cpu/sh3/start.S
Diff comments   View file @ 2024b96
... ... @@ -29,7 +29,7 @@
29 29 .align 2
30 30  
31 31 .global _start
32   -_start:
  32 +_sh_start:
33 33 mov.l ._lowlevel_init, r0
34 34 100: bsrf r0
35 35 nop
... ... @@ -38,7 +38,7 @@
38 38 nop
39 39 1: sts pr, r5
40 40 mov.l ._reloc_dst, r4
41   - add #(_start-1b), r5
  41 + add #(_sh_start-1b), r5
42 42 mov.l ._reloc_dst_end, r6
43 43  
44 44 2: mov.l @r5+, r1
... ... @@ -73,7 +73,7 @@
73 73 ._reloc_dst_end: .long reloc_dst_end
74 74 ._bss_start: .long bss_start
75 75 ._bss_end: .long bss_end
76   -._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
77   -._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
  76 +._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
  77 +._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
78 78 ._sh_generic_init: .long sh_generic_init
arch/sh/cpu/sh4/start.S
Diff comments   View file @ 2024b96
1 1 /*
2   - * (C) Copyright 2007
  2 + * (C) Copyright 2007, 2010
3 3 * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
4 4 *
5 5 * This program is free software; you can redistribute it and/or
... ... @@ -26,7 +26,7 @@
26 26 .align 2
27 27  
28 28 .global _start
29   -_start:
  29 +_sh_start:
30 30 mov.l ._lowlevel_init, r0
31 31 100: bsrf r0
32 32 nop
... ... @@ -35,7 +35,7 @@
35 35 nop
36 36 1: sts pr, r5
37 37 mov.l ._reloc_dst, r4
38   - add #(_start-1b), r5
  38 + add #(_sh_start-1b), r5
39 39 mov.l ._reloc_dst_end, r6
40 40  
41 41 2: mov.l @r5+, r1
... ... @@ -70,7 +70,7 @@
70 70 ._reloc_dst_end: .long reloc_dst_end
71 71 ._bss_start: .long bss_start
72 72 ._bss_end: .long bss_end
73   -._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
74   -._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
  73 +._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
  74 +._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
75 75 ._sh_generic_init: .long sh_generic_init