コミット: a1977104ea0f522a4c41f219288e01e3bf0962c1 - uboot (git)

コミットメタ情報

• リビジョン: a1977104ea0f522a4c41f219288e01e3bf0962c1 (tree)
• 日時: 2019-07-05 00:45:28
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

h8300: fix disable relocation

変更サマリ

• modified: arch/h8300/Kconfig
• modified: arch/h8300/cpu/h8300h/start.S
• modified: board/nisshin-tech/kanebebe/Kconfig
• modified: common/board_f.c
• modified: common/board_r.c

差分

--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -48,9 +48,6 @@ config TIMER_BASE
        hex
        default 0xffff80
 
-config SYS_NON_RELOC
-       bool
-
 source "board/h8300h_sim/Kconfig"
 source "board/h8300s_sim/Kconfig"
 source "board/ae3069/Kconfig"

--- a/arch/h8300/cpu/h8300h/start.S
+++ b/arch/h8300/cpu/h8300h/start.S
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <version.h>
 #include <asm-offsets.h>
+#include <asm/global_data.h>
 
 	.h8300h
 
@@ -54,15 +55,13 @@ _start:
 	jsr	@board_init_f_alloc_reserve
 	mov.l	er0,sp
 	jsr	@board_init_f_init_reserve
-	sub.l	er0,er0			/* boot flags */
+	mov.l	#GD_FLG_SKIP_RELOC, er0	/* boot flags */
 	jsr	@board_init_f
-	bra	.
-
-relocate_code:
-	mov.l	er1,er0
+	mov.l	@gd,er0
 	sub.l	er1,er1
-	mov.l	#CONFIG_SYS_DRAM_BASE + CONFIG_SYS_DRAM_SIZE, er2
-	mov.l	er2,@(GD_RELOCADDR,er0)
 	jmp	@board_init_r
 
+relocate_code:
+	rts
+
 	.end

--- a/board/nisshin-tech/kanebebe/Kconfig
+++ b/board/nisshin-tech/kanebebe/Kconfig
@@ -21,7 +21,4 @@ config DM_ETH
 config SYS_TEXT_BASE
          default 0x00000100
 
-config SYS_NON_RELOC
-	default y
-
 endif

--- a/common/board_f.c
+++ b/common/board_f.c
@@ -993,7 +993,7 @@ void board_init_f(ulong boot_flags)
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
 		!defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64) && \
-		!defined(CONFIG_ARC)
+		!defined(CONFIG_ARC) && !defined(CONFIG_H8300)
 	/* NOTREACHED - jump_to_copy() does not return */
 	hang();
 #endif

--- a/common/board_r.c
+++ b/common/board_r.c
@@ -126,7 +126,6 @@ static int initr_reloc_global_data(void)
 #elif !defined(CONFIG_SANDBOX) && !defined(CONFIG_NIOS2)
 	monitor_flash_len = (ulong)&__init_end - gd->relocaddr;
 #endif
-#if !defined(CONFIG_SYS_NON_RELOC)
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
 	/*
 	 * The gd->cpu pointer is set to an address in flash before relocation.
@@ -165,7 +164,6 @@ static int initr_reloc_global_data(void)
 
 	efi_runtime_relocate(gd->relocaddr, NULL);
 #endif
-#endif
 	return 0;
 }