コミット: 4b22789bdd8368068b68d41659b7440521a13246 - uboot (git)

コミットメタ情報

• リビジョン: 4b22789bdd8368068b68d41659b7440521a13246 (tree)
• 日時: 2019-07-03 23:55:03
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

h8300: fix edosk2674

変更サマリ

• modified: Makefile
• modified: arch/h8300/Kconfig
• modified: arch/h8300/cpu/h8300h/start.S
• modified: arch/h8300/cpu/h8300s/start.S
• modified: arch/h8300/dts/edosk2674.dts
• modified: board/nisshin-tech/kanebebe/Kconfig
• modified: board/renesas/edosk2674/Kconfig
• modified: board/renesas/edosk2674/edosk2674.c
• modified: board/renesas/edosk2674/lowlevel_init.S
• modified: common/board_f.c
• modified: common/board_r.c
• modified: include/configs/edosk2674.h

差分

--- a/Makefile
+++ b/Makefile
@@ -887,7 +887,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
 LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
 
-ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA)$(CONFIG_H8300),)
+ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
 

--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -48,6 +48,9 @@ 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
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <version.h>
+#include <asm-offsets.h>
 
 	.h8300h
 
@@ -60,6 +61,8 @@ _start:
 relocate_code:
 	mov.l	er1,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
 
 	.end

--- a/arch/h8300/cpu/h8300s/start.S
+++ b/arch/h8300/cpu/h8300s/start.S
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <version.h>
+#include <asm-offsets.h>
 
 	.h8300s
 
@@ -27,7 +28,7 @@
 	.long	__start
 vector	=	2
 	.rept	126
-	.long	__ram_vec + (vector * 4)
+	.long	_ram_vec + (vector * 4)
 vector	=	vector + 1
 	.endr
 
@@ -56,12 +57,18 @@ _start:
 	bne	1b
 
 	mov.l	#CONFIG_SYS_TEXT_BASE,sp
+	mov.l	sp,er0
+	jsr	@board_init_f_alloc_reserve
+	mov.l	er0,sp
+	jsr	@board_init_f_init_reserve
+	sub.l	er0,er0			/* boot flags */
 	jsr	@board_init_f
 	bra	.
 
 relocate_code:
 	mov.l	er1,er0
 	sub.l	er1,er1
+	mov.l	er1,@(GD_RELOC_OFF,er0)
 	jmp	@board_init_r
 	
 	.end

--- a/arch/h8300/dts/edosk2674.dts
+++ b/arch/h8300/dts/edosk2674.dts
@@ -6,7 +6,7 @@
 	interrupt-parent = <&h8intc>;
 
 	chosen {
-		stdout-path = &sci2;
+		stdout-path = &sci0;
 	};
 	aliases {
 		serial0 = &sci0;

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

--- a/board/renesas/edosk2674/Kconfig
+++ b/board/renesas/edosk2674/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
         default "edosk2674"
 
+config SYS_TEXT_BASE
+         default 0x00b00000
+
 endif

--- a/board/renesas/edosk2674/edosk2674.c
+++ b/board/renesas/edosk2674/edosk2674.c
@@ -36,10 +36,17 @@ int board_init(void)
 	return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init(void)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-	gd->bd->bi_memsize = gd->ram_size = 8 * 1024 * 1024;
+        if (fdtdec_setup_mem_size_base() != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+int dram_init_banksize(void)
+{
+        return 0;
 }
 
 void led_set_state(unsigned short value)

--- a/board/renesas/edosk2674/lowlevel_init.S
+++ b/board/renesas/edosk2674/lowlevel_init.S
@@ -59,7 +59,7 @@ lowlevel_init:
 	mov.l	#_start,er5
 	sub.l	#4b,er5
 	add.l	er4,er5
-	mov.l	#CONFIG_SYS_TEXT_BASE,er6
+	mov.l	#_start,er6
 	mov.l	#__bss_start,er4
 	sub.l	er6,er4
 	shlr	#2,er4

--- a/common/board_f.c
+++ b/common/board_f.c
@@ -269,7 +269,7 @@ static int setup_mon_len(void)
 	gd->mon_len = (ulong)&_end - (ulong)_init;
 #elif defined(CONFIG_NIOS2) || defined(CONFIG_XTENSA)
 	gd->mon_len = CONFIG_SYS_MONITOR_LEN;
-#elif defined(CONFIG_NDS32) || defined(CONFIG_SH) || defined(CONFIG_RISCV)
+#elif defined(CONFIG_NDS32) || defined(CONFIG_SH) || defined(CONFIG_RISCV) || defined(CONFIG_H8300)
 	gd->mon_len = (ulong)(&__bss_end) - (ulong)(&_start);
 #elif defined(CONFIG_SYS_MONITOR_BASE)
 	/* TODO: use (ulong)&__bss_end - (ulong)&__text_start; ? */

--- a/common/board_r.c
+++ b/common/board_r.c
@@ -126,6 +126,7 @@ 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.
@@ -164,7 +165,7 @@ static int initr_reloc_global_data(void)
 
 	efi_runtime_relocate(gd->relocaddr, NULL);
 #endif
-
+#endif
 	return 0;
 }
 

--- a/include/configs/edosk2674.h
+++ b/include/configs/edosk2674.h
@@ -25,11 +25,6 @@
 #ifndef __EDOSK2674_H
 #define __EDOSK2674_H
 
-#define CONFIG_H8300		1
-#define CONFIG_H8300S		1
-#define CONFIG_CPU_H8S2678	1
-#define CONFIG_EDOSK2674	1
-
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_BOOTARGS		"earlyprintk=sh-sci.2,38400 console=ttySC2,38400"
 
@@ -41,7 +36,6 @@
 #define EDOSK2674_SDRAM_BASE	0x400000
 
 #define CONFIG_SYS_MONITOR_BASE	0xb00000
-#define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT	"=> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
@@ -52,24 +46,8 @@
 /* List of legal baudrate settings for this board */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_OF_LIBFDT
 #define CONFIG_LMB
 
-/* SCI */
-#define CONFIG_SCI		1
-#define CONFIG_SCIF_CONSOLE	1
-
-/* TIMER */
-#define CONFIG_TIMER_BASE	0xffffb0	/* CH0-1 */
-
-/* GPIO */
-#define CONFIG_H8300_GPIO \
-	{0xff,0xff,0x3f,0xff,0xf8,0x3f,0x3f,0x3f,0x00,	\
-	 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70}
-#define CONFIG_H8300_INIT_DDR \
-	{0x00,0x00,0x3a,0x00,0x00,0x00,0x00,0x00,0x00,	\
-	 0xff,0x00,0x00,0x00,0x00,0xfe,0x0f,0x0f}
-
 /* SDRAM */ 
 #define CONFIG_SYS_MEMTEST_START	EDOSK2674_SDRAM_BASE + (1 * 1024 * 1024)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (7 * 1024 * 1024))
@@ -77,15 +55,12 @@
 #define CONFIG_SYS_SDRAM_BASE	        EDOSK2674_SDRAM_BASE
 #define CONFIG_SYS_SDRAM_SIZE		(8 * 1024 * 1024)
 
-#define CONFIG_SYS_TEXT_BASE	        0xb00000
 #define CONFIG_SYS_LOAD_ADDR		0x400000
 
 #define CONFIG_SYS_MALLOC_LEN		(256 * 1024)
 #define CONFIG_SYS_GBL_DATA_SIZE	256
 
-#define CONFIG_ENV_SIZE			(128 * 1024)
-#define CONFIG_ENV_IS_IN_FLASH		1
-#define CONFIG_ENV_ADDR			0x3e0000
+#define CONFIG_ENV_SIZE			4096
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ		33333333
@@ -99,11 +74,7 @@
 #endif
 
 /* Flash */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
-#define CONFIG_SYS_MAX_FLASH_SECT	32
 #define CONFIG_SYS_FLASH_BASE		EDOSK2674_FLASH_BASE
-#define CONFIG_SYS_FLASH_CFI		1
-#define CONFIG_FLASH_CFI_DRIVER		1
-#define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
+
 
 #endif	/* __EDOSK2674_H */