ARM: remove broken boards

Signed-off-by Wolfgang Denk <[email protected]>

Cc Kristoffer Ericson <[email protected]>

---
 MAINTAINERS               |    4 -
 board/jornada/Makefile    |   53 -----------
 board/jornada/jornada.c   |   60 -------------
 board/jornada/setup.S     |  210 ---------------------------------------------
 board/jornada/u-boot.lds  |   58 -------------
 boards.cfg                |    1 -
 doc/README.scrapyard      |    1 +
 include/configs/jornada.h |  153 ---------------------------------
 8 files changed, 1 insertions(+), 539 deletions(-)
 delete mode 100644 board/jornada/Makefile
 delete mode 100644 board/jornada/jornada.c
 delete mode 100644 board/jornada/setup.S
 delete mode 100644 board/jornada/u-boot.lds
 delete mode 100644 include/configs/jornada.h

MAINTAINERS +0 -4

index ce0f57e..af641d2 100644
@@ -631,10 +631,6 @@ Thomas Elste <[email protected]>
 
 	modnet50	ARM720T (NET+50)
 
-Kristoffer Ericson <[email protected]>
-
-	jornada	SA1110
-
 Fabio Estevam <[email protected]>
 
 	mx31pdk		i.MX31

board/jornada/Makefile deleted +0 -53

deleted file mode 100644
index e017692..0000000
@@ -1,53 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# 2004 (c) MontaVista Software, Inc.
-#
-# 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).o
-
-COBJS	:= jornada.o
-SOBJS	:= setup.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-	$(call cmd_link_o_target, $(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
-
-#########################################################################

board/jornada/jornada.c deleted +0 -60

deleted file mode 100644
index fab1068..0000000
@@ -1,60 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <[email protected]>
- *
- * 2004 (c) MontaVista Software, Inc.
- *
- * 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 <SA-1100.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
-
-int board_init(void)
-{
-	gd->bd->bi_arch_number = MACH_TYPE_JORNADA720;
-	gd->bd->bi_boot_params = 0xc0000100;
-
-
-	/*
-	 * Turn on flashing.
-	 * Would be nice to have some protection but
-	 * that would have to be implemented in the
-	 * flash init function, which isnt possible yet.
-	 */
-	PPSR |= (1 << 7);
-	PPDR |= (1 << 7);
-
-	return 0;
-}
-
-int dram_init(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-
-	return (0);
-}

board/jornada/setup.S deleted +0 -210

deleted file mode 100644
index cdf5f54..0000000
@@ -1,210 +0,0 @@
-/*
- * Memory Setup stuff - taken from blob memsetup.S
- *
- * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw at its.tudelft.nl) and
- *		       Jan-Derk Bakker (J.D.Bakker at its.tudelft.nl)
- * 2004 (c) MontaVista Software, Inc.
- *
- * 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"
-#include "version.h"
-
-
-/*-----------------------------------------------------------------------
- * Board defines:
- */
-
-#define MDCNFG		0x00
-#define MDCAS00		0x04
-#define MDCAS01		0x08
-#define MDCAS02		0x0C
-#define MSC0		0x10
-#define MSC1		0x14
-#define MECR		0x18
-#define MDREFR		0x1C
-#define MDCAS20		0x20
-#define MDCAS21		0x24
-#define MDCAS22		0x28
-#define MSC2		0x2C
-#define SMCNFG		0x30
-
-#define GPDR	0x04
-#define GPSR	0x08
-#define GPCR	0x0C
-#define GAFR	0x1C
-
-#define PPDR	0x00
-#define PPSR	0x04
-#define PPAR	0x08
-
-#define MDREFR_TRASR(n_) (n_ & (0x0000000f))
-#define MDREFR_DRI(n_)   ((n_ & (0x00000fff)) << 4)
-#define MDREFR_K0DB2 (1 << 18)
-#define MDREFR_K1DB2 (1 << 22)
-#define MDREFR_K2DB2 (1 << 26)
-
-#define MDREFR_K0RUN (1 << 17)
-#define MDREFR_K1RUN (1 << 21)
-#define MDREFR_K2RUN (1 << 25)
-
-#define MDREFR_SLFRSH (1 << 31)
-#define MDREFR_E1PIN  (1 << 20)
-
-#define PSSR    0x04
-#define PSSR_DH 0x00000008
-#define POSR    0x08
-#define RCSR    0x04
-
-/*-----------------------------------------------------------------------
- * Setup parameters for the board:
- */
-MEM_BASE:	.long	0xa0000000
-MEM_START:	.long	0xc0000000
-PWR_BASE:	.word	0x90020000
-RST_BASE:	.long	0x90030000
-PPC_BASE:	.long	0x90060000
-GPIO_BASE:	.long	0x90040000
-IC_BASE:	.word	0x90050000
-
-cpuspeed:	.word	0xa0
-/* calculated from old blob bootloader */
-mdcnfg:	.long	0x00037267	/* mdcnfg  0x00037267 */
-mdcas00:	.long	0x5555557f	/* mdcas00 0x5555557f */
-mdcas01:	.long	0x55555555	/* mdcas01 0x55555555 */
-mdcas02:	.long	0x55555555	/* mdcas02 0x55555555 */
-msc0:	.long	0xfff04f78		/* msc0    0xfff04f78 */
-msc1:	.long	0xfff8fff0		/* msc1    0xfff8fff0 */
-mecr:	.long	0x98c698c6	/* mecr    0x98c698c6 */
-mdrefr:	.long	0x067600c7	/* mdrefr  0x04340327 */
-mdcas20:	.long	0xd1284142	/* mdcas20 0xd1284142 */
-mdcas21:	.long	0x72249529	/* mdcas21 0x72249529 */
-mdcas22:	.long	0x78414351	/* mdcas22 0x78414351 */
-msc2:	.long	0x201d2959		/* msc2    0x201d2959 */
-smcnfg:	.long	0x00000000	/* smcnfg  0x00000000 */
-
-pin_set_out:	.long	0x37ff70
-pin_set_dir:	.long	0x11480
-
-gpdr_set:	.long	0x0B3A0900
-gpsr_set:	.long	0x02100800
-gpcr_set:	.long	0x092A0100
-gafr_set:	.long	0x08600000
-
-.globl lowlevel_init
-lowlevel_init:
-
-
-	/* this is required for flashing */
-	ldr	r0, PPC_BASE
-	ldr	r1, pin_set_out
-	str	r1, [r0, #PPSR]
-	ldr	r1, pin_set_dir
-	str	r1, [r0, #PPDR]
-
-	/* Setting up the memory and stuff */
-	/***********************************/
-
-	ldr	r0, MEM_BASE
-
-	ldr	r1, mdcnfg
-	str	r1, [r0, #MDCNFG]
-	ldr	r1, mdcas00
-	str	r1, [r0, #MDCAS00]
-	ldr	r1, mdcas01
-	str	r1, [r0, #MDCAS01]
-	ldr	r1, mdcas02
-	str	r1, [r0, #MDCAS02]
-	ldr	r1, mdcas20
-	str	r1, [r0, #MDCAS20]
-	ldr	r1, mdcas21
-	str	r1, [r0, #MDCAS21]
-	ldr	r1, mdcas22
-	str	r1, [r0, #MDCAS22]
-
-	/* clear kxDB2 */
-	ldr	r2, [r0, #MDREFR]
-	bic	r2, r2, #MDREFR_K0DB2
-	bic	r2, r2, #MDREFR_K1DB2
-	bic	r2, r2, #MDREFR_K2DB2
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, [r0, #MDREFR]
-	orr r2, r2, #MDREFR_TRASR(7)
-
-	mov r4, #0x2000
-	spin:	subs	r4, r4, #1
-	bne	spin
-
-	ldr	r1, PWR_BASE
-	mov	r2, #PSSR_DH
-	str	r2, [r1, #PSSR]
-
-	ldr	r2, [r0, #MDREFR]
-	bic	r2, r2, #MDREFR_K0DB2
-	bic	r2, r2, #MDREFR_K1DB2
-	bic	r2, r2, #MDREFR_K2DB2
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, [r0, #MDREFR]
-	orr	r2, r2, #MDREFR_TRASR(7)
-	orr	r2, r2, #MDREFR_DRI(12)
-	orr	r2, r2, #MDREFR_K0DB2
-	orr	r2, r2, #MDREFR_K1DB2
-	orr	r2, r2, #MDREFR_K2DB2
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, [r0, #MDREFR]
-	orr	r2, r2, #MDREFR_K0RUN
-	orr	r2, r2, #MDREFR_K1RUN
-	orr	r2, r2, #MDREFR_K2RUN
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, [r0, #MDREFR]
-	bic	r2, r2, #MDREFR_SLFRSH
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, [r0, #MDREFR]
-	orr	r2, r2, #MDREFR_E1PIN
-	str	r2, [r0, #MDREFR]
-
-	ldr	r2, MEM_START
-.rept	8
-	ldr	r3, [r2]
-.endr
-
-	ldr	r2, [r0, #MDCNFG]
-	orr	r2, r2, #0x00000003
-	orr	r2, r2, #0x00030000
-	str	r2, [r0, #MDCNFG]
-
-	ldr	r1, msc0
-	str	r1, [r0, #MSC0]
-	ldr	r1, msc1
-	str	r1, [r0, #MSC1]
-	ldr	r1, msc2
-	str	r1, [r0, #MSC2]
-	ldr	r1, smcnfg
-	str	r1, [r0, #SMCNFG]
-	ldr	r1, mecr
-	str	r1, [r0, #MECR]
-
-	mov	pc, lr

board/jornada/u-boot.lds deleted +0 -58

deleted file mode 100644
index c75b21f..0000000
@@ -1,58 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2004 (c) MontaVista Software, Inc.
- *
- * 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-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-	. = 0x00000000;
-
-	. = ALIGN(4);
-	.text :
-	{
-		cpu/sa1100/start.o	(.text)
-		*(.text)
-	}
-
-	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
-
-	. = ALIGN(4);
-	.data : { *(.data) }
-
-	. = ALIGN(4);
-	.got : { *(.got) }
-
-
-	. = .;
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { *(.u_boot_cmd) }
-	__u_boot_cmd_end = .;
-
-	. = ALIGN(4);
-	__bss_start = .;
-	.bss (NOLOAD) : { *(.bss) . = ALIGN(4); }
-	__bss_end__ = .;
-}

boards.cfg +0 -1

index 0f5182e..d2c3574 100644
@@ -202,7 +202,6 @@ xm250                        arm         pxa
 zipitz2                      arm         pxa
 zylonite                     arm         pxa
 B2                           arm         s3c44b0     -                   dave
-jornada                      arm         sa1100
 lart                         arm         sa1100
 shannon                      arm         sa1100
 atngw100                     avr32       at32ap      -                   atmel          at32ap700x

doc/README.scrapyard +1 -0

index 7d96f99..851754c 100644
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+jornada arm     sa1100	-	  2011-07-16	Kristoffer Ericson <[email protected]>
 gcplus  arm     sa1100	-	  2011-07-16	George G. Davis <[email protected]>
 dnp1110	arm	sa1100	-	  2011-07-16	Alex Z?pke <[email protected]>
 assabet	arm	sa1100	-	  2011-07-16	George G. Davis <[email protected]>

include/configs/jornada.h deleted +0 -153

deleted file mode 100644
index 84ad2d8..0000000
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010 (C)
- * Kristoffer Ericson <[email protected]>
- *
- * 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_SA1110			1	/* This is an SA110 CPU */
-#define CONFIG_JORNADA700		1	/* on an HP Jornada 700 series */
-#define CONFIG_SYS_FLASH_PROTECTION	1
-
-#define CONFIG_SYS_TEXT_BASE		0xC1F00000
-
-/* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_DCACHE_OFF
-#undef CONFIG_USE_IRQ
-
-/* Console setting */
-
-#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs      */
-#define CONFIG_SETUP_MEMORY_TAGS	1
-#define CONFIG_INITRD_TAG		1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * select serial console configuration
- */
-#define CONFIG_SA1100_SERIAL	1
-#define CONFIG_SERIAL3		1	/* we use serial 3 */
-#define CONFIG_BAUDRATE	19200
-#define CONFIG_LOADS_ECHO	1
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_MISC
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-
-#define CONFIG_BOOTDELAY	5
-#define CONFIG_BOOTARGS	"root=/dev/hda1 console=ttySA0,19200n8 console=tty1"
-#define CONFIG_BOOTCOMMAND	"run boot_kernel"
-#define CONFIG_SYS_AUTOLOAD	"n"	/* No autoload */
-#define CONFIG_SYS_LOAD_ADDR	0xc0000000
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP	/* undef to save memory */
-#define CONFIG_SYS_PROMPT		"HP Jornada# "
-#define CONFIG_SYS_CBSIZE		256	/* console buffsize */
-#define CONFIG_SYS_PBSIZE		(256+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS		16	/* max number of command args */
-#define CONFIG_SYS_BARGSIZE		256	/* Boot Argument Buffer Size */
-#define CONFIG_SYS_MEMTEST_START	0xc0040000	/* memtest works on */
-#define CONFIG_SYS_MEMTEST_END		0xc2000000	/* 4..128 MB */
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_CPUSPEED		0x0a /* core clock 206MHz */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 19200, 38400, 57600, 115200 }
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE		(128*1024)	/* regular stack */
-#define CONFIG_SYS_FLASH_CFI		1
-#define CONFIG_FLASH_CFI_DRIVER	1
-#define CONFIG_FLASH_CFI_WIDTH		FLASH_CFI_32BIT
-#define CONFIG_SYS_FLASH_BASE		0x00000000
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(4096)
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(4096)
-#define CONFIG_SYS_FLASH_INCREMENT	0x02000000
-#define PHYS_FLASH_1			0x00000000	/* starts at 0x0 */
-#define PHYS_FLASH_SIZE		0x04000000	/* 64MB */
-#define PHYS_FLASH_SECT_SIZE		0x00040000	/* 256KB Sectors */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
-#define CONFIG_SYS_MAX_FLASH_SECT	260
-#define CONFIG_SYS_FLASH_BANKS_LIST	{ PHYS_FLASH_1 }
-#define CONFIG_SYS_FLASH_EMPTY_INFO	1
-#define CONFIG_SYS_MONITOR_LEN		0x00040000
-#define CONFIG_SYS_MONITOR_BASE	0x00000000
-#define CONFIG_FLASH_SHOW_PROGRESS	1
-
-/* Environment */
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		0x00040000
-#define CONFIG_ENV_OFFSET	0x00040000
-#define CONFIG_ENV_SIZE		0x00040000
-#define CONFIG_ENV_SECT_SIZE	0x00040000
-#define CONFIG_ENV_OVERWRITE	1
-
-/*
-  Monitor -     0x00000000 - 0x00040000 (256kb)
-  Environment - 0x00040000 - 0x00080000 (256kb)
-  Kernel -      0x00080000 - 0x00380000 (3mb)
-  Rootfs -      0x00380000 - 0x........ (rest)
-*/
-
-#define CONFIG_NR_DRAM_BANKS		2
-#define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_INTRAM_BASE		INTERNAL_SRAM_BASE
-#define CONFIG_SYS_INTRAM_SIZE		INTERNAL_SRAM_SIZE
-#define CONFIG_SYS_INIT_SP_ADDR	0x0
-#define PHYS_SDRAM_1			0xc0000000	/* SDRAM Bank #1 */
-#define PHYS_SDRAM_2			0xc4000000	/* SDRAM Bank #2 */
-#define PHYS_SDRAM_1_SIZE		0x04000000	/* 64 MB */
-#define PHYS_SDRAM_2_SIZE		0x04000000	/* 64 MB */
-
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT		"nor0=jornada7xx-0"
-#define MTDPARTS_DEFAULT	"mtdparts=jornada7xx-0:256k(u-boot),256k(env),"\
-		"3m(kernel),-(user);"
-
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
-	"flash_kernel=protect off all; "				\
-	"erase 00080000 0037ffff;cp.b c0000000 00080000 00300000;\0"	\
-	"flash_uboot=protect off all; "					\
-	"erase 00000000 0003ffff;cp.b c0000000 00000000 00040000;\0"	\
-	"boot_kernel=cp.b 00080000 c0000000 00300000;bootm;\0"
-#endif /* __CONFIG_H */

Signature · 1 line

1.7.6

Please dont. I have the patches here, will send them during the week.

Dear Kristoffer Ericson,

Quoted 1 line · In message <20110718112058.GA2596@Boggieman> you wrote:

Please dont. I have the patches here, will send them during the week.

You are late. Board removal has been announced a number of times, several months ago. Why do you wake up only now, after letting me spend the efforts to prepare the removal patches?

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"What the scientists have in their briefcases is terrifying."
- Nikita Khrushchev

As mentioned I'm assuming maintainership for the integratorap, patch is on the list since two days or so.

Le 18/07/2011 00:46, Linus Walleij a ?crit :

Quoted 2 lines

As mentioned I'm assuming maintainership for the integratorap, patch is on the list since two days or so.

Patch 14/52 marked 'deferred' in patchwork pending inclusion of integratorap patches.

Linus, do you see a way to adapt the board(s) you are taking responibility for to using configuration through bopards.cfg, so we can get rid of the split_by_variant.sh stuff?

Quoted 3 lines · Wolfgang Denk

Linus, do you see a way to adapt the board(s) you are taking responibility for to using configuration through bopards.cfg, so we can get rid of the split_by_variant.sh stuff?

I will try, it doesn't look too hard.

The integrator[ap|cp] are special in that any core module (CM) can be plugged onto the actual board itself, so the same board permutes in a number of variants. But I guess I can just give them all unique names like integratorap_cm920t etc and it'll just work, I'll hack something up so we can see what it'll look like.

Thanks,
Linus Walleij

Signed-off-by Wolfgang Denk <[email protected]>

---
 MAKEALL                      |    1 -
 board/mx1fs2/Makefile        |   51 ---
 board/mx1fs2/config.mk       |   10 -
 board/mx1fs2/flash.c         |  849 ------------------------------------------
 board/mx1fs2/intel.h         |   99 -----
 board/mx1fs2/lowlevel_init.S |  188 ----------
 board/mx1fs2/mx1fs2.c        |  122 ------
 boards.cfg                   |    1 -
 doc/README.scrapyard         |    1 +
 include/configs/mx1fs2.h     |  305 ---------------

 10 files changed, 1 insertions(+), 1626 deletions(-)
 delete mode 100644 board/mx1fs2/Makefile
 delete mode 100644 board/mx1fs2/config.mk
 delete mode 100644 board/mx1fs2/flash.c
 delete mode 100644 board/mx1fs2/intel.h
 delete mode 100644 board/mx1fs2/lowlevel_init.S
 delete mode 100644 board/mx1fs2/mx1fs2.c
 delete mode 100644 include/configs/mx1fs2.h

Hello,

a patch for this board is in u-boot-imx already, a patch that changes the maintainer is in u-boot-arm.

Thanks,
Torsten

Hi all,

Le 18/07/2011 10:02, Torsten Koschorrek a ?crit :

Quoted 4 lines

Hello,

a patch for this board is in u-boot-imx already, a patch that changes the maintainer is in u-boot-arm.

Indeed -- note that the bugfix patch was committed to the imx tree after the lst pull request to ARM, so it is not yet pulled in ARM, but will as soon as the new IMX pull req is posted.

Signed-off-by Wolfgang Denk <[email protected]>

Cc Konstantin Kletschke <[email protected]>

---
 MAINTAINERS                   |    3 -
 MAKEALL                       |    1 -
 board/scb9328/Makefile        |   51 ------
 board/scb9328/config.mk       |   10 --
 board/scb9328/flash.c         |  324 --------------------------------------
 board/scb9328/intel.h         |   99 ------------
 board/scb9328/lowlevel_init.S |  203 ------------------------
 board/scb9328/scb9328.c       |   80 ----------
 boards.cfg                    |    1 -
 doc/README.scrapyard          |    1 +
 include/configs/scb9328.h     |  342 -----------------------------------------

 11 files changed, 1 insertions(+), 1114 deletions(-)
 delete mode 100644 board/scb9328/Makefile
 delete mode 100644 board/scb9328/config.mk
 delete mode 100644 board/scb9328/flash.c
 delete mode 100644 board/scb9328/intel.h
 delete mode 100644 board/scb9328/lowlevel_init.S
 delete mode 100644 board/scb9328/scb9328.c
 delete mode 100644 include/configs/scb9328.h

NAK. The patch to fix this board was already sent and it was repost last week because I asked for some changes. I merged it into u-boot-imx and it is ready for the next pull request.

Remove spear300, spear310, spear320, and spear600 boards.

Signed-off-by Wolfgang Denk <[email protected]>

---

?MAINTAINERS ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?7 -
?MAKEALL ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?4 -
?board/spear/common/Makefile ? ? ? ? ? ?| ? 54 ------
?board/spear/common/spr_lowlevel_init.S | ?195 ---------------------
?board/spear/common/spr_misc.c ? ? ? ? ?| ?293 --------------------------------
?board/spear/spear300/Makefile ? ? ? ? ?| ? 51 ------
?board/spear/spear300/config.mk ? ? ? ? | ? 39 -----
?board/spear/spear300/spear300.c ? ? ? ?| ? 58 -------
?board/spear/spear310/Makefile ? ? ? ? ?| ? 51 ------
?board/spear/spear310/config.mk ? ? ? ? | ? 44 -----
?board/spear/spear310/spear310.c ? ? ? ?| ? 59 -------
?board/spear/spear320/Makefile ? ? ? ? ?| ? 51 ------
?board/spear/spear320/config.mk ? ? ? ? | ? 44 -----
?board/spear/spear320/spear320.c ? ? ? ?| ? 59 -------
?board/spear/spear600/Makefile ? ? ? ? ?| ? 51 ------
?board/spear/spear600/config.mk ? ? ? ? | ? 39 -----
?board/spear/spear600/spear600.c ? ? ? ?| ? 53 ------
?doc/README.scrapyard ? ? ? ? ? ? ? ? ? | ? ?4 +
?include/configs/spear-common.h ? ? ? ? | ?212 -----------------------
?include/configs/spear3xx.h ? ? ? ? ? ? | ?131 --------------
?include/configs/spear6xx.h ? ? ? ? ? ? | ? 43 -----

?21 files changed, 4 insertions(+), 1538 deletions(-) ?delete mode 100644 board/spear/common/Makefile ?delete mode 100644 board/spear/common/spr_lowlevel_init.S ?delete mode 100644 board/spear/common/spr_misc.c ?delete mode 100644 board/spear/spear300/Makefile ?delete mode 100644 board/spear/spear300/config.mk ?delete mode 100644 board/spear/spear300/spear300.c ?delete mode 100644 board/spear/spear310/Makefile ?delete mode 100644 board/spear/spear310/config.mk ?delete mode 100644 board/spear/spear310/spear310.c ?delete mode 100644 board/spear/spear320/Makefile ?delete mode 100644 board/spear/spear320/config.mk ?delete mode 100644 board/spear/spear320/spear320.c ?delete mode 100644 board/spear/spear600/Makefile ?delete mode 100644 board/spear/spear600/config.mk ?delete mode 100644 board/spear/spear600/spear600.c ?delete mode 100644 include/configs/spear-common.h ?delete mode 100644 include/configs/spear3xx.h ?delete mode 100644 include/configs/spear6xx.h

MAINTAINERS +0 -0

index 82281b0..3f63dc0 100644
@@ -699,13 +699,6 @@ Prakash Kumar <[email protected]>
 

? ? ? ?cerf250 ? ? ? ? xscale/pxa

MAINTAINERS +0 -7

-Vipin Kumar <[email protected]>
-
- ? ? ? spear300 ? ? ? ?ARM926EJS (spear300 Soc)
- ? ? ? spear310 ? ? ? ?ARM926EJS (spear310 Soc)
- ? ? ? spear320 ? ? ? ?ARM926EJS (spear320 Soc)
- ? ? ? spear600 ? ? ? ?ARM926EJS (spear600 Soc)
-

?Sergey Lapin <[email protected]>

? ? ? ?afeb9260 ? ? ? ?ARM926EJS (AT91SAM9260 SoC)

MAKEALL +0 -4

index 788c5b6..8071fbd 100755
@@ -329,10 +329,6 @@ LIST_ARM9=" ? ? ? ? ? ? ? ? ? ? ? ?\
 ? ? ? ?rd6281a ? ? ? ? ? ? ? ? \
 ? ? ? ?sheevaplug ? ? ? ? ? ? ?\
 ? ? ? ?smdk2410 ? ? ? ? ? ? ? ?\
- ? ? ? spear300 ? ? ? ? ? ? ? ?\
- ? ? ? spear310 ? ? ? ? ? ? ? ?\
- ? ? ? spear320 ? ? ? ? ? ? ? ?\
- ? ? ? spear600 ? ? ? ? ? ? ? ?\
 ? ? ? ?VCMA9 ? ? ? ? ? ? ? ? ? \
 ? ? ? ?versatile ? ? ? ? ? ? ? \
 ? ? ? ?versatileab ? ? ? ? ? ? \

board/spear/common/Makefile deleted +0 -54

deleted file mode 100644
index e0df6c1..0000000
@@ -1,54 +0,0 @@
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, wd at 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).o
-
-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)
- ? ? ? $(call cmd_link_o_target, $(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
-
-#########################################################################

board/spear/common/spr_lowlevel_init.S deleted +0 -195

deleted file mode 100644
index 6fbe579..0000000
@@ -1,195 +0,0 @@
-/*
- * (C) Copyright 2006
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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

board/spear/common/spr_misc.c deleted +0 -293

deleted file mode 100644
index 0562222..0000000
@@ -1,293 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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_emi.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)
-{
-#if defined(CONFIG_CMD_NET)
- ? ? ? uchar mac_id[6];
-
- ? ? ? if (!eth_getenv_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id))
- ? ? ? ? ? ? ? eth_setenv_enetaddr("ethaddr", mac_id);
-#endif
- ? ? ? setenv("verify", "n");
-
-#if defined(CONFIG_SPEAR_USBTTY)
- ? ? ? setenv("stdin", "usbtty");
- ? ? ? setenv("stdout", "usbtty");
- ? ? ? setenv("stderr", "usbtty");
-#endif
- ? ? ? return 0;
-}
-
-#ifdef CONFIG_SPEAR_EMI
-struct cust_emi_para {
- ? ? ? unsigned int tap;
- ? ? ? unsigned int tsdp;
- ? ? ? unsigned int tdpw;
- ? ? ? unsigned int tdpr;
- ? ? ? unsigned int tdcs;
-};
-
-/* EMI timing setting of m28w640hc of linux kernel */
-const struct cust_emi_para emi_timing_m28w640hc = {
- ? ? ? .tap = 0x10,
- ? ? ? .tsdp = 0x05,
- ? ? ? .tdpw = 0x0a,
- ? ? ? .tdpr = 0x0a,
- ? ? ? .tdcs = 0x05,
-};
-
-/* EMI timing setting of bootrom */
-const struct cust_emi_para emi_timing_bootrom = {
- ? ? ? .tap = 0xf,
- ? ? ? .tsdp = 0x0,
- ? ? ? .tdpw = 0xff,
- ? ? ? .tdpr = 0x111,
- ? ? ? .tdcs = 0x02,
-};
-
-void spear_emi_init(void)
-{
- ? ? ? const struct cust_emi_para *p = &emi_timing_m28w640hc;
- ? ? ? struct emi_regs *emi_regs_p = (struct emi_regs *)CONFIG_SPEAR_EMIBASE;
- ? ? ? unsigned int cs;
- ? ? ? unsigned int val, tmp;
-
- ? ? ? val = readl(CONFIG_SPEAR_RASBASE);
-
- ? ? ? if (val & EMI_ACKMSK)
- ? ? ? ? ? ? ? tmp = 0x3f;
- ? ? ? else
- ? ? ? ? ? ? ? tmp = 0x0;
-
- ? ? ? writel(tmp, &emi_regs_p->ack);
-
- ? ? ? for (cs = 0; cs < CONFIG_SYS_MAX_FLASH_BANKS; cs++) {
- ? ? ? ? ? ? ? writel(p->tap, &emi_regs_p->bank_regs[cs].tap);
- ? ? ? ? ? ? ? writel(p->tsdp, &emi_regs_p->bank_regs[cs].tsdp);
- ? ? ? ? ? ? ? writel(p->tdpw, &emi_regs_p->bank_regs[cs].tdpw);
- ? ? ? ? ? ? ? writel(p->tdpr, &emi_regs_p->bank_regs[cs].tdpr);
- ? ? ? ? ? ? ? writel(p->tdcs, &emi_regs_p->bank_regs[cs].tdcs);
- ? ? ? ? ? ? ? writel(EMI_CNTL_ENBBYTERW | ((val & 0x18) >> 3),
- ? ? ? ? ? ? ? ? ? ? ?&emi_regs_p->bank_regs[cs].control);
- ? ? ? }
-}
-#endif
-
-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));
- ? ? ? }
-
-#ifdef CONFIG_SPEAR_EMI
- ? ? ? spear_emi_init();
-#endif
- ? ? ? return 0;
-}
-
-static int i2c_read_mac(uchar *buffer)
-{
- ? ? ? u8 buf[2];
-
- ? ? ? i2c_read(CONFIG_I2C_CHIPADDRESS, MAGIC_OFF, 1, buf, MAGIC_LEN);
-
- ? ? ? /* Check if mac in i2c memory is valid */
- ? ? ? if ((buf[0] == MAGIC_BYTE0) && (buf[1] == MAGIC_BYTE1)) {
- ? ? ? ? ? ? ? /* Valid mac address is saved in i2c eeprom */
- ? ? ? ? ? ? ? i2c_read(CONFIG_I2C_CHIPADDRESS, MAC_OFF, 1, buffer, MAC_LEN);
- ? ? ? ? ? ? ? return 0;
- ? ? ? }
-
- ? ? ? return -1;
-}
-
-static int write_mac(uchar *mac)
-{
- ? ? ? u8 buf[2];
-
- ? ? ? buf[0] = (u8)MAGIC_BYTE0;
- ? ? ? buf[1] = (u8)MAGIC_BYTE1;
- ? ? ? i2c_write(CONFIG_I2C_CHIPADDRESS, MAGIC_OFF, 1, buf, MAGIC_LEN);
-
- ? ? ? buf[0] = (u8)~MAGIC_BYTE0;
- ? ? ? buf[1] = (u8)~MAGIC_BYTE1;
-
- ? ? ? i2c_read(CONFIG_I2C_CHIPADDRESS, MAGIC_OFF, 1, buf, MAGIC_LEN);
-
- ? ? ? /* check if valid MAC address is saved in I2C EEPROM or not? */
- ? ? ? if ((buf[0] == MAGIC_BYTE0) && (buf[1] == MAGIC_BYTE1)) {
- ? ? ? ? ? ? ? i2c_write(CONFIG_I2C_CHIPADDRESS, MAC_OFF, 1, mac, MAC_LEN);
- ? ? ? ? ? ? ? puts("I2C EEPROM written with mac address \n");
- ? ? ? ? ? ? ? return 0;
- ? ? ? }
-
- ? ? ? puts("I2C EEPROM writing failed \n");
- ? ? ? return -1;
-}
-
-int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- ? ? ? void (*sram_setfreq) (unsigned int, unsigned int);
- ? ? ? struct chip_data *chip = &chip_data;
- ? ? ? unsigned char mac[6];
- ? ? ? unsigned int reg, frequency;
- ? ? ? char *s, *e;
- ? ? ? char i2c_mac[20];
-
- ? ? ? if ((argc > 3) || (argc < 2))
- ? ? ? ? ? ? ? return cmd_usage(cmdtp);
-
- ? ? ? 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], "ethaddr")) {
-
- ? ? ? ? ? ? ? s = argv[2];
- ? ? ? ? ? ? ? for (reg = 0; reg < 6; ++reg) {
- ? ? ? ? ? ? ? ? ? ? ? mac[reg] = s ? simple_strtoul(s, &e, 16) : 0;
- ? ? ? ? ? ? ? ? ? ? ? if (s)
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? s = (*e) ? e + 1 : e;
- ? ? ? ? ? ? ? }
- ? ? ? ? ? ? ? write_mac(mac);
-
- ? ? ? ? ? ? ? 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");
-
- ? ? ? ? ? ? ? if (!i2c_read_mac(mac)) {
- ? ? ? ? ? ? ? ? ? ? ? sprintf(i2c_mac, "%pM", mac);
- ? ? ? ? ? ? ? ? ? ? ? printf("Ethaddr (from i2c mem) = %s\n", i2c_mac);
- ? ? ? ? ? ? ? } else {
- ? ? ? ? ? ? ? ? ? ? ? printf("Ethaddr (from i2c mem) = Not set\n");
- ? ? ? ? ? ? ? }
-
- ? ? ? ? ? ? ? printf("Xloader Rev = %s\n", chip->version);
-
- ? ? ? ? ? ? ? return 0;
- ? ? ? }
-
- ? ? ? return cmd_usage(cmdtp);
-}
-
-U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
- ? ? ? ? ?"configure chip",
- ? ? ? ? ?"chip_config cpufreq/ddrfreq frequency\n"
- ? ? ? ? ?"chip_config print");

board/spear/spear300/Makefile deleted +0 -51

deleted file mode 100644
index b9b0fed..0000000
@@ -1,51 +0,0 @@
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd at 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).o
-
-COBJS ?:= spear300.o
-SOBJS ?:=
-
-SRCS ? := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS ? := $(addprefix $(obj),$(COBJS))
-SOBJS ?:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB): ? ? ? ?$(obj).depend $(OBJS) $(SOBJS)
- ? ? ? $(call cmd_link_o_target, $(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
-
-#########################################################################

board/spear/spear300/config.mk deleted +0 -39

deleted file mode 100644
index 11da2c3..0000000
@@ -1,39 +0,0 @@
-#
-# (C) Copyright 2009
-# Vipin Kumar, ST Microelectronics <[email protected]>
-#
-# 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
-#
-
-#########################################################################
-
-CONFIG_SYS_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

board/spear/spear300/spear300.c deleted +0 -58

deleted file mode 100644
index 60ee544..0000000
@@ -1,58 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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_SPEAR300);
-}
-
-/*
- * 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_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG30) ||
- ? ? ? ? ? ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG31)) {
-
- ? ? ? ? ? ? ? return spear_nand_init(nand);
- ? ? ? }
-
- ? ? ? return -1;
-}

board/spear/spear310/Makefile deleted +0 -51

deleted file mode 100644
index 6dce093..0000000
@@ -1,51 +0,0 @@
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd at 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).o
-
-COBJS ?:= spear310.o
-SOBJS ?:=
-
-SRCS ? := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS ? := $(addprefix $(obj),$(COBJS))
-SOBJS ?:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB): ? ? ? ?$(obj).depend $(OBJS) $(SOBJS)
- ? ? ? $(call cmd_link_o_target, $(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
-
-#########################################################################

board/spear/spear310/config.mk deleted +0 -44

deleted file mode 100644
index 2b59c39..0000000
@@ -1,44 +0,0 @@
-#
-# (C) Copyright 2009
-# Vipin Kumar, ST Microelectronics <[email protected]>
-#
-# 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
-#
-
-#########################################################################
-
-CONFIG_SYS_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
-
-# Support parallel flash
-ifeq ($(FLASH),PNOR)
-PLATFORM_RELFLAGS += -DCONFIG_FLASH_PNOR
-endif
-
-ifeq ($(CONSOLE),USB)
-PLATFORM_RELFLAGS += -DCONFIG_SPEAR_USBTTY
-endif

board/spear/spear310/spear310.c deleted +0 -59

deleted file mode 100644
index 03dfe16..0000000
@@ -1,59 +0,0 @@
-/*
- * (C) Copyright 2009
- * Ryan Chen, ST Micoelectronics, ryan.chen at st.com.
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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_SPEAR310);
-}
-
-/*
- * 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_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG30) ||
- ? ? ? ? ? ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG31)) {
-
- ? ? ? ? ? ? ? return spear_nand_init(nand);
- ? ? ? }
-
- ? ? ? return -1;
-}

board/spear/spear320/Makefile deleted +0 -51

deleted file mode 100644
index f6bd7dd..0000000
@@ -1,51 +0,0 @@
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd at 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).o
-
-COBJS ?:= spear320.o
-SOBJS ?:=
-
-SRCS ? := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS ? := $(addprefix $(obj),$(COBJS))
-SOBJS ?:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB): ? ? ? ?$(obj).depend $(OBJS) $(SOBJS)
- ? ? ? $(call cmd_link_o_target, $(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
-
-#########################################################################

board/spear/spear320/config.mk deleted +0 -44

deleted file mode 100644
index 2b59c39..0000000
@@ -1,44 +0,0 @@
-#
-# (C) Copyright 2009
-# Vipin Kumar, ST Microelectronics <[email protected]>
-#
-# 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
-#
-
-#########################################################################
-
-CONFIG_SYS_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
-
-# Support parallel flash
-ifeq ($(FLASH),PNOR)
-PLATFORM_RELFLAGS += -DCONFIG_FLASH_PNOR
-endif
-
-ifeq ($(CONSOLE),USB)
-PLATFORM_RELFLAGS += -DCONFIG_SPEAR_USBTTY
-endif

board/spear/spear320/spear320.c deleted +0 -59

deleted file mode 100644
index 2ba2dbb..0000000
@@ -1,59 +0,0 @@
-/*
- * (C) Copyright 2009
- * Ryan Chen, ST Micoelectronics, ryan.chen at st.com.
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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_SPEAR320);
-}
-
-/*
- * 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_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG30) ||
- ? ? ? ? ? ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
- ? ? ? ? ? ?MISC_SOCCFG31)) {
-
- ? ? ? ? ? ? ? return spear_nand_init(nand);
- ? ? ? }
-
- ? ? ? return -1;
-}

board/spear/spear600/Makefile deleted +0 -51

deleted file mode 100644
index 6b643bf..0000000
@@ -1,51 +0,0 @@
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd at 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).o
-
-COBJS ?:= spear600.o
-SOBJS ?:=
-
-SRCS ? := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS ? := $(addprefix $(obj),$(COBJS))
-SOBJS ?:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB): ? ? ? ?$(obj).depend $(OBJS) $(SOBJS)
- ? ? ? $(call cmd_link_o_target, $(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
-
-#########################################################################

board/spear/spear600/config.mk deleted +0 -39

deleted file mode 100644
index 11da2c3..0000000
@@ -1,39 +0,0 @@
-#
-# (C) Copyright 2009
-# Vipin Kumar, ST Microelectronics <[email protected]>
-#
-# 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
-#
-
-#########################################################################
-
-CONFIG_SYS_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

board/spear/spear600/spear600.c deleted +0 -53

deleted file mode 100644
index eef9a37..0000000
@@ -1,53 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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;
-}

doc/README.scrapyard +0 -0

index b147fb6..cea1e3b 100644
@@ -11,6 +11,10 @@ easily if here is something they might want to dig for...
 

?Board ?Arch ? ?CPU ? ? removed ? ? Commit ? ? ?last known maintainer/contact ?=============================================================================

doc/README.scrapyard +4 -0

+spear300 arm ? ARM926EJS - ? ? ? 2011-07-17 ? ?Vipin Kumar <[email protected]>
+spear310 arm ? ARM926EJS - ? ? ? 2011-07-17 ? ?Vipin Kumar <[email protected]>
+spear320 arm ? ARM926EJS - ? ? ? 2011-07-17 ? ?Vipin Kumar <[email protected]>
+spear600 arm ? ARM926EJS - ? ? ? 2011-07-17 ? ?Vipin Kumar <[email protected]>

?smdk2400 arm ? arm920t - ? ? ? ? 2011-07-17 ? ?Gary Jennejohn <[email protected]>
?scb9328 ? ? ? ?arm ? ? arm920t - ? ? ? ? 2011-07-17 ? ?Konstantin Kletschke <[email protected]> ?sbc2410x arm ? arm920t - ? ? ? ? 2011-07-17

include/configs/spear-common.h deleted +0 -212

deleted file mode 100644
index 4e5bdea..0000000
@@ -1,212 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, STMicroelectronics, <[email protected]>
- *
- * 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_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

include/configs/spear3xx.h deleted +0 -131

deleted file mode 100644
index 37bdebb..0000000
@@ -1,131 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, STMicroelectronics, <[email protected]>
- *
- * 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)
- */
-#if defined(CONFIG_spear300)
-#define CONFIG_SPEAR3XX ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#define CONFIG_SPEAR300 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#elif defined(CONFIG_spear310)
-#define CONFIG_SPEAR3XX ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#define CONFIG_SPEAR310 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#elif defined(CONFIG_spear320)
-#define CONFIG_SPEAR3XX ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#define CONFIG_SPEAR320 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?1
-#endif
-
-#include <configs/spear-common.h>
-
-/* Serial Configuration (PL011) */
-#define CONFIG_SYS_SERIAL0 ? ? ? ? ? ? ? ? ? ? 0xD0000000
-
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_PL01x_PORTS ? ? ? ? ? ? ? ? ? ? {(void *)CONFIG_SYS_SERIAL0}
-
-#elif defined(CONFIG_SPEAR310)
-
-#if (CONFIG_CONS_INDEX)
-#undef ?CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK ? ? ? ? ? ? ? ? ? ? (83 * 1000 * 1000)
-#endif
-
-#define CONFIG_SYS_SERIAL1 ? ? ? ? ? ? ? ? ? ? 0xB2000000
-#define CONFIG_SYS_SERIAL2 ? ? ? ? ? ? ? ? ? ? 0xB2080000
-#define CONFIG_SYS_SERIAL3 ? ? ? ? ? ? ? ? ? ? 0xB2100000
-#define CONFIG_SYS_SERIAL4 ? ? ? ? ? ? ? ? ? ? 0xB2180000
-#define CONFIG_SYS_SERIAL5 ? ? ? ? ? ? ? ? ? ? 0xB2200000
-#define CONFIG_PL01x_PORTS ? ? ? ? ? ? ? ? ? ? {(void *)CONFIG_SYS_SERIAL0, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL1, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL2, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL3, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL4, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL5 }
-#elif defined(CONFIG_SPEAR320)
-
-#if (CONFIG_CONS_INDEX)
-#undef ?CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK ? ? ? ? ? ? ? ? ? ? (83 * 1000 * 1000)
-#endif
-
-#define CONFIG_SYS_SERIAL1 ? ? ? ? ? ? ? ? ? ? 0xA3000000
-#define CONFIG_SYS_SERIAL2 ? ? ? ? ? ? ? ? ? ? 0xA4000000
-#define CONFIG_PL01x_PORTS ? ? ? ? ? ? ? ? ? ? {(void *)CONFIG_SYS_SERIAL0, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL1, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (void *)CONFIG_SYS_SERIAL2 }
-#endif
-
-#if defined(CONFIG_SPEAR_EMI)
-
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-
-#if defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_FLASH_BASE ? ? ? ? ? ? ? ? ?0x50000000
-#define CONFIG_SYS_CS1_FLASH_BASE ? ? ? ? ? ? ?0x60000000
-#define CONFIG_SYS_CS2_FLASH_BASE ? ? ? ? ? ? ?0x70000000
-#define CONFIG_SYS_CS3_FLASH_BASE ? ? ? ? ? ? ?0x80000000
-#define CONFIG_SYS_CS4_FLASH_BASE ? ? ? ? ? ? ?0x90000000
-#define CONFIG_SYS_CS5_FLASH_BASE ? ? ? ? ? ? ?0xA0000000
-#define CONFIG_SYS_FLASH_BANKS_LIST ? ? ? ? ? ?{ CONFIG_SYS_FLASH_BASE, ? \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS1_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS2_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS3_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS4_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS5_FLASH_BASE }
-#define CONFIG_SYS_MAX_FLASH_BANKS ? ? ? ? ? ? 6
-
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_FLASH_BASE ? ? ? ? ? ? ? ? ?0x44000000
-#define CONFIG_SYS_CS1_FLASH_BASE ? ? ? ? ? ? ?0x45000000
-#define CONFIG_SYS_CS2_FLASH_BASE ? ? ? ? ? ? ?0x46000000
-#define CONFIG_SYS_CS3_FLASH_BASE ? ? ? ? ? ? ?0x47000000
-#define CONFIG_SYS_FLASH_BANKS_LIST ? ? ? ? ? ?{ CONFIG_SYS_FLASH_BASE, ? \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS1_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS2_FLASH_BASE, \
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_CS3_FLASH_BASE }
-#define CONFIG_SYS_MAX_FLASH_BANKS ? ? ? ? ? ? 4
-
-#endif
-
-#define CONFIG_SYS_MAX_FLASH_SECT ? ? ? ? ? ? ?(127 + 8)
-#define CONFIG_SYS_FLASH_QUIET_TEST ? ? ? ? ? ?1
-
-#endif
-
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_NAND_BASE ? ? ? ? ? ? ? ? ? (0x80000000)
-
-#elif defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_NAND_BASE ? ? ? ? ? ? ? ? ? (0x40000000)
-
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_NAND_BASE ? ? ? ? ? ? ? ? ? (0x50000000)
-
-#endif
-
-#endif ?/* __CONFIG_H */

include/configs/spear6xx.h deleted +0 -44

deleted file mode 100644
index 2ad5beb..0000000
@@ -1,43 +0,0 @@
-/*
- * (C) Copyright 2009
- * Vipin Kumar, STMicroelectronics, <[email protected]>
- *
- * 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 */
--

1.7.6

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot