OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

コミットメタ情報

リビジョンc7f621d5d457ad9f0f5b80b1bdb5f49590bbdfb1 (tree)
日時2016-05-22 15:10:04
作者Yoshinori Sato <ysato@user...>
コミッターYoshinori Sato

ログメッセージ

sh: generic board support - startup

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>

変更サマリ

差分

--- a/arch/sh/cpu/sh2/cpu.c
+++ b/arch/sh/cpu/sh2/cpu.c
@@ -10,6 +10,8 @@
1010 #include <asm/processor.h>
1111 #include <asm/io.h>
1212
13+DECLARE_GLOBAL_DATA_PTR;
14+
1315 #if defined(CONFIG_CONS_SCIF0)
1416 # define CH 0
1517 #elif defined(CONFIG_CONS_SCIF1)
@@ -49,3 +51,10 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
4951 reset_cpu(0);
5052 return 0;
5153 }
54+
55+ return 0;
56+}
57+
58+int arch_cpu_init(void)
59+{
60+ gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
--- a/arch/sh/cpu/sh2/start.S
+++ b/arch/sh/cpu/sh2/start.S
@@ -7,6 +7,7 @@
77
88 #include <asm-offsets.h>
99 #include <config.h>
10+#include <asm-generic/global_data.h>
1011
1112 .text
1213 .align 2
@@ -43,12 +44,18 @@ _init:
4344 cmp/hs r5, r4
4445 bf 3b
4546
46- mov.l ._gd_init, r13 /* global data */
47- mov.l ._stack_init, r15 /* stack */
47+ mov.l ._stack_init, r15
48+ mov.l ._board_init_f_init_reserve, r0
49+ jsr @r0
50+ mov r15, r4
4851
49- mov.l ._sh_generic_init, r0
52+ mov.l ._board_init_f, r0
5053 jsr @r0
51- nop
54+ mov ._bootflag ,r4
55+
56+ mov.l ._board_init_r, r0
57+ jsr @r0
58+ mov r13,r4
5259
5360 loop:
5461 bra loop
@@ -61,5 +68,8 @@ loop:
6168 ._bss_start: .long bss_start
6269 ._bss_end: .long bss_end
6370 ._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
64-._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
65-._sh_generic_init: .long sh_generic_init
71+._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - CONFIG_ENV_SIZE- 16)
72+._board_init_f: .long board_init_f
73+._board_init_r: .long board_init_r
74+._board_init_f_init_reserve: .long board_init_f_init_reserve
75+._bootflag: .long GD_FLG_SKIP_RELOC
--- a/arch/sh/cpu/sh3/cpu.c
+++ b/arch/sh/cpu/sh3/cpu.c
@@ -12,6 +12,8 @@
1212 #include <command.h>
1313 #include <asm/processor.h>
1414
15+DECLARE_GLOBAL_DATA_PTR;
16+
1517 int checkcpu(void)
1618 {
1719 puts("CPU: SH3\n");
@@ -66,3 +68,10 @@ int dcache_status(void)
6668 {
6769 return 0;
6870 }
71+
72+int arch_cpu_init(void)
73+{
74+ gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
75+
76+ return 0;
77+}
--- a/arch/sh/cpu/sh3/start.S
+++ b/arch/sh/cpu/sh3/start.S
@@ -10,6 +10,7 @@
1010
1111 #include <asm-offsets.h>
1212 #include <config.h>
13+#include <asm-generic/global_data.h>
1314
1415 .text
1516 .align 2
@@ -42,13 +43,18 @@ _sh_start:
4243 cmp/hs r5, r4
4344 bf 3b
4445
45- mov.l ._gd_init, r13 /* global data */
46- mov.l ._stack_init, r15 /* stack */
46+ mov.l ._stack_init, r15
47+ mov.l ._board_init_f_init_reserve, r0
48+ jsr @r0
49+ mov r15, r4
4750
48- mov.l ._sh_generic_init, r0
51+ mov.l ._board_init_f, r0
4952 jsr @r0
50- nop
53+ mov #._bootflag, r4
5154
55+ mov.l ._board_init_r, r0
56+ jsr @r0
57+ mov r13,r4
5258 loop:
5359 bra loop
5460
@@ -60,5 +66,8 @@ loop:
6066 ._bss_start: .long bss_start
6167 ._bss_end: .long bss_end
6268 ._gd_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE)
63-._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
64-._sh_generic_init: .long sh_generic_init
69+._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - CONFIG_ENV_SIZE - 16)
70+._board_init_f: .long board_init_f
71+._board_init_r: .long board_init_r
72+._board_init_f_init_reserve: .long board_init_f_init_reserve
73+._bootflag: .long GD_FLG_SKIP_RELOC
--- a/arch/sh/cpu/sh4/cpu.c
+++ b/arch/sh/cpu/sh4/cpu.c
@@ -13,6 +13,8 @@
1313 #include <asm/processor.h>
1414 #include <asm/cache.h>
1515
16+DECLARE_GLOBAL_DATA_PTR;
17+
1618 int checkcpu(void)
1719 {
1820 #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
@@ -81,3 +83,10 @@ int cpu_eth_init(bd_t *bis)
8183 #endif
8284 return 0;
8385 }
86+
87+int arch_cpu_init(void)
88+{
89+ gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
90+
91+ return 0;
92+}
--- a/arch/sh/cpu/sh4/start.S
+++ b/arch/sh/cpu/sh4/start.S
@@ -7,6 +7,7 @@
77
88 #include <asm-offsets.h>
99 #include <config.h>
10+#include <asm-generic/global_data.h>
1011
1112 .text
1213 .align 2
@@ -40,26 +41,19 @@ _sh_start:
4041 cmp/hs r5, r4
4142 bf 3b
4243
43-#ifndef CONFIG_SYS_GENERIC_BOARD
44- mov.l ._gd_init, r13 /* global data */
45-
46- mov.l ._sh_generic_init, r0
47- jsr @r0
48- nop
49-#else
5044 mov.l ._stack_init, r15
5145 mov.l ._board_init_f_init_reserve, r0
5246 jsr @r0
5347 mov r15, r4
5448
49+ mov.l ._bootflag, r4
5550 mov.l ._board_init_f, r0
5651 jsr @r0
57- mov #0,r4
52+ nop
5853
5954 mov.l ._board_init_r, r0
6055 jsr @r0
6156 mov r13,r4
62-#endif
6357 loop:
6458 bra loop
6559 .align 2
@@ -71,11 +65,8 @@ loop:
7165 ._reloc_dst_end: .long reloc_dst_end
7266 ._bss_start: .long bss_start
7367 ._bss_end: .long bss_end
74-._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
75-#ifndef CONFIG_SYS_GENERIC_BOARD
76-._sh_generic_init: .long sh_generic_init
77-#else
68+._stack_init: .long (_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - CONFIG_ENV_SIZE - 16)
7869 ._board_init_f: .long board_init_f
7970 ._board_init_r: .long board_init_r
8071 ._board_init_f_init_reserve: .long board_init_f_init_reserve
81-#endif
72+._bootflag: .long GD_FLG_SKIP_RELOC