SPEAr : Support added for SPEAr600 board

SPEAr600 SoC support contains basic spear600 support along with the usage of following drivers - serial driver(UART) - i2c driver - smi driver - nand driver(FSMC) - usbd driver Signed-off-by: Vipin <vipin.kumar@st.com>
16 years ago · f68d0678c8
parent 2f11000558
commit f68d0678c8
12 changed files with 928 additions and 0 deletions
--- a/1
+++ b/1
@ -574,6 +574,7 @@ LIST_ARM9="			\
 	sheevaplug		\
 	smdk2400		\
 	smdk2410		\
 	spear600		\
 	trab			\
 	VCMA9			\
 	versatile		\
--- a/3
+++ b/3
@ -3028,6 +3028,9 @@ smdk2400_config	:	unconfig
 smdk2410_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
 spear600_config :	unconfig
 	@$(MKCONFIG) -n $@ -t $(@:_config=) spear6xx arm arm926ejs $(@:_config=) spear spear
 SX1_stdout_serial_config \
 SX1_config:		unconfig
 	@mkdir -p $(obj)include
--- a/board/spear/common/Makefile
+++ b/board/spear/common/Makefile
@ -0,0 +1,54 @@
 #
 # (C) Copyright 2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # 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
 #
 include $(TOPDIR)/config.mk
 ifneq ($(OBJTREE),$(SRCTREE))
 $(shell mkdir -p $(obj)board/$(VENDOR)/common)
 endif
 LIB	= $(obj)lib$(VENDOR).a
 COBJS	:= spr_misc.o
 SOBJS	:= spr_lowlevel_init.o
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 clean:
 	rm -f $(SOBJS) $(OBJS)
 distclean:	clean
 	rm -f $(LIB) core *.bak $(obj).depend
 #########################################################################
 # This is for $(obj).depend target
 include $(SRCTREE)/rules.mk
 sinclude $(obj).depend
 #########################################################################
--- a/board/spear/common/spr_lowlevel_init.S
+++ b/board/spear/common/spr_lowlevel_init.S
@ -0,0 +1,195 @@
 /*
 * (C) Copyright 2006
 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
 *
 * 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
 */
 #include <config.h>
 /*
 * platform specific initializations are already done in Xloader
 * Initializations already done include
 * DDR, PLLs, IP's clock enable and reset release etc
 */
 .globl lowlevel_init
 lowlevel_init:
 	/* By default, U-Boot switches CPU to low-vector */
 	/* Revert this as we work in high vector even in U-Boot */
 	mrc	p15, 0, r0, c1, c0, 0
 	orr	r0, r0, #0x00002000
 	mcr	p15, 0, r0, c1, c0, 0
 	mov	pc, lr
 /* void setfreq(unsigned int device, unsigned int frequency) */
 .global setfreq
 setfreq:
 	stmfd 	sp!,{r14}
 	stmfd 	sp!,{r0-r12}
 	mov  	r8,sp
 	ldr 	sp,SRAM_STACK_V
 	/* Saving the function arguements for later use */
 	mov  	r4,r0
 	mov  	r5,r1
 	/* Putting DDR into self refresh */
 	ldr 	r0,DDR_07_V
 	ldr	r1,[r0]
 	ldr	r2,DDR_ACTIVE_V
 	bic	r1, r1, r2
 	str	r1,[r0]
 	ldr 	r0,DDR_57_V
 	ldr	r1,[r0]
 	ldr	r2,CYCLES_MASK_V
 	bic	r1, r1, r2
 	ldr	r2,REFRESH_CYCLES_V
 	orr	r1, r1, r2, lsl #16
 	str	r1,[r0]
 	ldr 	r0,DDR_07_V
 	ldr	r1,[r0]
 	ldr	r2,SREFRESH_MASK_V
 	orr	r1, r1, r2
 	str	r1,[r0]
 	/* flush pipeline */
 	b	flush
 	.align 5
 flush:
 	/* Delay to ensure self refresh mode */
 	ldr	r0,SREFRESH_DELAY_V
 delay:
 	sub	r0,r0,#1
 	cmp	r0,#0
 	bne	delay
 	/* Putting system in slow mode */
 	ldr	r0,SCCTRL_V
 	mov	r1,#2
 	str	r1,[r0]
 	/* Changing PLL(1/2) frequency */
 	mov	r0,r4
 	mov	r1,r5
 	cmp	r4,#0
 	beq	pll1_freq
 	/* Change PLL2 (DDR frequency) */
 	ldr	r6,PLL2_FREQ_V
 	ldr	r7,PLL2_CNTL_V
 	b	pll2_freq
 pll1_freq:
 	/* Change PLL1 (CPU frequency) */
 	ldr	r6,PLL1_FREQ_V
 	ldr	r7,PLL1_CNTL_V
 pll2_freq:
 	mov	r0,r6
 	ldr	r1,[r0]
 	ldr	r2,PLLFREQ_MASK_V
 	bic	r1,r1,r2
 	mov	r2,r5,lsr#1
 	orr	r1,r1,r2,lsl#24
 	str	r1,[r0]
 	mov	r0,r7
 	ldr	r1,P1C0A_V
 	str	r1,[r0]
 	ldr	r1,P1C0E_V
 	str	r1,[r0]
 	ldr	r1,P1C06_V
 	str	r1,[r0]
 	ldr	r1,P1C0E_V
 	str	r1,[r0]
 lock:
 	ldr	r1,[r0]
 	and	r1,r1,#1
 	cmp	r1,#0
 	beq	lock
 	/* Putting system back to normal mode */
 	ldr	r0,SCCTRL_V
 	mov	r1,#4
 	str	r1,[r0]
 	/* Putting DDR back to normal */
 	ldr	r0,DDR_07_V
 	ldr	r1,[R0]
 	ldr	r2,SREFRESH_MASK_V
 	bic	r1, r1, r2
 	str	r1,[r0]
 	ldr	r2,DDR_ACTIVE_V
 	orr	r1, r1, r2
 	str	r1,[r0]
 	/* Delay to ensure self refresh mode */
 	ldr	r0,SREFRESH_DELAY_V
 1:
 	sub	r0,r0,#1
 	cmp	r0,#0
 	bne	1b
 	mov	sp,r8
 	/* Resuming back to code */
 	ldmia	sp!,{r0-r12}
 	ldmia	sp!,{pc}
 SCCTRL_V:
 	.word 0xfca00000
 PLL1_FREQ_V:
 	.word 0xfca8000C
 PLL1_CNTL_V:
 	.word 0xfca80008
 PLL2_FREQ_V:
 	.word 0xfca80018
 PLL2_CNTL_V:
 	.word 0xfca80014
 PLLFREQ_MASK_V:
 	.word 0xff000000
 P1C0A_V:
 	.word 0x1C0A
 P1C0E_V:
 	.word 0x1C0E
 P1C06_V:
 	.word 0x1C06
 SREFRESH_DELAY_V:
 	.word 0x9999
 SRAM_STACK_V:
 	.word 0xD2800600
 DDR_07_V:
 	.word 0xfc60001c
 DDR_ACTIVE_V:
 	.word 0x01000000
 DDR_57_V:
 	.word 0xfc6000e4
 CYCLES_MASK_V:
 	.word 0xffff0000
 REFRESH_CYCLES_V:
 	.word 0xf0f0
 SREFRESH_MASK_V:
 	.word 0x00010000
 .global setfreq_sz
 setfreq_sz:
 	.word setfreq_sz - setfreq
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
@ -0,0 +1,171 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
 *
 * 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
 */
 #include <common.h>
 #include <command.h>
 #include <i2c.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_xloader_table.h>
 #include <asm/arch/spr_defs.h>
 #define CPU		0
 #define DDR		1
 #define SRAM_REL	0xD2801000
 DECLARE_GLOBAL_DATA_PTR;
 static struct chip_data chip_data;
 int dram_init(void)
 {
 	struct xloader_table *xloader_tb =
 	    (struct xloader_table *)XLOADER_TABLE_ADDRESS;
 	struct xloader_table_1_1 *table_1_1;
 	struct xloader_table_1_2 *table_1_2;
 	struct chip_data *chip = &chip_data;
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
 	gd->bd->bi_dram[0].size = get_ram_size(PHYS_SDRAM_1,
 					       PHYS_SDRAM_1_MAXSIZE);
 	if (XLOADER_TABLE_VERSION_1_1 == xloader_tb->table_version) {
 		table_1_1 = &xloader_tb->table.table_1_1;
 		chip->dramfreq = table_1_1->ddrfreq;
 		chip->dramtype = table_1_1->ddrtype;
 	} else if (XLOADER_TABLE_VERSION_1_2 == xloader_tb->table_version) {
 		table_1_2 = &xloader_tb->table.table_1_2;
 		chip->dramfreq = table_1_2->ddrfreq;
 		chip->dramtype = table_1_2->ddrtype;
 	} else {
 		chip->dramfreq = -1;
 	}
 	return 0;
 }
 int misc_init_r(void)
 {
 	setenv("verify", "n");
 #if defined(CONFIG_SPEAR_USBTTY)
 	setenv("stdin", "usbtty");
 	setenv("stdout", "usbtty");
 	setenv("stderr", "usbtty");
 #endif
 	return 0;
 }
 int spear_board_init(ulong mach_type)
 {
 	struct xloader_table *xloader_tb =
 	    (struct xloader_table *)XLOADER_TABLE_ADDRESS;
 	struct xloader_table_1_2 *table_1_2;
 	struct chip_data *chip = &chip_data;
 	gd->bd->bi_arch_number = mach_type;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
 	/* CPU is initialized to work at 333MHz in Xloader */
 	chip->cpufreq = 333;
 	if (XLOADER_TABLE_VERSION_1_2 == xloader_tb->table_version) {
 		table_1_2 = &xloader_tb->table.table_1_2;
 		memcpy(chip->version, table_1_2->version,
 		       sizeof(chip->version));
 	}
 	return 0;
 }
 int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	void (*sram_setfreq) (unsigned int, unsigned int);
 	struct chip_data *chip = &chip_data;
 	unsigned char mac[6];
 	unsigned int frequency;
 	if ((argc > 3) || (argc < 2)) {
 		cmd_usage(cmdtp);
 		return 1;
 	}
 	if ((!strcmp(argv[1], "cpufreq")) || (!strcmp(argv[1], "ddrfreq"))) {
 		frequency = simple_strtoul(argv[2], NULL, 0);
 		if (frequency > 333) {
 			printf("Frequency is limited to 333MHz\n");
 			return 1;
 		}
 		sram_setfreq = memcpy((void *)SRAM_REL, setfreq, setfreq_sz);
 		if (!strcmp(argv[1], "cpufreq")) {
 			sram_setfreq(CPU, frequency);
 			printf("CPU frequency changed to %u\n", frequency);
 			chip->cpufreq = frequency;
 		} else {
 			sram_setfreq(DDR, frequency);
 			printf("DDR frequency changed to %u\n", frequency);
 			chip->dramfreq = frequency;
 		}
 		return 0;
 	} else if (!strcmp(argv[1], "print")) {
 		if (chip->cpufreq == -1)
 			printf("CPU Freq    = Not Known\n");
 		else
 			printf("CPU Freq    = %d MHz\n", chip->cpufreq);
 		if (chip->dramfreq == -1)
 			printf("DDR Freq    = Not Known\n");
 		else
 			printf("DDR Freq    = %d MHz\n", chip->dramfreq);
 		if (chip->dramtype == DDRMOBILE)
 			printf("DDR Type    = MOBILE\n");
 		else if (chip->dramtype == DDR2)
 			printf("DDR Type    = DDR2\n");
 		else
 			printf("DDR Type    = Not Known\n");
 		printf("Xloader Rev = %s\n", chip->version);
 		return 0;
 	}
 	cmd_usage(cmdtp);
 	return 1;
 }
 U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
 	   "configure chip",
 	   "chip_config cpufreq/ddrfreq frequency\n"
 	   "chip_config print");
--- a/board/spear/spear600/Makefile
+++ b/board/spear/spear600/Makefile
@ -0,0 +1,51 @@
 #
 # (C) Copyright 2000-2004
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # 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
 #
 include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(BOARD).a
 COBJS	:= spear600.o
 SOBJS	:=
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
 clean:
 	rm -f $(SOBJS) $(OBJS)
 distclean:	clean
 	rm -f $(LIB) core *.bak $(obj).depend
 #########################################################################
 # defines $(obj).depend target
 include $(SRCTREE)/rules.mk
 sinclude $(obj).depend
 #########################################################################
--- a/board/spear/spear600/config.mk
+++ b/board/spear/spear600/config.mk
@ -0,0 +1,39 @@
 #
 # (C) Copyright 2009
 # Vipin Kumar, ST Microelectronics <vipin.kumar@st.com>
 #
 # 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
 #
 #########################################################################
 TEXT_BASE = 0x00700000
 ALL += $(obj)u-boot.img
 # Environment variables in NAND
 ifeq ($(ENV),NAND)
 PLATFORM_RELFLAGS += -DCONFIG_ENV_IS_IN_NAND
 else
 PLATFORM_RELFLAGS += -DCONFIG_ENV_IS_IN_FLASH
 endif
 ifeq ($(CONSOLE),USB)
 PLATFORM_RELFLAGS += -DCONFIG_SPEAR_USBTTY
 endif
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@ -0,0 +1,53 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
 *
 * 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
 */
 #include <common.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_defs.h>
 #include <asm/arch/spr_misc.h>
 #include <asm/arch/spr_nand.h>
 int board_init(void)
 {
 	return spear_board_init(MACH_TYPE_SPEAR600);
 }
 /*
 * board_nand_init - Board specific NAND initialization
 * @nand:	mtd private chip structure
 *
 * Called by nand_init_chip to initialize the board specific functions
 */
 int board_nand_init(struct nand_chip *nand)
 {
 	struct misc_regs *const misc_regs_p =
 	    (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
 	if (!(readl(&misc_regs_p->auto_cfg_reg) & MISC_NANDDIS))
 		return spear_nand_init(nand);
 	return -1;
 }
--- a/include/asm-arm/arch-spear/spr_defs.h
+++ b/include/asm-arm/arch-spear/spr_defs.h
@ -0,0 +1,38 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
 *
 * 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
 */
 #ifndef __SPR_DEFS_H__
 #define __SPR_DEFS_H__
 extern int spear_board_init(ulong);
 extern void setfreq(unsigned int, unsigned int);
 extern unsigned int setfreq_sz;
 struct chip_data {
 	int cpufreq;
 	int dramfreq;
 	int dramtype;
 	uchar version[32];
 };
 #endif
--- a/include/asm-arm/arch-spear/spr_xloader_table.h
+++ b/include/asm-arm/arch-spear/spr_xloader_table.h
@ -0,0 +1,67 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
 *
 * 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
 */
 #ifndef _SPR_XLOADER_TABLE_H
 #define _SPR_XLOADER_TABLE_H
 #define XLOADER_TABLE_VERSION_1_1	2
 #define XLOADER_TABLE_VERSION_1_2	3
 #define XLOADER_TABLE_ADDRESS		0xD2801FF0
 #define DDRMOBILE	1
 #define DDR2		2
 #define REV_BA		1
 #define REV_AA		2
 #define REV_AB		3
 struct xloader_table_1_1 {
 	unsigned short ddrfreq;
 	unsigned char ddrsize;
 	unsigned char ddrtype;
 	unsigned char soc_rev;
 } __attribute__ ((packed));
 struct xloader_table_1_2 {
 	unsigned const char *version;
 	unsigned short ddrfreq;
 	unsigned char ddrsize;
 	unsigned char ddrtype;
 	unsigned char soc_rev;
 } __attribute__ ((packed));
 union table_contents {
 	struct xloader_table_1_1 table_1_1;
 	struct xloader_table_1_2 table_1_2;
 };
 struct xloader_table {
 	unsigned char table_version;
 	union table_contents table;
 } __attribute__ ((packed));
 #endif
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@ -0,0 +1,213 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
 *
 * 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
 */
 #ifndef _SPEAR_COMMON_H
 #define _SPEAR_COMMON_H
 /*
 * Common configurations used for both spear3xx as well as spear6xx
 */
 /* USBD driver configuration */
 #define CONFIG_SPEARUDC
 #define CONFIG_USB_DEVICE
 #define CONFIG_USB_TTY
 #define CONFIG_USBD_PRODUCT_NAME		"SPEAr SoC"
 #define CONFIG_USBD_MANUFACTURER		"ST Microelectronics"
 #define CONFIG_EXTRA_ENV_USBTTY			"usbtty=cdc_acm\0"
 /* I2C driver configuration */
 #define CONFIG_HARD_I2C
 #define CONFIG_SPEAR_I2C
 #define CONFIG_SYS_I2C_SPEED			400000
 #define CONFIG_SYS_I2C_SLAVE			0x02
 #define CONFIG_I2C_CHIPADDRESS			0x50
 /* Timer, HZ specific defines */
 #define CONFIG_SYS_HZ				(1000)
 #define CONFIG_SYS_HZ_CLOCK			(8300000)
 /* Flash configuration */
 #if defined(CONFIG_FLASH_PNOR)
 #define CONFIG_SPEAR_EMI			1
 #else
 #define CONFIG_SPEARSMI				1
 #endif
 #if defined(CONFIG_SPEARSMI)
 #define CONFIG_SYS_MAX_FLASH_BANKS		2
 #define CONFIG_SYS_FLASH_BASE			(0xF8000000)
 #define CONFIG_SYS_CS1_FLASH_BASE		(0xF9000000)
 #define CONFIG_SYS_FLASH_BANK_SIZE		(0x01000000)
 #define CONFIG_SYS_FLASH_ADDR_BASE		{CONFIG_SYS_FLASH_BASE, \
 						CONFIG_SYS_CS1_FLASH_BASE}
 #define CONFIG_SYS_MAX_FLASH_SECT		128
 #define CONFIG_SYS_FLASH_EMPTY_INFO		1
 #define CONFIG_SYS_FLASH_ERASE_TOUT		(3 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_FLASH_WRITE_TOUT		(3 * CONFIG_SYS_HZ)
 #endif
 /*
 * Serial Configuration (PL011)
 * CONFIG_PL01x_PORTS is defined in specific files
 */
 #define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK			(48 * 1000 * 1000)
 #define CONFIG_CONS_INDEX			0
 #define CONFIG_BAUDRATE				115200
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, \
 						57600, 115200 }
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 /* NAND FLASH Configuration */
 #define CONFIG_NAND_SPEAR			1
 #define CONFIG_SYS_MAX_NAND_DEVICE		1
 #define CONFIG_MTD_NAND_VERIFY_WRITE		1
 /*
 * Command support defines
 */
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVES
 /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 /*
 * Default Environment Varible definitions
 */
 #if defined(CONFIG_SPEAR_USBTTY)
 #define CONFIG_BOOTDELAY			-1
 #else
 #define CONFIG_BOOTDELAY			1
 #endif
 #define CONFIG_ENV_OVERWRITE
 /*
 * U-Boot Environment placing definitions.
 */
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 #ifdef CONFIG_SPEARSMI
 /*
 * Environment is in serial NOR flash
 */
 #define CONFIG_SYS_MONITOR_LEN			0x00040000
 #define CONFIG_ENV_SECT_SIZE			0x00010000
 #define CONFIG_FSMTDBLK				"/dev/mtdblock8 "
 #define CONFIG_BOOTCOMMAND			"bootm 0xf8050000"
 #elif defined(CONFIG_SPEAR_EMI)
 /*
 * Environment is in parallel NOR flash
 */
 #define CONFIG_SYS_MONITOR_LEN			0x00060000
 #define CONFIG_ENV_SECT_SIZE			0x00020000
 #define CONFIG_FSMTDBLK				"/dev/mtdblock3 "
 #define CONFIG_BOOTCOMMAND			"cp.b 0x50080000 0x1600000 " \
 						"0x4C0000; bootm 0x1600000"
 #endif
 #define CONFIG_SYS_MONITOR_BASE			CONFIG_SYS_FLASH_BASE
 #define CONFIG_ENV_ADDR				(CONFIG_SYS_MONITOR_BASE + \
 						CONFIG_SYS_MONITOR_LEN)
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 /*
 * Environment is in NAND
 */
 #define CONFIG_ENV_OFFSET			0x60000
 #define CONFIG_ENV_RANGE			0x10000
 #define CONFIG_FSMTDBLK				"/dev/mtdblock12 "
 #define CONFIG_BOOTCOMMAND			"nand read.jffs2 0x1600000 " \
 						"0x80000 0x4C0000; " \
 						"bootm 0x1600000"
 #endif
 #define CONFIG_BOOTARGS_NFS			"root=/dev/nfs ip=dhcp " \
 						"console=ttyS0 init=/bin/sh"
 #define CONFIG_BOOTARGS				"console=ttyS0 mem=128M "  \
 						"root="CONFIG_FSMTDBLK \
 						"rootfstype=jffs2"
 #define CONFIG_ENV_SIZE				0x02000
 /* Miscellaneous configurable options */
 #define CONFIG_BOOT_PARAMS_ADDR			0x00000100
 #define CONFIG_CMDLINE_TAG			1
 #define CONFIG_SETUP_MEMORY_TAGS		1
 #define CONFIG_MISC_INIT_R			1
 #define CONFIG_ZERO_BOOTDELAY_CHECK		1
 #define CONFIG_AUTOBOOT_KEYED			1
 #define CONFIG_AUTOBOOT_STOP_STR		" "
 #define CONFIG_AUTOBOOT_PROMPT			\
 		"Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
 #define CONFIG_SYS_MEMTEST_START		0x00800000
 #define CONFIG_SYS_MEMTEST_END			0x04000000
 #define CONFIG_SYS_MALLOC_LEN			(1024*1024)
 #define CONFIG_SYS_GBL_DATA_SIZE		128
 #define CONFIG_IDENT_STRING			"-SPEAr"
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT			"u-boot> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE			256
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
 						sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS			16
 #define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR			0x00800000
 #define CONFIG_SYS_CONSOLE_INFO_QUIET		1
 #define CONFIG_SYS_64BIT_VSPRINTF		1
 #define CONFIG_EXTRA_ENV_SETTINGS		CONFIG_EXTRA_ENV_USBTTY
 /* Stack sizes */
 #define CONFIG_STACKSIZE			(128*1024)
 #ifdef CONFIG_USE_IRQ
 #define CONFIG_STACKSIZE_IRQ			(4*1024)
 #define CONFIG_STACKSIZE_FIQ			(4*1024)
 #endif
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS			1
 #define PHYS_SDRAM_1				0x00000000
 #define PHYS_SDRAM_1_MAXSIZE			0x40000000
 #endif
--- a/include/configs/spear6xx.h
+++ b/include/configs/spear6xx.h
@ -0,0 +1,43 @@
 /*
 * (C) Copyright 2009
 * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
 *
 * 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
 */
 #ifndef __CONFIG_H
 #define __CONFIG_H
 /*
 * High Level Configuration Options
 * (easy to change)
 */
 #define CONFIG_SPEAR600				1
 #include <configs/spear-common.h>
 /* Serial Configuration (PL011) */
 #define CONFIG_SYS_SERIAL0			0xD0000000
 #define CONFIG_SYS_SERIAL1			0xD0080000
 #define CONFIG_PL01x_PORTS			{ (void *)CONFIG_SYS_SERIAL0, \
 						(void *)CONFIG_SYS_SERIAL1 }
 #define CONFIG_SYS_NAND_BASE			(0xD2000000)
 #endif  /* __CONFIG_H */