Patchwork [U-Boot,35/52] ARM: remove broken "spearXXX" boards

login
register
mail settings
Submitter Wolfgang Denk
Date July 17, 2011, 10:17 p.m.
Message ID <1310941040-6526-36-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/105119/
State Not Applicable
Delegated to: Albert ARIBAUD
Headers show

Comments

Wolfgang Denk - July 17, 2011, 10:17 p.m.
Remove spear300, spear310, spear320, and spear600 boards.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 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
Vipin Kumar - July 19, 2011, 11:06 a.m.
Dear Wolfgang,

There is a patch which was floated to make these boards compilable
We are infact planning to enhance this support also add more platforms
in near future

The reference to the relevant patch is below

http://lists.denx.de/pipermail/u-boot/2011-June/094300.html

Regards
Vipin

On Mon, Jul 18, 2011 at 3:47 AM, Wolfgang Denk <wd@denx.de> wrote:
> Remove spear300, spear310, spear320, and spear600 boards.
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  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
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 82281b0..3f63dc0 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -699,13 +699,6 @@ Prakash Kumar <prakash@embedx.com>
>
>        cerf250         xscale/pxa
>
> -Vipin Kumar <vipin.kumar@st.com>
> -
> -       spear300        ARM926EJS (spear300 Soc)
> -       spear310        ARM926EJS (spear310 Soc)
> -       spear320        ARM926EJS (spear320 Soc)
> -       spear600        ARM926EJS (spear600 Soc)
> -
>  Sergey Lapin <slapin@ossfans.org>
>
>        afeb9260        ARM926EJS (AT91SAM9260 SoC)
> diff --git a/MAKEALL b/MAKEALL
> index 788c5b6..8071fbd 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -329,10 +329,6 @@ LIST_ARM9="                        \
>        rd6281a                 \
>        sheevaplug              \
>        smdk2410                \
> -       spear300                \
> -       spear310                \
> -       spear320                \
> -       spear600                \
>        VCMA9                   \
>        versatile               \
>        versatileab             \
> diff --git a/board/spear/common/Makefile b/board/spear/common/Makefile
> deleted file mode 100644
> index e0df6c1..0000000
> --- a/board/spear/common/Makefile
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -#
> -# (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).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
> -
> -#########################################################################
> diff --git a/board/spear/common/spr_lowlevel_init.S b/board/spear/common/spr_lowlevel_init.S
> deleted file mode 100644
> index 6fbe579..0000000
> --- a/board/spear/common/spr_lowlevel_init.S
> +++ /dev/null
> @@ -1,195 +0,0 @@
> -/*
> - * (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
> diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
> deleted file mode 100644
> index 0562222..0000000
> --- a/board/spear/common/spr_misc.c
> +++ /dev/null
> @@ -1,293 +0,0 @@
> -/*
> - * (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_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");
> diff --git a/board/spear/spear300/Makefile b/board/spear/spear300/Makefile
> deleted file mode 100644
> index b9b0fed..0000000
> --- a/board/spear/spear300/Makefile
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -#
> -# (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).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
> -
> -#########################################################################
> diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
> deleted file mode 100644
> index 11da2c3..0000000
> --- a/board/spear/spear300/config.mk
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -#
> -# (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
> -#
> -
> -#########################################################################
> -
> -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
> diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
> deleted file mode 100644
> index 60ee544..0000000
> --- a/board/spear/spear300/spear300.c
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -/*
> - * (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_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;
> -}
> diff --git a/board/spear/spear310/Makefile b/board/spear/spear310/Makefile
> deleted file mode 100644
> index 6dce093..0000000
> --- a/board/spear/spear310/Makefile
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -#
> -# (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).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
> -
> -#########################################################################
> diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
> deleted file mode 100644
> index 2b59c39..0000000
> --- a/board/spear/spear310/config.mk
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -#
> -# (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
> -#
> -
> -#########################################################################
> -
> -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
> diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
> deleted file mode 100644
> index 03dfe16..0000000
> --- a/board/spear/spear310/spear310.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/*
> - * (C) Copyright 2009
> - * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
> - * 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_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;
> -}
> diff --git a/board/spear/spear320/Makefile b/board/spear/spear320/Makefile
> deleted file mode 100644
> index f6bd7dd..0000000
> --- a/board/spear/spear320/Makefile
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -#
> -# (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).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
> -
> -#########################################################################
> diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk
> deleted file mode 100644
> index 2b59c39..0000000
> --- a/board/spear/spear320/config.mk
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -#
> -# (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
> -#
> -
> -#########################################################################
> -
> -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
> diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
> deleted file mode 100644
> index 2ba2dbb..0000000
> --- a/board/spear/spear320/spear320.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/*
> - * (C) Copyright 2009
> - * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
> - * 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_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;
> -}
> diff --git a/board/spear/spear600/Makefile b/board/spear/spear600/Makefile
> deleted file mode 100644
> index 6b643bf..0000000
> --- a/board/spear/spear600/Makefile
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -#
> -# (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).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
> -
> -#########################################################################
> diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk
> deleted file mode 100644
> index 11da2c3..0000000
> --- a/board/spear/spear600/config.mk
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -#
> -# (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
> -#
> -
> -#########################################################################
> -
> -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
> diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
> deleted file mode 100644
> index eef9a37..0000000
> --- a/board/spear/spear600/spear600.c
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -/*
> - * (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;
> -}
> diff --git a/doc/README.scrapyard b/doc/README.scrapyard
> index b147fb6..cea1e3b 100644
> --- a/doc/README.scrapyard
> +++ b/doc/README.scrapyard
> @@ -11,6 +11,10 @@ easily if here is something they might want to dig for...
>
>  Board  Arch    CPU     removed     Commit      last known maintainer/contact
>  =============================================================================
> +spear300 arm   ARM926EJS -       2011-07-17    Vipin Kumar <vipin.kumar@st.com>
> +spear310 arm   ARM926EJS -       2011-07-17    Vipin Kumar <vipin.kumar@st.com>
> +spear320 arm   ARM926EJS -       2011-07-17    Vipin Kumar <vipin.kumar@st.com>
> +spear600 arm   ARM926EJS -       2011-07-17    Vipin Kumar <vipin.kumar@st.com>
>  smdk2400 arm   arm920t -         2011-07-17    Gary Jennejohn <garyj@denx.de>
>  scb9328        arm     arm920t -         2011-07-17    Konstantin Kletschke <kletschke@synertronixx.de>
>  sbc2410x arm   arm920t -         2011-07-17
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> deleted file mode 100644
> index 4e5bdea..0000000
> --- a/include/configs/spear-common.h
> +++ /dev/null
> @@ -1,212 +0,0 @@
> -/*
> - * (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_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
> diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
> deleted file mode 100644
> index 37bdebb..0000000
> --- a/include/configs/spear3xx.h
> +++ /dev/null
> @@ -1,131 +0,0 @@
> -/*
> - * (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)
> - */
> -#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 */
> diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h
> deleted file mode 100644
> index 2ad5beb..0000000
> --- a/include/configs/spear6xx.h
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -/*
> - * (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 */
> --
> 1.7.6
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 82281b0..3f63dc0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -699,13 +699,6 @@  Prakash Kumar <prakash@embedx.com>
 
 	cerf250		xscale/pxa
 
-Vipin Kumar <vipin.kumar@st.com>
-
-	spear300	ARM926EJS (spear300 Soc)
-	spear310	ARM926EJS (spear310 Soc)
-	spear320	ARM926EJS (spear320 Soc)
-	spear600	ARM926EJS (spear600 Soc)
-
 Sergey Lapin <slapin@ossfans.org>
 
 	afeb9260	ARM926EJS (AT91SAM9260 SoC)
diff --git a/MAKEALL b/MAKEALL
index 788c5b6..8071fbd 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -329,10 +329,6 @@  LIST_ARM9="			\
 	rd6281a			\
 	sheevaplug		\
 	smdk2410		\
-	spear300		\
-	spear310		\
-	spear320		\
-	spear600		\
 	VCMA9			\
 	versatile		\
 	versatileab		\
diff --git a/board/spear/common/Makefile b/board/spear/common/Makefile
deleted file mode 100644
index e0df6c1..0000000
--- a/board/spear/common/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@ 
-#
-# (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).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
-
-#########################################################################
diff --git a/board/spear/common/spr_lowlevel_init.S b/board/spear/common/spr_lowlevel_init.S
deleted file mode 100644
index 6fbe579..0000000
--- a/board/spear/common/spr_lowlevel_init.S
+++ /dev/null
@@ -1,195 +0,0 @@ 
-/*
- * (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
diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
deleted file mode 100644
index 0562222..0000000
--- a/board/spear/common/spr_misc.c
+++ /dev/null
@@ -1,293 +0,0 @@ 
-/*
- * (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_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");
diff --git a/board/spear/spear300/Makefile b/board/spear/spear300/Makefile
deleted file mode 100644
index b9b0fed..0000000
--- a/board/spear/spear300/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (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).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
-
-#########################################################################
diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
deleted file mode 100644
index 11da2c3..0000000
--- a/board/spear/spear300/config.mk
+++ /dev/null
@@ -1,39 +0,0 @@ 
-#
-# (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
-#
-
-#########################################################################
-
-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
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
deleted file mode 100644
index 60ee544..0000000
--- a/board/spear/spear300/spear300.c
+++ /dev/null
@@ -1,58 +0,0 @@ 
-/*
- * (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_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;
-}
diff --git a/board/spear/spear310/Makefile b/board/spear/spear310/Makefile
deleted file mode 100644
index 6dce093..0000000
--- a/board/spear/spear310/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (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).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
-
-#########################################################################
diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
deleted file mode 100644
index 2b59c39..0000000
--- a/board/spear/spear310/config.mk
+++ /dev/null
@@ -1,44 +0,0 @@ 
-#
-# (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
-#
-
-#########################################################################
-
-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
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
deleted file mode 100644
index 03dfe16..0000000
--- a/board/spear/spear310/spear310.c
+++ /dev/null
@@ -1,59 +0,0 @@ 
-/*
- * (C) Copyright 2009
- * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
- * 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_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;
-}
diff --git a/board/spear/spear320/Makefile b/board/spear/spear320/Makefile
deleted file mode 100644
index f6bd7dd..0000000
--- a/board/spear/spear320/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (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).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
-
-#########################################################################
diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk
deleted file mode 100644
index 2b59c39..0000000
--- a/board/spear/spear320/config.mk
+++ /dev/null
@@ -1,44 +0,0 @@ 
-#
-# (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
-#
-
-#########################################################################
-
-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
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
deleted file mode 100644
index 2ba2dbb..0000000
--- a/board/spear/spear320/spear320.c
+++ /dev/null
@@ -1,59 +0,0 @@ 
-/*
- * (C) Copyright 2009
- * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
- * 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_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;
-}
diff --git a/board/spear/spear600/Makefile b/board/spear/spear600/Makefile
deleted file mode 100644
index 6b643bf..0000000
--- a/board/spear/spear600/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (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).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
-
-#########################################################################
diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk
deleted file mode 100644
index 11da2c3..0000000
--- a/board/spear/spear600/config.mk
+++ /dev/null
@@ -1,39 +0,0 @@ 
-#
-# (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
-#
-
-#########################################################################
-
-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
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
deleted file mode 100644
index eef9a37..0000000
--- a/board/spear/spear600/spear600.c
+++ /dev/null
@@ -1,53 +0,0 @@ 
-/*
- * (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;
-}
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index b147fb6..cea1e3b 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,10 @@  easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+spear300 arm	ARM926EJS -	  2011-07-17	Vipin Kumar <vipin.kumar@st.com>
+spear310 arm	ARM926EJS -	  2011-07-17	Vipin Kumar <vipin.kumar@st.com>
+spear320 arm	ARM926EJS -	  2011-07-17	Vipin Kumar <vipin.kumar@st.com>
+spear600 arm	ARM926EJS -	  2011-07-17	Vipin Kumar <vipin.kumar@st.com>
 smdk2400 arm	arm920t	-	  2011-07-17	Gary Jennejohn <garyj@denx.de>
 scb9328	arm	arm920t	-	  2011-07-17	Konstantin Kletschke <kletschke@synertronixx.de>
 sbc2410x arm	arm920t	-	  2011-07-17
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
deleted file mode 100644
index 4e5bdea..0000000
--- a/include/configs/spear-common.h
+++ /dev/null
@@ -1,212 +0,0 @@ 
-/*
- * (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_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
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
deleted file mode 100644
index 37bdebb..0000000
--- a/include/configs/spear3xx.h
+++ /dev/null
@@ -1,131 +0,0 @@ 
-/*
- * (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)
- */
-#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 */
diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h
deleted file mode 100644
index 2ad5beb..0000000
--- a/include/configs/spear6xx.h
+++ /dev/null
@@ -1,43 +0,0 @@ 
-/*
- * (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 */