修訂 | a1977104ea0f522a4c41f219288e01e3bf0962c1 (tree) |
---|---|
時間 | 2019-07-05 00:45:28 |
作者 | Yoshinori Sato <ysato@user...> |
Commiter | Yoshinori Sato |
h8300: fix disable relocation
@@ -48,9 +48,6 @@ config TIMER_BASE | ||
48 | 48 | hex |
49 | 49 | default 0xffff80 |
50 | 50 | |
51 | -config SYS_NON_RELOC | |
52 | - bool | |
53 | - | |
54 | 51 | source "board/h8300h_sim/Kconfig" |
55 | 52 | source "board/h8300s_sim/Kconfig" |
56 | 53 | source "board/ae3069/Kconfig" |
@@ -20,6 +20,7 @@ | ||
20 | 20 | #include <config.h> |
21 | 21 | #include <version.h> |
22 | 22 | #include <asm-offsets.h> |
23 | +#include <asm/global_data.h> | |
23 | 24 | |
24 | 25 | .h8300h |
25 | 26 |
@@ -54,15 +55,13 @@ _start: | ||
54 | 55 | jsr @board_init_f_alloc_reserve |
55 | 56 | mov.l er0,sp |
56 | 57 | jsr @board_init_f_init_reserve |
57 | - sub.l er0,er0 /* boot flags */ | |
58 | + mov.l #GD_FLG_SKIP_RELOC, er0 /* boot flags */ | |
58 | 59 | jsr @board_init_f |
59 | - bra . | |
60 | - | |
61 | -relocate_code: | |
62 | - mov.l er1,er0 | |
60 | + mov.l @gd,er0 | |
63 | 61 | sub.l er1,er1 |
64 | - mov.l #CONFIG_SYS_DRAM_BASE + CONFIG_SYS_DRAM_SIZE, er2 | |
65 | - mov.l er2,@(GD_RELOCADDR,er0) | |
66 | 62 | jmp @board_init_r |
67 | 63 | |
64 | +relocate_code: | |
65 | + rts | |
66 | + | |
68 | 67 | .end |
@@ -21,7 +21,4 @@ config DM_ETH | ||
21 | 21 | config SYS_TEXT_BASE |
22 | 22 | default 0x00000100 |
23 | 23 | |
24 | -config SYS_NON_RELOC | |
25 | - default y | |
26 | - | |
27 | 24 | endif |
@@ -993,7 +993,7 @@ void board_init_f(ulong boot_flags) | ||
993 | 993 | |
994 | 994 | #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ |
995 | 995 | !defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64) && \ |
996 | - !defined(CONFIG_ARC) | |
996 | + !defined(CONFIG_ARC) && !defined(CONFIG_H8300) | |
997 | 997 | /* NOTREACHED - jump_to_copy() does not return */ |
998 | 998 | hang(); |
999 | 999 | #endif |
@@ -126,7 +126,6 @@ static int initr_reloc_global_data(void) | ||
126 | 126 | #elif !defined(CONFIG_SANDBOX) && !defined(CONFIG_NIOS2) |
127 | 127 | monitor_flash_len = (ulong)&__init_end - gd->relocaddr; |
128 | 128 | #endif |
129 | -#if !defined(CONFIG_SYS_NON_RELOC) | |
130 | 129 | #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) |
131 | 130 | /* |
132 | 131 | * The gd->cpu pointer is set to an address in flash before relocation. |
@@ -165,7 +164,6 @@ static int initr_reloc_global_data(void) | ||
165 | 164 | |
166 | 165 | efi_runtime_relocate(gd->relocaddr, NULL); |
167 | 166 | #endif |
168 | -#endif | |
169 | 167 | return 0; |
170 | 168 | } |
171 | 169 |