Merge branch 'master' of git://www.denx.de/git/u-boot-sh

5 files changed, 521 insertions, 0 deletions

diff --git a/board/ms7720se/Makefile b/board/ms7720se/Makefile
new file mode 100644
index 0000000..d1af937
--- /dev/null
+++ b/board/ms7720se/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2007
+# Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+#
+# Copyright (C) 2007
+# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+#
+# Copyright (C) 2007
+# Kenati Technologies, Inc.
+#
+# board/ms7720se/Makefile
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+include $(TOPDIR)/config.mk
+
+LIB	= lib$(BOARD).a
+
+OBJS	:= ms7720se.o
+SOBJS	:= lowlevel_init.o
+
+$(LIB):	$(OBJS) $(SOBJS)
+	$(AR) crv $@ $(OBJS) $(SOBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
+		$(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+
+-include .depend
+
+#########################################################################
diff --git a/board/ms7720se/config.mk b/board/ms7720se/config.mk
new file mode 100644
index 0000000..cad8d3a
--- /dev/null
+++ b/board/ms7720se/config.mk
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2007
+# Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+#
+# Copyright (C) 2007
+# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+#
+# Copyright (C) 2007
+# Kenati Technologies, Inc.
+#
+# board/ms7720se/config.mk
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+#
+# TEXT_BASE refers to image _after_ relocation.
+#
+# NOTE: Must match value used in u-boot.lds (in this directory).
+#
+
+TEXT_BASE = 0x8FFC0000
diff --git a/board/ms7720se/lowlevel_init.S b/board/ms7720se/lowlevel_init.S
new file mode 100644
index 0000000..dcb77ef
--- /dev/null
+++ b/board/ms7720se/lowlevel_init.S
@@ -0,0 +1,268 @@
+/*
+ * (C) Copyright 2007
+ * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+	.global	lowlevel_init
+
+	.text
+	.align	2
+
+lowlevel_init:
+
+	mov.l	WTCSR_A,r1
+	mov.l	WTCSR_D,r0
+	mov.w	r0,@r1
+
+	mov.l	WTCNT_A,r1
+	mov.l	WTCNT_D,r0
+	mov.w	r0,@r1
+
+	mov.l	FRQCR_A,r1
+	mov.l	FRQCR_D,r0
+	mov.w	r0,@r1
+
+	mov.l	UCLKCR_A,r1
+	mov.l	UCLKCR_D,r0
+	mov.w	r0,@r1
+
+	mov.l	CMNCR_A, r1
+	mov.l	CMNCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS0BCR_A, r1
+	mov.l	CS0BCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS2BCR_A, r1
+	mov.l	CS2BCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS3BCR_A, r1
+	mov.l	CS3BCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS4BCR_A, r1
+	mov.l	CS4BCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS5ABCR_A, r1
+	mov.l	CS5ABCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS5BBCR_A, r1
+	mov.l	CS5BBCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS6ABCR_A, r1
+	mov.l	CS6ABCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS6BBCR_A, r1
+	mov.l	CS6BBCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS0WCR_A, r1
+	mov.l	CS0WCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS2WCR_A, r1
+	mov.l	CS2WCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS3WCR_A, r1
+	mov.l	CS3WCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS4WCR_A, r1
+	mov.l	CS4WCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS5AWCR_A, r1
+	mov.l	CS5AWCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS5BWCR_A, r1
+	mov.l	CS5BWCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS6AWCR_A, r1
+	mov.l	CS6AWCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	CS6BWCR_A, r1
+	mov.l	CS6BWCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	SDCR_A, r1
+	mov.l	SDCR_D1, r0
+	mov.l	r0, @r1
+
+	mov.l	RTCSR_A, r1
+	mov.l	RTCSR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	RTCNT_A, r1
+	mov.l	RTCNT_D, r0
+	mov.l	r0, @r1
+
+	mov.l	RTCOR_A, r1
+	mov.l	RTCOR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	SDCR_A, r1
+	mov.l	SDCR_D2, r0
+	mov.l	r0, @r1
+
+	mov.l	SDMR3_A, r1
+	mov.l	SDMR3_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PCCR_A, r1
+	mov.l	PCCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PDCR_A, r1
+	mov.l	PDCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PECR_A, r1
+	mov.l	PECR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PGCR_A, r1
+	mov.l	PGCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PHCR_A, r1
+	mov.l	PHCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PPCR_A, r1
+	mov.l	PPCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PTCR_A, r1
+	mov.l	PTCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PVCR_A, r1
+	mov.l	PVCR_D, r0
+	mov.w	r0, @r1
+
+	mov.l	PSELA_A, r1
+	mov.l	PSELA_D, r0
+	mov.w	r0, @r1
+
+	mov.l	CCR_A, r1
+	mov.l	CCR_D, r0
+	mov.l	r0, @r1
+
+	mov.l	LED_A, r1
+	mov.l	LED_D, r0
+	mov.b	r0, @r1
+
+	rts
+	 nop
+
+	.align 4
+
+FRQCR_A:	.long	0xA415FF80	/* FRQCR Address */
+WTCNT_A:	.long	0xA415FF84
+WTCSR_A:	.long	0xA415FF86
+UCLKCR_A:	.long	0xA40A0008
+FRQCR_D:	.long	0x1103		/* I:B:P=8:4:2 */
+WTCNT_D:	.long	0x5A00
+WTCSR_D:	.long	0xA506
+UCLKCR_D:	.long	0xA5C0
+
+#define BSC_BASE	0xA4FD0000
+CMNCR_A:	.long	BSC_BASE
+CS0BCR_A:	.long	BSC_BASE + 0x04
+CS2BCR_A:	.long	BSC_BASE + 0x08
+CS3BCR_A:	.long	BSC_BASE + 0x0C
+CS4BCR_A:	.long	BSC_BASE + 0x10
+CS5ABCR_A:	.long	BSC_BASE + 0x14
+CS5BBCR_A:	.long	BSC_BASE + 0x18
+CS6ABCR_A:	.long	BSC_BASE + 0x1C
+CS6BBCR_A:	.long	BSC_BASE + 0x20
+CS0WCR_A:	.long	BSC_BASE + 0x24
+CS2WCR_A:	.long	BSC_BASE + 0x28
+CS3WCR_A:	.long	BSC_BASE + 0x2C
+CS4WCR_A:	.long	BSC_BASE + 0x30
+CS5AWCR_A:	.long	BSC_BASE + 0x34
+CS5BWCR_A:	.long	BSC_BASE + 0x38
+CS6AWCR_A:	.long	BSC_BASE + 0x3C
+CS6BWCR_A:	.long	BSC_BASE + 0x40
+SDCR_A:		.long	BSC_BASE + 0x44
+RTCSR_A:	.long	BSC_BASE + 0x48
+RTCNT_A:	.long	BSC_BASE + 0x4C
+RTCOR_A:	.long	BSC_BASE + 0x50
+SDMR3_A:	.long	BSC_BASE + 0x58C0
+
+CMNCR_D:	.long	0x00000010
+CS0BCR_D:	.long	0x36DB0400
+CS2BCR_D:	.long	0x36DB0400
+CS3BCR_D:	.long	0x36DB4600
+CS4BCR_D:	.long	0x36DB0400
+CS5ABCR_D:	.long	0x36DB0400
+CS5BBCR_D:	.long	0x36DB0200
+CS6ABCR_D:	.long	0x36DB0400
+CS6BBCR_D:	.long	0x36DB0400
+CS0WCR_D:	.long	0x00000B01
+CS2WCR_D:	.long	0x00000500
+CS3WCR_D:	.long	0x00006D1B
+CS4WCR_D:	.long	0x00000500
+CS5AWCR_D:	.long	0x00000500
+CS5BWCR_D:	.long	0x00000500
+CS6AWCR_D:	.long	0x00000500
+CS6BWCR_D:	.long	0x00000500
+SDCR_D1:	.long	0x00000011
+RTCSR_D:	.long	0xA55A0010
+RTCNT_D:	.long	0xA55A001F
+RTCOR_D:	.long	0xA55A001F
+SDMR3_D:	.long	0x0000
+SDCR_D2:	.long	0x00000811
+
+#define PFC_BASE	0xA4050100
+PCCR_A:		.long	PFC_BASE + 0x04
+PDCR_A:		.long	PFC_BASE + 0x06
+PECR_A:		.long	PFC_BASE + 0x08
+PGCR_A:		.long	PFC_BASE + 0x0C
+PHCR_A:		.long	PFC_BASE + 0x0E
+PPCR_A:		.long	PFC_BASE + 0x18
+PTCR_A:		.long	PFC_BASE + 0x1E
+PVCR_A:		.long	PFC_BASE + 0x22
+PSELA_A:	.long	PFC_BASE + 0x24
+
+PCCR_D:		.long	0x0000
+PDCR_D:		.long	0x0000
+PECR_D:		.long	0x0000
+PGCR_D:		.long	0x0000
+PHCR_D:		.long	0x0000
+PPCR_D:		.long	0x00AA
+PTCR_D:		.long	0x0280
+PVCR_D:		.long	0x0000
+PSELA_D:	.long	0x0000
+
+CCR_A:		.long	0xFFFFFFEC
+!CCR_D:		.long	0x0000000D
+CCR_D:		.long	0x0000000B
+
+LED_A:		.long	0xB6800000
+LED_D:		.long	0xFF
diff --git a/board/ms7720se/ms7720se.c b/board/ms7720se/ms7720se.c
new file mode 100644
index 0000000..ad76c0b
--- /dev/null
+++ b/board/ms7720se/ms7720se.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2007
+ * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+ *
+ * Copyright (C) 2007
+ * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * Copyright (C) 2007
+ * Kenati Technologies, Inc.
+ *
+ * board/ms7720se/ms7720se.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+
+#define LED_BASE	0xB0800000
+
+int checkboard(void)
+{
+	puts("BOARD: Hitachi UL MS7720SE\n");
+	return 0;
+}
+
+int board_init(void)
+{
+
+	return 0;
+}
+
+int dram_init(void)
+{
+	DECLARE_GLOBAL_DATA_PTR;
+
+	gd->bd->bi_memstart = CFG_SDRAM_BASE;
+	gd->bd->bi_memsize = CFG_SDRAM_SIZE;
+	printf("DRAM:  %dMB\n", CFG_SDRAM_SIZE / (1024 * 1024));
+	return 0;
+}
+
+void led_set_state(unsigned short value)
+{
+	outw(value & 0xFF, LED_BASE);
+}
diff --git a/board/ms7720se/u-boot.lds b/board/ms7720se/u-boot.lds
new file mode 100644
index 0000000..ba71a91
--- /dev/null
+++ b/board/ms7720se/u-boot.lds
@@ -0,0 +1,108 @@
+/*
+ * Copyrigth (c) 2007
+ * Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+ *
+ * Copyrigth (c) 2007
+ * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
+OUTPUT_ARCH(sh)
+ENTRY(_start)
+
+SECTIONS
+{
+	/*
+	   Base address of internal SDRAM is 0x0C000000.
+	   Although size of SDRAM can be either 16 or 32 MBytes,
+	   we assume 16 MBytes (ie ignore upper half if the full
+	   32 MBytes is present).
+
+	   NOTE: This address must match with the definition of
+	   TEXT_BASE in config.mk (in this directory).
+
+	*/
+	. = 0x8C000000 + (64*1024*1024) - (256*1024);
+
+	PROVIDE (reloc_dst = .);
+
+	PROVIDE (_ftext = .);
+	PROVIDE (_fcode = .);
+	PROVIDE (_start = .);
+
+	.text :
+	{
+		cpu/sh3/start.o		(.text)
+		. = ALIGN(8192);
+		common/environment.o	(.ppcenv)
+		. = ALIGN(8192);
+		common/environment.o	(.ppcenvr)
+		. = ALIGN(8192);
+		*(.text)
+		. = ALIGN(4);
+	} =0xFF
+	PROVIDE (_ecode = .);
+	.rodata :
+	{
+		*(.rodata)
+		. = ALIGN(4);
+	}
+	PROVIDE (_etext = .);
+
+
+	PROVIDE (_fdata = .);
+	.data :
+	{
+		*(.data)
+		. = ALIGN(4);
+	}
+	PROVIDE (_edata = .);
+
+	PROVIDE (_fgot = .);
+	.got :
+	{
+		*(.got)
+		. = ALIGN(4);
+	}
+	PROVIDE (_egot = .);
+
+	PROVIDE (__u_boot_cmd_start = .);
+	.u_boot_cmd :
+	{
+		*(.u_boot_cmd)
+		. = ALIGN(4);
+	}
+	PROVIDE (__u_boot_cmd_end = .);
+
+	PROVIDE (reloc_dst_end = .);
+	/* _reloc_dst_end = .; */
+
+	PROVIDE (bss_start = .);
+	PROVIDE (__bss_start = .);
+	.bss :
+	{
+		*(.bss)
+		. = ALIGN(4);
+	}
+	PROVIDE (bss_end = .);
+
+	PROVIDE (_end = .);
+}