sh: share the correct version of start.S among all cpus

It is easy to note that SH2/SH3/SH4 start.S code is practically
the same with a minor difference for SH2 where a short data header is
present. To avoid unwanted code duplication and to automatically
convert SH2 and SH3 platforms to generic board support move fixed SH4
start.S into arch/sh/lib/start.S and share it among all platforms.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index ca55fac9203acab869216ab30e99db81b00c3aae..14e0b66540154fb444e6448d3a2ef930fbb51028 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-head-y := arch/sh/cpu/$(CPU)/start.o
+head-y := arch/sh/lib/start.o
 
 libs-y += arch/sh/cpu/$(CPU)/
 libs-y += arch/sh/lib/

diff --git a/arch/sh/cpu/sh2/Makefile b/arch/sh/cpu/sh2/Makefile
index a19ed5ecf59a56c1ce93de3d5ce2944cb64e9a6e..80fff4920968c1de763fc00eaaf6f4bc3586f082 100644 (file)
--- a/arch/sh/cpu/sh2/Makefile
+++ b/arch/sh/cpu/sh2/Makefile
@@ -8,5 +8,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-extra-y        = start.o
 obj-y  = cpu.o interrupts.o watchdog.o

diff --git a/arch/sh/cpu/sh2/start.S b/arch/sh/cpu/sh2/start.S
deleted file mode 100644 (file)
index 6171edc..0000000
--- a/arch/sh/cpu/sh2/start.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- * Copyright (C) 2008 Renesas Solutions Corp.
-
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm-offsets.h>
-#include <config.h>
-
-       .text
-       .align  2
-
-       .global _start
-_sh_start:
-       .long 0x00000010        /* Ppower ON reset PC*/
-       .long 0x00000000
-       .long 0x00000010        /* Manual reset PC */
-       .long 0x00000000
-_init:
-       mov.l   ._lowlevel_init, r0
-100:   bsrf    r0
-       nop
-       bsr     1f
-       nop
-1:     sts     pr, r5
-       mov.l   ._reloc_dst, r4
-       add     #(_sh_start-1b), r5
-       mov.l   ._reloc_dst_end, r6
-
-2:     mov.l   @r5+, r1
-       mov.l   r1, @r4
-       add     #4, r4
-       cmp/hs  r6, r4
-       bf      2b
-
-       mov.l   ._bss_start, r4
-       mov.l   ._bss_end, r5
-       mov     #0, r1
-
-3:     mov.l   r1, @r4                 /* bss clear */
-       add     #4, r4
-       cmp/hs  r5, r4
-       bf      3b
-
-       mov.l   ._gd_init, r13          /* global data */
-       mov.l   ._stack_init, r15       /* stack */
-
-       #TODO(sh maintainer): Fix this up to call the correct code
-       #mov.l  ._sh_generic_init, r0
-       #jsr    @r0
-       nop
-
-loop:
-       bra     loop
-
-       .align  2
-
-._lowlevel_init:       .long   (lowlevel_init - (100b + 4))
-._reloc_dst:           .long   reloc_dst
-._reloc_dst_end:       .long   reloc_dst_end
-._bss_start:           .long   bss_start
-._bss_end:             .long   bss_end
-._gd_init:             .long   (_sh_start - GENERATED_GBL_DATA_SIZE)
-._stack_init:  .long   (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-#._sh_generic_init:    .long   sh_generic_init

diff --git a/arch/sh/cpu/sh3/Makefile b/arch/sh/cpu/sh3/Makefile
index 85917b908ce0a7874044a83ed2115cb84b04039c..cddc15b5cc3122bf949494ccaca6dd5dcf8aaaa5 100644 (file)
--- a/arch/sh/cpu/sh3/Makefile
+++ b/arch/sh/cpu/sh3/Makefile
@@ -11,5 +11,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-extra-y        = start.o
 obj-y  = cpu.o interrupts.o watchdog.o

diff --git a/arch/sh/cpu/sh3/start.S b/arch/sh/cpu/sh3/start.S
deleted file mode 100644 (file)
index 9ed7198..0000000
--- a/arch/sh/cpu/sh3/start.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * (C) Copyright 2007
- * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * (C) Copyright 2007
- * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm-offsets.h>
-#include <config.h>
-
-       .text
-       .align  2
-
-       .global _start
-_sh_start:
-       mov.l   ._lowlevel_init, r0
-100:   bsrf    r0
-       nop
-
-       bsr     1f
-       nop
-1:     sts     pr, r5
-       mov.l   ._reloc_dst, r4
-       add     #(_sh_start-1b), r5
-       mov.l   ._reloc_dst_end, r6
-
-2:     mov.l   @r5+, r1
-       mov.l   r1, @r4
-       add     #4, r4
-       cmp/hs  r6, r4
-       bf      2b
-
-       mov.l   ._bss_start, r4
-       mov.l   ._bss_end, r5
-       mov     #0, r1
-
-3:     mov.l   r1, @r4                 /* bss clear */
-       add     #4, r4
-       cmp/hs  r5, r4
-       bf      3b
-
-       mov.l   ._gd_init, r13          /* global data */
-       mov.l   ._stack_init, r15       /* stack */
-
-       #TODO(sh maintainer): Fix this up to call the correct code
-       #mov.l  ._sh_generic_init, r0
-       #jsr    @r0
-       nop
-
-loop:
-       bra     loop
-
-       .align  2
-
-._lowlevel_init:       .long   (lowlevel_init - (100b + 4))
-._reloc_dst:           .long   reloc_dst
-._reloc_dst_end:       .long   reloc_dst_end
-._bss_start:           .long   bss_start
-._bss_end:             .long   bss_end
-._gd_init:             .long   (_sh_start - GENERATED_GBL_DATA_SIZE)
-._stack_init:  .long   (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-#._sh_generic_init:    .long   sh_generic_init

diff --git a/arch/sh/cpu/sh4/Makefile b/arch/sh/cpu/sh4/Makefile
index 38c6188c383254d993cf5b299cf65b3395b1b528..976994b0828edb1b3fcbd43c63999ea61aa81c5e 100644 (file)
--- a/arch/sh/cpu/sh4/Makefile
+++ b/arch/sh/cpu/sh4/Makefile
@@ -8,5 +8,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-extra-y        = start.o
 obj-y  = cpu.o interrupts.o watchdog.o cache.o

diff --git a/arch/sh/cpu/sh4/start.S b/arch/sh/cpu/sh4/start.S
deleted file mode 100644 (file)
index 416adcf..0000000
--- a/arch/sh/cpu/sh4/start.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 Vladimir Zapolskiy <vz@mleia.com>
- * Copyright (C) 2007, 2010 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm-offsets.h>
-#include <config.h>
-
-       .text
-       .align  2
-
-       .global _start
-_start:
-       mov.l   ._lowlevel_init, r0
-100:   bsrf    r0
-       nop
-
-       bsr     1f
-       nop
-1:     sts     pr, r5
-       mov.l   ._reloc_dst, r4
-       add     #(_start-1b), r5
-       mov.l   ._reloc_dst_end, r6
-
-2:     mov.l   @r5+, r1
-       mov.l   r1, @r4
-       add     #4, r4
-       cmp/hs  r6, r4
-       bf      2b
-
-       mov.l   ._bss_start, r4
-       mov.l   ._bss_end, r5
-       mov     #0, r1
-
-3:     mov.l   r1, @r4                 /* bss clear */
-       add     #4, r4
-       cmp/hs  r5, r4
-       bf      3b
-
-       mov.l   ._gd_init, r13          /* global data */
-       mov.l   ._stack_init, r15       /* stack */
-
-       mov.l   ._sh_generic_init, r0
-       jsr     @r0
-       mov     #0, r4
-
-loop:
-       bra     loop
-
-       .align  2
-
-._lowlevel_init:       .long   (lowlevel_init - (100b + 4))
-._reloc_dst:           .long   _start
-._reloc_dst_end:       .long   reloc_dst_end
-._bss_start:           .long   bss_start
-._bss_end:             .long   bss_end
-._gd_init:             .long   (_start - GENERATED_GBL_DATA_SIZE)
-._stack_init:          .long   (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
-._sh_generic_init:     .long   board_init_f

diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 7be20b1bdd760469c3668034386cc275df9fb772..473cf0de2d8b0baf58913b512ad069eefa16dd37 100644 (file)
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -5,6 +5,8 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
+extra-y        += start.o
+
 obj-y  += board.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 ifeq ($(CONFIG_CPU_SH2),y)

diff --git a/arch/sh/lib/start.S b/arch/sh/lib/start.S
new file mode 100644 (file)
index 0000000..37d38d5
--- /dev/null
+++ b/arch/sh/lib/start.S
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016 Vladimir Zapolskiy <vz@mleia.com>
+ * Copyright (C) 2007, 2010 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm-offsets.h>
+#include <config.h>
+
+       .text
+       .align  2
+
+       .global _start
+_start:
+#ifdef CONFIG_CPU_SH2
+       .long 0x00000010        /* Ppower ON reset PC*/
+       .long 0x00000000
+       .long 0x00000010        /* Manual reset PC */
+       .long 0x00000000
+#endif
+       mov.l   ._lowlevel_init, r0
+100:   bsrf    r0
+       nop
+
+       bsr     1f
+       nop
+1:     sts     pr, r5
+       mov.l   ._reloc_dst, r4
+       add     #(_start-1b), r5
+       mov.l   ._reloc_dst_end, r6
+
+2:     mov.l   @r5+, r1
+       mov.l   r1, @r4
+       add     #4, r4
+       cmp/hs  r6, r4
+       bf      2b
+
+       mov.l   ._bss_start, r4
+       mov.l   ._bss_end, r5
+       mov     #0, r1
+
+3:     mov.l   r1, @r4                 /* bss clear */
+       add     #4, r4
+       cmp/hs  r5, r4
+       bf      3b
+
+       mov.l   ._gd_init, r13          /* global data */
+       mov.l   ._stack_init, r15       /* stack */
+
+       mov.l   ._sh_generic_init, r0
+       jsr     @r0
+       mov     #0, r4
+
+loop:
+       bra     loop
+
+       .align  2
+
+._lowlevel_init:       .long   (lowlevel_init - (100b + 4))
+._reloc_dst:           .long   _start
+._reloc_dst_end:       .long   reloc_dst_end
+._bss_start:           .long   bss_start
+._bss_end:             .long   bss_end
+._gd_init:             .long   (_start - GENERATED_GBL_DATA_SIZE)
+._stack_init:          .long   (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
+._sh_generic_init:     .long   board_init_f