Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

SPEAr: Add configuration options for spear3xx and spear6xx boards

Browse source 
This patch adds options for all the below mentioned configurations and
subsequently renames the include/configs/spearxxx.h files to spear3xx_evb.h,
spear6xx_evb.h etc to depict evaluation board configuration.

SPEAr3xx and SPEAr6xx boards can be compiled in following configurations
1. Environment placed in NAND
2. Console on usb device
3. Console on usb device with environment placed in NAND
4. SPEAr310 and SPEAr320 support environment variables in parallel
NOR flash.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Vipin KUMAR 2012-05-07 13:06:46 +05:30 committed by Albert ARIBAUD
parent 962d026b6a
commit f273e5b2a6
9 changed files with 78 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
board/spear/spear300/config.mk
View file

@ -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-y += $(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

44
board/spear/spear310/config.mk
View file

@ -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-y += $(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

44
board/spear/spear320/config.mk
View file

@ -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-y += $(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

39
board/spear/spear600/config.mk
View file

@ -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-y += $(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

24
boards.cfg
View file

@ -178,10 +178,26 @@ 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:spear300
spear310 arm arm926ejs spear310 spear spear spear3xx:spear310
spear320 arm arm926ejs spear320 spear spear spear3xx:spear320
spear600 arm arm926ejs spear600 spear spear spear6xx:spear600
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
spear300_usbtty_nand arm arm926ejs spear300 spear spear spear3xx_evb:spear300,usbtty,nand
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
spear310_usbtty_pnor arm arm926ejs spear310 spear spear spear3xx_evb:spear310,usbtty,FLASH_PNOR
spear310_usbtty_nand arm arm926ejs spear310 spear spear spear3xx_evb:spear310,usbtty,nand
spear320 arm arm926ejs spear320 spear spear spear3xx_evb:spear320
spear320_pnor arm arm926ejs spear320 spear spear spear3xx_evb:spear320,FLASH_PNOR
spear320_nand arm arm926ejs spear320 spear spear spear3xx_evb:spear320,nand
spear320_usbtty arm arm926ejs spear320 spear spear spear3xx_evb:spear320,usbtty
spear320_usbtty_pnor arm arm926ejs spear320 spear spear spear3xx_evb:spear320,usbtty,FLASH_PNOR
spear320_usbtty_nand arm arm926ejs spear320 spear spear spear3xx_evb:spear320,usbtty,nand
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
spear600_usbtty_nand arm arm926ejs spear600 spear spear spear6xx_evb:spear600,usbtty,nand
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

52
doc/README.spear
View file

@ -6,9 +6,10 @@ SPEAr600 is also known as SPEArPlus and SPEAr300 is also known as SPEArBasic
The SPEAr SoC family embeds a customizable logic that can be programmed
one-time by a customer at silicon mask level (i.e. not at runtime!).
We are now adding the support in u-boot for two SoC: SPEAr600 and SPEAr3xx.
U-Boot supports four SoCs: SPEAr600, SPEAr3xx
All 4 SoCs share common peripherals.
All 4 SoCs (SPEAr3xx and SPEAr600) share common peripherals. SPEAr300 and
SPEAr600 do not have EMI.
1. ARM926ejs core based (sp600 has two cores, the 2nd handled only in Linux)
2. FastEthernet (sp600 has Gbit version, but same controller - GMAC)
@ -22,7 +23,7 @@ All 4 SoCs share common peripherals.
10. others ..
Everything is supported in Linux.
u-boot is not currently supporting all peripeharls (just a few as listed below).
u-boot is currently not supporting all peripeharls (just a few as listed below).
1. USB Device
2. NAND controller (FSMC)
3. Serial Memory Interface
@ -31,21 +32,38 @@ u-boot is not currently supporting all peripeharls (just a few as listed below).
5. UART
Build options
make spear600_config
make spear300_config
make spear310_config
make spear320_config
Further options
make ENV=NAND (supported by all 4 SoCs)
- This option generates a uboot image that saves environment inn NAND
make CONSOLE=USB (supported by all 4 SoCs)
- This option generates a uboot image for using usbdevice as a tty i/f
make FLASH=PNOR (supported by SPEAr310 and SPEAr320)
- This option generates a uboot image that supports emi controller for
CFI compliant parallel NOR flash
spear320 build with environment variables placed at default
location i.e. Serial NOR device
make spear320_pnor_config
This option generates a uboot image that supports emi controller
for CFI compliant parallel NOR flash. Environment variables are
placed in Parallel NOR device
make spear320_nand_config
spear320 build with environment variables placed in NAND device
make spear320_usbtty_config
spear320 build with usbtty terminal as default and environment
placed at default location
make spear320_usbtty_pnor_config
spear320 build with usbtty terminal as default and environment
placed in pnor device
make spear320_usbtty_nand_config
Build with usbtty terminal as default and environment placed in
NAND device
make spear300_config
make spear300_nand_config
make spear300_usbtty_config
make spear300_usbtty_nand_config
make spear310_config
make spear310_pnor_config
make spear310_nand_config
make spear310_usbtty_config
make spear310_usbtty_pnor_config
make spear310_usbtty_nand_config
make spear600_config
make spear600_nand_config
make spear600_usbtty_config
make spear600_usbtty_nand_config
Mac id storage and retrieval in spear platforms

3
include/configs/spear-common.h
View file

@ -27,6 +27,9 @@
* Common configurations used for both spear3xx as well as spear6xx
*/
/* U-boot Load Address */
#define CONFIG_SYS_TEXT_BASE 0x00700000
/* Ethernet driver configuration */
#define CONFIG_MII
#define CONFIG_DESIGNWARE_ETH

10
include/configs/spear3xx.h → include/configs/spear3xx_evb.h
View file

@ -39,6 +39,16 @@
#define CONFIG_SPEAR320 1
#endif
#if defined(CONFIG_usbtty)
#define CONFIG_SPEAR_USBTTY
#endif
#if defined(CONFIG_nand)
#define CONFIG_ENV_IS_IN_NAND
#else
#define CONFIG_ENV_IS_IN_FLASH
#endif
#include <configs/spear-common.h>
/* Ethernet driver configuration */

10
include/configs/spear6xx.h → include/configs/spear6xx_evb.h
View file

@ -30,6 +30,16 @@
*/
#define CONFIG_SPEAR600 1
#if defined(CONFIG_usbtty)
#define CONFIG_SPEAR_USBTTY
#endif
#if defined(CONFIG_nand)
#define CONFIG_ENV_IS_IN_NAND
#else
#define CONFIG_ENV_IS_IN_FLASH
#endif
#include <configs/spear-common.h>
/* Serial Configuration (PL011) */