Patchwork [U-Boot,SPEAr,Fixes,04/11] spear/board: Cleanup spear related board files

login
register
mail settings
Submitter Vipin Kumar
Date Nov. 2, 2012, 5:39 p.m.
Message ID <e9c9732527bb4b1675f6bbee9176ce76d1e43244.1351877185.git.vipin.kumar@st.com>
Download mbox | patch
Permalink /patch/196691/
State New
Delegated to: Vipin Kumar
Headers show

Comments

Vipin Kumar - Nov. 2, 2012, 5:39 p.m.
This patch targets to cleanup the board area for spear. The modifications in
this patch include

- Move spear board files to board/st/spear/
- Place specific init routines in respective macro
   Place board_nand_init and board_eth_init in respective CONFIG_CMD_ macros
- Remove initialization of bi_arch_number
   bi_arch_number gets initialized via CONFIG_MACH_TYPE through the uboot
   framework itself obviating the need of this code
- Remove misc_init_r routine
- Remove routine dram_init_banksize

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
 board/spear/common/Makefile                        | 50 ----------------------
 board/spear/spear300/Makefile                      | 45 -------------------
 board/spear/spear320/Makefile                      | 45 -------------------
 board/spear/x600/Makefile                          | 47 --------------------
 board/{spear/spear600 => st/spear}/Makefile        | 16 ++++++-
 .../spear310/Makefile => st/spear/config.mk}       | 27 ++----------
 .../spear300/spear300.c => st/spear/spear300evb.c} | 12 +++---
 .../spear310/spear310.c => st/spear/spear310evb.c} | 12 +++---
 .../spear320/spear320.c => st/spear/spear320plc.c} | 11 +++--
 .../spear600/spear600.c => st/spear/spear600evb.c} | 13 +++---
 .../common/spr_misc.c => st/spear/spear_common.c}  | 34 ++-------------
 .../spear/spear_lowlevel_init.S}                   |  0
 board/{spear/x600 => st/spear}/x600.c              |  0
 board/{spear/x600/fpga.c => st/spear/x600fpga.c}   |  0
 board/{spear/x600/fpga.h => st/spear/x600fpga.h}   |  0
 boards.cfg                                         | 28 ++++++------
 16 files changed, 61 insertions(+), 279 deletions(-)
 delete mode 100644 board/spear/common/Makefile
 delete mode 100644 board/spear/spear300/Makefile
 delete mode 100644 board/spear/spear320/Makefile
 delete mode 100644 board/spear/x600/Makefile
 rename board/{spear/spear600 => st/spear}/Makefile (76%)
 rename board/{spear/spear310/Makefile => st/spear/config.mk} (56%)
 rename board/{spear/spear300/spear300.c => st/spear/spear300evb.c} (94%)
 rename board/{spear/spear310/spear310.c => st/spear/spear310evb.c} (95%)
 rename board/{spear/spear320/spear320.c => st/spear/spear320plc.c} (95%)
 rename board/{spear/spear600/spear600.c => st/spear/spear600evb.c} (94%)
 rename board/{spear/common/spr_misc.c => st/spear/spear_common.c} (89%)
 rename board/{spear/common/spr_lowlevel_init.S => st/spear/spear_lowlevel_init.S} (100%)
 rename board/{spear/x600 => st/spear}/x600.c (100%)
 rename board/{spear/x600/fpga.c => st/spear/x600fpga.c} (100%)
 rename board/{spear/x600/fpga.h => st/spear/x600fpga.h} (100%)

Patch

diff --git a/board/spear/common/Makefile b/board/spear/common/Makefile
deleted file mode 100644
index 5c66c3f..0000000
--- a/board/spear/common/Makefile
+++ /dev/null
@@ -1,50 +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
-
-ifndef CONFIG_SPL_BUILD
-COBJS	:= spr_misc.o
-SOBJS	:= spr_lowlevel_init.o
-endif
-
-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))
-
-#########################################################################
-# This is for $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/spear/spear300/Makefile b/board/spear/spear300/Makefile
deleted file mode 100644
index aa10749..0000000
--- a/board/spear/spear300/Makefile
+++ /dev/null
@@ -1,45 +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))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/spear/spear320/Makefile b/board/spear/spear320/Makefile
deleted file mode 100644
index 68dd734..0000000
--- a/board/spear/spear320/Makefile
+++ /dev/null
@@ -1,45 +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))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/spear/x600/Makefile b/board/spear/x600/Makefile
deleted file mode 100644
index 8c4e7e2..0000000
--- a/board/spear/x600/Makefile
+++ /dev/null
@@ -1,47 +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
-
-ifndef CONFIG_SPL_BUILD
-COBJS	:= fpga.o $(BOARD).o
-endif
-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))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/spear/spear600/Makefile b/board/st/spear/Makefile
similarity index 76%
rename from board/spear/spear600/Makefile
rename to board/st/spear/Makefile
index ee66fc6..f925c19 100644
--- a/board/spear/spear600/Makefile
+++ b/board/st/spear/Makefile
@@ -25,11 +25,23 @@  include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
+SOBJS-y	:=
+COBJS-y	:=
+
 ifndef CONFIG_SPL_BUILD
-COBJS	:= spear600.o
+SOBJS-y	+= spear_lowlevel_init.o
+COBJS-y	+= spear_common.o
+COBJS-$(CONFIG_MACH_X600) += x600.o
+COBJS-$(CONFIG_MACH_X600) += x600fpga.o
 endif
-SOBJS	:=
 
+COBJS-$(CONFIG_MACH_SPEAR300EVB) += spear300evb.o
+COBJS-$(CONFIG_MACH_SPEAR310EVB) += spear310evb.o
+COBJS-$(CONFIG_MACH_SPEAR320EVB) += spear320plc.o
+COBJS-$(CONFIG_MACH_SPEAR600EVB) += spear600evb.o
+
+COBJS	:= $(sort $(COBJS-y))
+SOBJS	:= $(sort $(SOBJS-y))
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
diff --git a/board/spear/spear310/Makefile b/board/st/spear/config.mk
similarity index 56%
rename from board/spear/spear310/Makefile
rename to board/st/spear/config.mk
index c5b6327..9533c5f 100644
--- a/board/spear/spear310/Makefile
+++ b/board/st/spear/config.mk
@@ -1,6 +1,6 @@ 
 #
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+# Copyright (C) 2012 ST Microelectronics
+# Vipin Kumar <vipin.kumar@st.com>
 #
 # See file CREDITS for list of people who contributed to this
 # project.
@@ -21,25 +21,4 @@ 
 # 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))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+ALL-y += $(obj)u-boot.img
diff --git a/board/spear/spear300/spear300.c b/board/st/spear/spear300evb.c
similarity index 94%
rename from board/spear/spear300/spear300.c
rename to board/st/spear/spear300evb.c
index 27a1697..2c7ccd6 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/st/spear/spear300evb.c
@@ -31,20 +31,17 @@ 
 #include <asm/arch/generic.h>
 #include <asm/arch/misc.h>
 
+#if defined(CONFIG_CMD_NAND)
 static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
+#endif
 
-int board_init(void)
-{
-	return spear_board_init(MACH_TYPE_SPEAR300);
-}
-
+#if defined(CONFIG_CMD_NAND)
 /*
  * board_nand_init - Board specific NAND initialization
  * @nand:	mtd private chip structure
  *
  * Called by nand_init_chip to initialize the board specific functions
  */
-
 void board_nand_init()
 {
 	struct misc_regs *const misc_regs_p =
@@ -62,7 +59,9 @@  void board_nand_init()
 #endif
 	return;
 }
+#endif
 
+#if defined(CONFIG_CMD_NET)
 int board_eth_init(bd_t *bis)
 {
 	int ret = 0;
@@ -75,3 +74,4 @@  int board_eth_init(bd_t *bis)
 #endif
 	return ret;
 }
+#endif
diff --git a/board/spear/spear310/spear310.c b/board/st/spear/spear310evb.c
similarity index 95%
rename from board/spear/spear310/spear310.c
rename to board/st/spear/spear310evb.c
index a1c45ae..4ed8f01 100644
--- a/board/spear/spear310/spear310.c
+++ b/board/st/spear/spear310evb.c
@@ -32,20 +32,17 @@ 
 #include <asm/arch/generic.h>
 #include <asm/arch/misc.h>
 
+#if defined(CONFIG_CMD_NAND)
 static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
+#endif
 
-int board_init(void)
-{
-	return spear_board_init(MACH_TYPE_SPEAR310);
-}
-
+#if defined(CONFIG_CMD_NAND)
 /*
  * board_nand_init - Board specific NAND initialization
  * @nand:	mtd private chip structure
  *
  * Called by nand_init_chip to initialize the board specific functions
  */
-
 void board_nand_init()
 {
 	struct misc_regs *const misc_regs_p =
@@ -63,7 +60,9 @@  void board_nand_init()
 #endif
 	return;
 }
+#endif
 
+#if defined(CONFIG_CMD_NET)
 int board_eth_init(bd_t *bis)
 {
 	int ret = 0;
@@ -93,3 +92,4 @@  int board_eth_init(bd_t *bis)
 #endif
 	return ret;
 }
+#endif
diff --git a/board/spear/spear320/spear320.c b/board/st/spear/spear320plc.c
similarity index 95%
rename from board/spear/spear320/spear320.c
rename to board/st/spear/spear320plc.c
index 82674f3..a463998 100644
--- a/board/spear/spear320/spear320.c
+++ b/board/st/spear/spear320plc.c
@@ -35,7 +35,9 @@ 
 #define PLGPIO_SEL_36	0xb3000028
 #define PLGPIO_IO_36	0xb3000038
 
+#if defined(CONFIG_CMD_NAND)
 static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
+#endif
 
 static void spear_phy_reset(void)
 {
@@ -46,23 +48,22 @@  static void spear_phy_reset(void)
 int board_init(void)
 {
 	spear_phy_reset();
-	return spear_board_init(MACH_TYPE_SPEAR320);
+	return 0;
 }
 
+#if defined(CONFIG_CMD_NAND)
 /*
  * board_nand_init - Board specific NAND initialization
  * @nand:	mtd private chip structure
  *
  * Called by nand_init_chip to initialize the board specific functions
  */
-
 void board_nand_init()
 {
 	struct misc_regs *const misc_regs_p =
 	    (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
 	struct nand_chip *nand = &nand_chip[0];
 
-#if defined(CONFIG_NAND_FSMC)
 	if (((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
 	     MISC_SOCCFG30) ||
 	    ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
@@ -70,11 +71,12 @@  void board_nand_init()
 
 		fsmc_nand_init(nand);
 	}
-#endif
 
 	return;
 }
+#endif
 
+#if defined(CONFIG_CMD_NET)
 int board_eth_init(bd_t *bis)
 {
 	int ret = 0;
@@ -92,3 +94,4 @@  int board_eth_init(bd_t *bis)
 #endif
 	return ret;
 }
+#endif
diff --git a/board/spear/spear600/spear600.c b/board/st/spear/spear600evb.c
similarity index 94%
rename from board/spear/spear600/spear600.c
rename to board/st/spear/spear600evb.c
index b4f013f..61cea50 100644
--- a/board/spear/spear600/spear600.c
+++ b/board/st/spear/spear600evb.c
@@ -31,20 +31,17 @@ 
 #include <asm/arch/generic.h>
 #include <asm/arch/misc.h>
 
+#if defined(CONFIG_CMD_NAND)
 static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
+#endif
 
-int board_init(void)
-{
-	return spear_board_init(MACH_TYPE_SPEAR600);
-}
-
+#if defined(CONFIG_CMD_NAND)
 /*
  * board_nand_init - Board specific NAND initialization
  * @nand:	mtd private chip structure
  *
  * Called by nand_init_chip to initialize the board specific functions
  */
-
 void board_nand_init()
 {
 	struct misc_regs *const misc_regs_p =
@@ -57,11 +54,12 @@  void board_nand_init()
 #endif
 	return;
 }
+#endif
 
+#if defined(CONFIG_CMD_NET)
 int board_eth_init(bd_t *bis)
 {
 	int ret = 0;
-
 #if defined(CONFIG_DESIGNWARE_ETH)
 	u32 interface = PHY_INTERFACE_MODE_MII;
 #if defined(CONFIG_DW_AUTONEG)
@@ -73,3 +71,4 @@  int board_eth_init(bd_t *bis)
 #endif
 	return ret;
 }
+#endif
diff --git a/board/spear/common/spr_misc.c b/board/st/spear/spear_common.c
similarity index 89%
rename from board/spear/common/spr_misc.c
rename to board/st/spear/spear_common.c
index df05ff2..c760229 100644
--- a/board/spear/common/spr_misc.c
+++ b/board/st/spear/spear_common.c
@@ -39,21 +39,18 @@  DECLARE_GLOBAL_DATA_PTR;
 #if defined(CONFIG_CMD_NET)
 static int i2c_read_mac(uchar *buffer);
 #endif
+void lowlevel_init(void)
+{
+}
 
 int dram_init(void)
 {
 	/* Store complete RAM size and return */
-	gd->ram_size = get_ram_size(PHYS_SDRAM_1, PHYS_SDRAM_1_MAXSIZE);
+	gd->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE, SDRAM_MAX_SIZE);
 
 	return 0;
 }
 
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = gd->ram_size;
-}
-
 int board_early_init_f()
 {
 #if defined(CONFIG_ST_SMI)
@@ -61,27 +58,6 @@  int board_early_init_f()
 #endif
 	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");
-
-#ifndef CONFIG_SYS_NO_DCACHE
-	dcache_enable();
-#endif
-#endif
-	return 0;
-}
 
 #ifdef CONFIG_SPEAR_EMI
 struct cust_emi_para {
@@ -140,8 +116,6 @@  void spear_emi_init(void)
 
 int spear_board_init(ulong mach_type)
 {
-	gd->bd->bi_arch_number = mach_type;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
 
diff --git a/board/spear/common/spr_lowlevel_init.S b/board/st/spear/spear_lowlevel_init.S
similarity index 100%
rename from board/spear/common/spr_lowlevel_init.S
rename to board/st/spear/spear_lowlevel_init.S
diff --git a/board/spear/x600/x600.c b/board/st/spear/x600.c
similarity index 100%
rename from board/spear/x600/x600.c
rename to board/st/spear/x600.c
diff --git a/board/spear/x600/fpga.c b/board/st/spear/x600fpga.c
similarity index 100%
rename from board/spear/x600/fpga.c
rename to board/st/spear/x600fpga.c
diff --git a/board/spear/x600/fpga.h b/board/st/spear/x600fpga.h
similarity index 100%
rename from board/spear/x600/fpga.h
rename to board/st/spear/x600fpga.h
diff --git a/boards.cfg b/boards.cfg
index fe357e7..3b0348a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -198,19 +198,21 @@  omap730p2_cs0boot	     arm         arm926ejs   omap730p2		 ti             omap
 omap730p2_cs3boot	     arm         arm926ejs   omap730p2		 ti             omap        omap730p2:CS3_BOOT
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
-spear300                     arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300
-spear300_nand                arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300,nand
-spear300_usbtty              arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300,usbtty
-spear310                     arm         arm926ejs   spear310            spear          spear       spear3xx_evb:spear310
-spear310_pnor                arm         arm926ejs   spear310            spear          spear       spear3xx_evb:spear310,FLASH_PNOR
-spear310_nand                arm         arm926ejs   spear310            spear          spear       spear3xx_evb:spear310,nand
-spear310_usbtty              arm         arm926ejs   spear310            spear          spear       spear3xx_evb:spear310,usbtty
-spear320                     arm         arm926ejs   spear320            spear          spear       spear3xx_evb:spear320
-spear320_usbtty              arm         arm926ejs   spear320            spear          spear       spear3xx_evb:spear320,usbtty
-spear600                     arm         arm926ejs   spear600            spear          spear       spear6xx_evb:spear600
-spear600_nand                arm         arm926ejs   spear600            spear          spear       spear6xx_evb:spear600,nand
-spear600_usbtty              arm         arm926ejs   spear600            spear          spear       spear6xx_evb:spear600,usbtty
-x600			     arm         arm926ejs   -                   spear          spear       x600
+x600			     arm         arm926ejs   -                   st             spear       x600
+spear300                     arm         arm926ejs   spear               st             spear       spear300-evb:spear300
+spear300_nand                arm         arm926ejs   spear               st             spear       spear300-evb:spear300,nand
+spear300_usbtty              arm         arm926ejs   spear               st             spear       spear300-evb:spear300,usbtty
+spear310                     arm         arm926ejs   spear               st             spear       spear310-evb:spear310
+spear310_pnor                arm         arm926ejs   spear               st             spear       spear310-evb:spear310,pnor
+spear310_nand                arm         arm926ejs   spear               st             spear       spear310-evb:spear310,nand
+spear310_usbtty              arm         arm926ejs   spear               st             spear       spear310-evb:spear310,usbtty
+spear320                     arm         arm926ejs   spear               st             spear       spear320-evb:spear320
+spear320_pnor                arm         arm926ejs   spear               st             spear       spear320-evb:spear320,pnor
+spear320_nand                arm         arm926ejs   spear               st             spear       spear320-evb:spear320,nand
+spear320_usbtty              arm         arm926ejs   spear               st             spear       spear320-evb:spear320,usbtty
+spear600                     arm         arm926ejs   spear               st             spear       spear600-evb:spear600
+spear600_nand                arm         arm926ejs   spear               st             spear       spear600-evb:spear600,nand
+spear600_usbtty              arm         arm926ejs   spear               st             spear       spear600-evb:spear600,usbtty
 versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
 versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB