コミット: ef8f94832bbe5792d2f1e4f14edefd29ccbbe8d2 - uboot (git)

コミットメタ情報

• リビジョン: ef8f94832bbe5792d2f1e4f14edefd29ccbbe8d2 (tree)
• 日時: 2016-03-23 02:49:56
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

sh: landisk support update.

Signed-off-by: Yoshinori Sato <[e-mail]>

変更サマリ

• modified: arch/sh/Kconfig
• modified: arch/sh/config.mk
• modified: arch/sh/include/asm/spl.h
• modified: arch/sh/lib/board.c
• modified: board/landisk/landisk.c
• modified: board/landisk/start_landisk.S
• modified: include/configs/landisk.h

差分

--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -115,6 +115,11 @@ config TARGET_SH7785LCR
 	bool "SH7785LCR"
 	select CPU_SH4A
 
+config TARGET_LANDISK
+	bool "I/O DATA LANDISK"
+	select CPU_SH4
+	select SPL
+
 endchoice
 
 config SYS_ARCH
@@ -146,5 +151,6 @@ source "board/renesas/sh7757lcr/Kconfig"
 source "board/renesas/sh7763rdp/Kconfig"
 source "board/renesas/sh7785lcr/Kconfig"
 source "board/shmin/Kconfig"
+source "board/landisk/Kconfig"
 
 endmenu

--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -18,6 +18,8 @@ CONFIG_STANDALONE_LOAD_ADDR += -m2a-nofpu
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__
+ifdef CONFIG_SYS_TEXT_BASE
 PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE)
+endif
 LDFLAGS_FINAL = --gc-sections
 PLATFORM_RELFLAGS += -ffixed-r13

--- a/arch/sh/include/asm/spl.h
+++ b/arch/sh/include/asm/spl.h
@@ -7,6 +7,6 @@
 #ifndef	_ASM_SPL_H_
 #define	_ASM_SPL_H_
 
-#define BOOT_DEVICE_IDE 0
+#define BOOT_DEVICE_IDE 0x0001
 
 #endif

--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -82,6 +82,7 @@ static int sh_mem_env_init(void)
 #ifndef CONFIG_SPL_BUILD
 	mem_malloc_init(CONFIG_SYS_TEXT_BASE - GENERATED_GBL_DATA_SIZE -
 			CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 	env_relocate();
 	jumptable_init();
 #endif
@@ -190,7 +191,11 @@ void sh_generic_init(void)
 		main_loop();
 	}
 #else
-#ifdef COFIG_SPL_IDE_SUPPORT
+	gd->malloc_base = CONFIG_SYS_SPL_MALLOC_START;
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+	preloader_console_init();
+#endif
+#ifdef CONFIG_SPL_IDE_SUPPORT
 	ide_init();
 #endif
 	board_init_r(gd, 0);

--- a/board/landisk/landisk.c
+++ b/board/landisk/landisk.c
@@ -39,6 +39,7 @@ static struct pci_controller hose;
 void pci_init_board(void)
 {
 	pci_sh7751_init(&hose);
+	__raw_writel(0xfe240000, 0xfe2001c8);
 }
 
 int board_late_init(void)
@@ -55,9 +56,10 @@ int board_eth_init(bd_t *bis)
 }
 
 #ifdef CONFIG_SPL_BUILD
+#include <spl.h>
 u32 spl_boot_device(void)
 {
-	return 0;
+	return BOOT_DEVICE_IDE;
 }
 
 const char version_string[] = U_BOOT_VERSION_STRING;
@@ -85,4 +87,14 @@ void __raw_writesw(unsigned int addr, const void *data, int wordlen)
 void ide_set_reset(int idereset)
 {
 }
+static int do_power_off(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	__raw_writeb(0x01, 0xb0000003);
+	return 0;
+}
 
+U_BOOT_CMD(
+	poff,	1,	1,	do_power_off,
+	"power off",
+	""
+);

--- a/board/landisk/start_landisk.S
+++ b/board/landisk/start_landisk.S
@@ -20,7 +20,7 @@ _sh_start:
 
 	mov.l	._load,r15
 	mov	#2,r0
-	mov	#63,r7
+	mov	#96,r7
 	mov.l	._load,r6
 	mov	#1,r5
 	mov	#0x80,r4

--- a/include/configs/landisk.h
+++ b/include/configs/landisk.h
@@ -19,12 +19,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_IMLS
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_IDE
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_PCI
 
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
@@ -32,7 +27,7 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_BOOTDELAY	-1
-#define CONFIG_BOOTARGS		"console=ttySC0,38400"
+#define CONFIG_BOOTARGS		"console=ttySC1,115200"
 #define CONFIG_ENV_OVERWRITE	1
 
 /* SDRAM */
@@ -52,7 +47,7 @@
 #define CONFIG_PCI_MEM_BUS    0xFD000000      /* Memory space base addr */
 #define CONFIG_PCI_MEM_PHYS   CONFIG_PCI_MEM_BUS
 #define CONFIG_PCI_MEM_SIZE   0x01000000      /* Size of Memory window */
-#define CONFIG_PCI_IO_BUS     0x00001000      /* IO space base address */
+#define CONFIG_PCI_IO_BUS     0xfe240000      /* IO space base address */
 #define CONFIG_PCI_IO_PHYS    0xfe240000
 #define CONFIG_PCI_IO_SIZE    0x00040000      /* Size of IO window */
 #define CONFIG_PCI_SYS_BUS    (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
@@ -74,12 +69,13 @@
 #define CONFIG_SYS_MONITOR_LEN		(128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN		(256 * 1024)		/* Size of DRAM reserved for malloc() use */
 
+#define CONFIG_FS_FAT
+
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_FAT_WRITE
 #define FAT_ENV_INTERFACE		"ide"
-#define FAT_ENV_DEVICE			0
-#define FAT_ENV_PART			1
+#define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"u-boot.env"
 #define CONFIG_ENV_SIZE			4096
 #else
@@ -106,15 +102,15 @@
 #define CONFIG_SYS_ATA_DATA_OFFSET	0x4400	/* data reg offset */
 #define CONFIG_SYS_ATA_REG_OFFSET	0x4400	/* reg offset */
 #else
-#define CONFIG_SYS_ATA_DATA_OFFSET	0x1100	/* data reg offset */
-#define CONFIG_SYS_ATA_REG_OFFSET	0x1100	/* reg offset */
+#define CONFIG_SYS_ATA_DATA_OFFSET	0x00000100	/* data reg offset */
+#define CONFIG_SYS_ATA_REG_OFFSET	0x00000100	/* reg offset */
 #endif
 #define CONFIG_SYS_ATA_ALT_OFFSET	0x0a	/* alternate register offset */
 
 #define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
-#define CONFIG_SPL
+#define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_LDSCRIPT	"board/landisk/u-boot-spl.lds"
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LIBGENERIC_SUPPORT