コミット: c18612e557af64e6c3a027af9b10feb9c2bba93e - uboot (git)

コミットメタ情報

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

ログメッセージ

sh: Add I-O DATA HDL-U (a.k.a LANDISK) support.

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

変更サマリ

• modified: arch/sh/Kconfig
• modified: arch/sh/cpu/sh4/start.S
• modified: arch/sh/include/asm/spl.h
• add: board/landisk/Kconfig
• add: board/landisk/Makefile
• add: board/landisk/landisk.c
• add: board/landisk/start_landisk.S
• add: board/landisk/u-boot-spl.lds
• add: board/landisk/u-boot.lds
• add: include/configs/landisk.h

差分

--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -115,6 +115,14 @@ config TARGET_SH7785LCR
 	bool "SH7785LCR"
 	select CPU_SH4A
 
+config TARGET_LANDISK
+	bool "I/O DATA LANDISK"
+	select CPU_SH4
+	select SPL
+	select HAVE_GENERIC_BOARD
+	select SYS_GENERIC_BOARD
+	select SUPPORT_OF_CONTROL
+
 endchoice
 
 config SYS_ARCH
@@ -146,5 +154,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/cpu/sh4/start.S
+++ b/arch/sh/cpu/sh4/start.S
@@ -13,6 +13,7 @@
 
 	.global	_start
 _sh_start:
+#ifndef CONFIG_LANDISK
 	mov.l	._lowlevel_init, r0
 100:	bsrf	r0
 	nop
@@ -29,7 +30,7 @@ _sh_start:
 	add	#4, r4
 	cmp/hs	r6, r4
 	bf	2b
-
+#endif
 	mov.l	._bss_start, r4
 	mov.l	._bss_end, r5
 	mov	#0, r1
@@ -63,7 +64,9 @@ loop:
 	bra	loop
 	.align	2
 
+#ifndef CONFIG_LANDISK
 ._lowlevel_init:	.long	(lowlevel_init - (100b + 4))
+#endif
 ._reloc_dst:		.long	reloc_dst
 ._reloc_dst_end:	.long	reloc_dst_end
 ._bss_start:		.long	bss_start

--- 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

--- /dev/null
+++ b/board/landisk/Kconfig
@@ -0,0 +1,9 @@
+if TARGET_LANDISK
+
+config SYS_BOARD
+	default "landisk"
+
+config SYS_CONFIG_NAME
+	default "landisk"
+
+endif

--- /dev/null
+++ b/board/landisk/Makefile
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2007
+# Nobuhiro Iwamatsu <[e-mail]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+extra-y	:= start_landisk.o
+obj-y	:= landisk.o

--- /dev/null
+++ b/board/landisk/landisk.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2007
+ * Nobuhiro Iwamatsu <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <version.h>
+#ifndef CONFIG_SPL_BUILD
+#include <asm/pci.h>
+#endif
+#ifndef CONFIG_DM_ETH
+#include <netdev.h>
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int checkboard(void)
+{
+	puts("BOARD: LANDISK\n");
+	return 0;
+}
+
+int board_init(void)
+{
+	return 0;
+}
+
+int dram_init (void)
+{
+	gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
+#ifndef CONFIG_SPL_BUILD
+	printf("DRAM:  %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
+#endif
+	return 0;
+}
+#if !defined(CONFIG_DM_PCI) && defined(CONFIG_PCI)
+static struct pci_controller hose;
+void pci_init_board(void)
+{
+	pci_sh7751_init(&hose);
+	__raw_writel(0xfe240000, 0xfe2001c8);
+}
+#endif
+
+#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_DM_ETH)
+int board_eth_init(bd_t *bis)
+{
+	return pci_eth_init(bis);
+}
+#endif
+
+#ifdef CONFIG_SPL_BUILD
+#include <spl.h>
+u32 spl_boot_device(void)
+{
+	return BOOT_DEVICE_IDE;
+}
+
+const char version_string[] = U_BOOT_VERSION_STRING;
+
+#endif
+
+void __raw_readsw(unsigned int addr, void *data, int wordlen)
+{
+	unsigned short *ptr = (unsigned short *)data;
+
+	while( wordlen-- ){
+		*ptr++ = __raw_readw(addr);
+	}
+}
+
+void __raw_writesw(unsigned int addr, const void *data, int wordlen)
+{
+	unsigned short *ptr = (unsigned short *)data;
+
+	while( wordlen-- ){
+		__raw_writew(*ptr++, addr);
+	}
+}
+
+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",
+	""
+);

--- /dev/null
+++ b/board/landisk/start_landisk.S
@@ -0,0 +1,65 @@
+/*
+ * (C) Copyright 2007, 2010
+ * Nobuhiro Iwamatsu <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <asm-offsets.h>
+#include <config.h>
+#include <version.h>
+
+	.text
+	.align	2
+
+	.global	_start
+_sh_start:
+	/* cache off */
+	mov	#1,r4
+	mov	#6,r0
+	trapa	#0x3f
+
+	/* load SPL body via sh-ipl-g */
+	mov.l	._load,r15
+	mov	#2,r0
+	mov	#127,r7
+	mov.l	._load,r6
+	mov	#1,r5
+	mov	#0x80,r4
+	extu.b	r4,r4
+	trapa	#0x3f
+
+	mov.l	._bss_start, r4
+	mov.l	._bss_end, r5
+	mov	#0, r1
+
+3:	mov.l	r1, @r4			/* bss clear */
+	add	#4, r4
+	cmp/hs	r5, r4
+	bf	3b
+
+	mov.l	._stack_init, r15
+	mov.l	._board_init_f_init_reserve, r0
+	jsr	@r0
+	mov	r15, r4
+
+	mov.l	._board_init_r, r0
+	jsr	@r0
+	mov	r13,r4
+loop:
+	bra	loop
+
+	.align	2
+
+._sh_start:		.long	_sh_start
+._bss_start:		.long	bss_start
+._bss_end:		.long	bss_end
+._stack_init:		.long	(_sh_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
+._board_init_r:		.long	board_init_r
+._board_init_f_init_reserve:	.long	board_init_f_init_reserve
+._load:			.long	2f
+/* MBR signature */
+	.space	_sh_start + 510 - .
+	.word	0xaa55
+2:	
+	.end

--- /dev/null
+++ b/board/landisk/u-boot-spl.lds
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2007
+ * Nobuhiro Iwamatsu <[e-mail]>
+ *
+ * Copyright (C) 2008-2009
+ * Yoshihiro Shimoda <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+OUTPUT_ARCH(sh)
+ENTRY(_start)
+
+SECTIONS
+{
+	/*
+	 * entry and reloct_dst will be provided via ldflags
+	 */
+	. = .;
+
+	PROVIDE (_ftext = .);
+	PROVIDE (_fcode = .);
+	PROVIDE (_start = .);
+
+	.text :
+	{
+		KEEP(board/landisk/start_landisk.o		(.text))
+		*(.text*)
+		. = ALIGN(4);
+	} =0xFF
+	PROVIDE (_ecode = .);
+	.rodata :
+	{
+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+		. = ALIGN(4);
+	}
+	PROVIDE (_etext = .);
+
+
+	PROVIDE (_fdata = .);
+	.data :
+	{
+		*(.data*)
+		. = ALIGN(4);
+	}
+	PROVIDE (_edata = .);
+
+	PROVIDE (_fgot = .);
+	PROVIDE (_egot = .);
+
+
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	}
+
+	PROVIDE (reloc_dst_end = .);
+	/* _reloc_dst_end = .; */
+
+	PROVIDE (bss_start = .);
+	PROVIDE (__bss_start = .);
+	.bss (NOLOAD) :
+	{
+		*(.bss*)
+		. = ALIGN(4);
+	}
+	PROVIDE (bss_end = .);
+
+	PROVIDE (__bss_end = .);
+}

--- /dev/null
+++ b/board/landisk/u-boot.lds
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007
+ * Nobuhiro Iwamatsu <[e-mail]>
+ *
+ * Copyright (C) 2008-2009
+ * Yoshihiro Shimoda <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+OUTPUT_ARCH(sh)
+ENTRY(_start)
+
+SECTIONS
+{
+	/*
+	 * entry and reloct_dst will be provided via ldflags
+	 */
+	. = .;
+
+	PROVIDE (_ftext = .);
+	PROVIDE (_fcode = .);
+	PROVIDE (_start = .);
+
+	.text :
+	{
+		KEEP(arch/sh/cpu/sh4/start.o		(.text))
+		*(.text*)
+		. = ALIGN(4);
+	} =0xFF
+	PROVIDE (_ecode = .);
+	.rodata :
+	{
+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+		. = ALIGN(4);
+	}
+	PROVIDE (_etext = .);
+
+
+	PROVIDE (_fdata = .);
+	.data :
+	{
+		*(.data)
+		. = ALIGN(4);
+	}
+	PROVIDE (_edata = .);
+
+	PROVIDE (_fgot = .);
+	.got :
+	{
+		*(.got)
+		. = ALIGN(4);
+	}
+	PROVIDE (_egot = .);
+
+
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	}
+
+	. = ALIGN(256);
+	__init_begin = .;
+	.text.init : { *(.text.init) }
+	.data.init : { *(.data.init) }
+	. = ALIGN(256);
+	__init_end = .;
+	PROVIDE (reloc_dst_end = .);
+	/* _reloc_dst_end = .; */
+
+	PROVIDE (bss_start = .);
+	PROVIDE (__bss_start = .);
+	.bss (NOLOAD) :
+	{
+		*(.bss)
+		. = ALIGN(4);
+	}
+	PROVIDE (bss_end = .);
+
+	PROVIDE (__bss_end = .);
+	PROVIDE (_end = .);
+}

--- /dev/null
+++ b/include/configs/landisk.h
@@ -0,0 +1,128 @@
+/*
+ * Configuation settings for the Hitachi Solution Engine 7750
+ *
+ * Copyright (C) 2007 Nobuhiro Iwamatsu <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __LANDISK_H
+#define __LANDISK_H
+
+#define CONFIG_CPU_SH7751	1
+#define CONFIG_CPU_TYPE_R	1
+#define CONFIG_LANDISK		1
+#define __LITTLE_ENDIAN__	1
+
+#define CONFIG_SYS_LDSCRIPT	"board/landisk/u-boot.lds"
+
+/*
+ * Command line configuration.
+ */
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_PCI
+
+#define CONFIG_SCIF_CONSOLE	1
+#define CONFIG_BAUDRATE		115200
+#define CONFIG_CONS_SCIF1	1
+
+#define CONFIG_BOOTDELAY	-1
+#define CONFIG_BOOTARGS		"console=ttySC1,115200"
+#define CONFIG_ENV_OVERWRITE	1
+
+/* SDRAM */
+#define CONFIG_SYS_SDRAM_BASE		(0x8C000000)
+#define CONFIG_SYS_SDRAM_SIZE		(64 * 1024 * 1024)
+#define CONFIG_SYS_NO_FLASH
+
+/* PCI BUS */
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PCI
+#define CONFIG_SH4_PCI
+#define CONFIG_SH7751_PCI
+#define CONFIG_PCI_PNP
+#define CONFIG_PCI_SCAN_SHOW
+#define __io
+#define __mem_pci
+#endif
+
+#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     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)
+#define CONFIG_PCI_SYS_PHYS   (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
+#define CONFIG_PCI_SYS_SIZE   CONFIG_SYS_SDRAM_SIZE
+
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_CBSIZE		256
+#define CONFIG_SYS_PBSIZE		256
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_SYS_BARGSIZE		512
+
+#define CONFIG_SYS_TEXT_BASE		0x8F800000
+#define CONFIG_SYS_UBOOT_START		CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_TEXT_BASE - 0x100000)
+#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024)
+#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_TEXT_BASE)	/* Address of u-boot image in Flash */
+#define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)		/* Size of DRAM reserved for malloc() use */
+#define CONFIG_FS_EXT4
+
+#define CONFIG_ENV_IS_IN_EXT4
+#define EXT4_ENV_INTERFACE		"ide"
+#define EXT4_ENV_DEVICE_AND_PART		"0:1"
+#define EXT4_ENV_FILE			"/u-boot.env"
+#define CONFIG_ENV_SIZE			4096
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_EXT4_WRITE
+#endif
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"preboot=ext4load ide 0:1 8c000000 u-boot.env; env import -b 8c000004"
+#define CONFIG_PREBOOT
+
+#define CONFIG_LMB
+
+/* Board Clock */
+#define CONFIG_SYS_CLK_FREQ	33333333
+#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
+#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
+#define CONFIG_SYS_TMU_CLK_DIV		4
+
+#define CONFIG_LIBATA
+#define CONFIG_DOS_PARTITION
+
+#define CONFIG_SYS_PIO_MODE		1
+#define CONFIG_SYS_IDE_MAXBUS		1	/* IDE bus */
+#define CONFIG_SYS_IDE_MAXDEVICE	2
+#define CONFIG_SYS_ATA_BASE_ADDR	0xfe240000
+#define CONFIG_SYS_ATA_STRIDE		1	/* 0bit shift */
+#ifdef CONFIG_SPL_BUILD
+#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	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_LDSCRIPT	"board/landisk/u-boot-spl.lds"
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_IDE_SUPPORT
+#define CONFIG_SPL_LIBDISK_SUPPORT
+#define CONFIG_SPL_EXT_SUPPORT
+#define CONFIG_SPL_TARGET
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_PCI_SUPPORT
+#define CONFIG_SYS_IDE_EXT4_BOOT_PARTITION	1
+#define CONFIG_SPL_EXT4_LOAD_PAYLOAD_NAME	"u-boot.img"
+#define CONFIG_SPL_TEXT_BASE		0x8FF00000
+#endif /* __LANDISK_H */