From: Tom Rix <tom@bumblecow.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 17/17] SPEAr : Supporting various configurations for spear3xx and spear6xx boards
Date: Sun, 02 May 2010 19:38:43 -0500 [thread overview]
Message-ID: <4BDE1B13.10602@bumblecow.com> (raw)
In-Reply-To: <1272250610-15439-18-git-send-email-vipin.kumar@st.com>
Vipin KUMAR wrote:
> spear3xx and 6xx 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
>
Add the new configs to the README.spear
Tom
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
> Makefile | 16 ++++++++++++++--
> board/spear/spear300/config.mk | 11 -----------
> board/spear/spear310/config.mk | 11 -----------
> board/spear/spear320/config.mk | 11 -----------
> board/spear/spear600/config.mk | 11 -----------
> include/configs/spear3xx.h | 10 ++++++++++
> include/configs/spear6xx.h | 10 ++++++++++
> 7 files changed, 34 insertions(+), 46 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 0b6a151..4cc9913 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -3034,11 +3034,23 @@ smdk2410_config : unconfig
> @$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
>
> spear300_config \
> +spear300_nand_config \
> +spear300_usbtty_config \
> +spear300_usbtty_nand_config \
> spear310_config \
> -spear320_config : unconfig
> +spear310_nand_config \
> +spear310_usbtty_config \
> +spear310_usbtty_nand_config \
> +spear320_config \
> +spear320_nand_config \
> +spear320_usbtty_config \
> +spear320_usbtty_nand_config : unconfig
> @$(MKCONFIG) -n $@ -t $(@:_config=) spear3xx arm arm926ejs $(@:_config=) spear spear
>
> -spear600_config : unconfig
> +spear600_config \
> +spear600_nand_config \
> +spear600_usbtty_config \
> +spear600_usbtty_nand_config : unconfig
> @$(MKCONFIG) -n $@ -t $(@:_config=) spear6xx arm arm926ejs $(@:_config=) spear spear
>
> spear1300_config \
> diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
> index 35646f2..0bbb40f 100644
> --- a/board/spear/spear300/config.mk
> +++ b/board/spear/spear300/config.mk
> @@ -26,14 +26,3 @@
> 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/spear310/config.mk b/board/spear/spear310/config.mk
> index cba8436..c8264c3 100644
> --- a/board/spear/spear310/config.mk
> +++ b/board/spear/spear310/config.mk
> @@ -27,18 +27,7 @@ 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/config.mk b/board/spear/spear320/config.mk
> index cba8436..c8264c3 100644
> --- a/board/spear/spear320/config.mk
> +++ b/board/spear/spear320/config.mk
> @@ -27,18 +27,7 @@ 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/spear600/config.mk b/board/spear/spear600/config.mk
> index 35646f2..0bbb40f 100644
> --- a/board/spear/spear600/config.mk
> +++ b/board/spear/spear600/config.mk
> @@ -26,14 +26,3 @@
> 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/include/configs/spear3xx.h b/include/configs/spear3xx.h
> index fde505c..f0c915e 100644
> --- a/include/configs/spear3xx.h
> +++ b/include/configs/spear3xx.h
> @@ -39,6 +39,16 @@
> #define CONFIG_SPEAR320 1
> #endif
>
> +#if defined(CONFIG_MK_usbtty)
> +#define CONFIG_SPEAR_USBTTY 1
> +#endif
> +
> +#if defined(CONFIG_MK_nand)
> +#define CONFIG_ENV_IS_IN_NAND 1
> +#else
> +#define CONFIG_ENV_IS_IN_FLASH 1
> +#endif
> +
> #include <configs/spear-common.h>
>
> /* Ethernet driver configuration */
> diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h
> index 2532344..82d24df 100644
> --- a/include/configs/spear6xx.h
> +++ b/include/configs/spear6xx.h
> @@ -30,6 +30,16 @@
> */
> #define CONFIG_SPEAR600 1
>
> +#if defined(CONFIG_MK_usbtty)
> +#define CONFIG_SPEAR_USBTTY 1
> +#endif
> +
> +#if defined(CONFIG_MK_nand)
> +#define CONFIG_ENV_IS_IN_NAND 1
> +#else
> +#define CONFIG_ENV_IS_IN_FLASH 1
> +#endif
> +
> #include <configs/spear-common.h>
>
> /* Serial Configuration (PL011) */
next prev parent reply other threads:[~2010-05-03 0:38 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-26 2:56 [U-Boot] [PATCH v2 00/17] Network support for spear platform and spear1300 support Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 01/17] u-boot.img file not created when srctree and objtree are different Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 02/17] change_bit routine defined Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 03/17] SPEAr : SMI erase and write timeouts increased Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 04/17] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 05/17] SPEAr : Reducing the max RAM size to 128MB Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 06/17] SPEAr : Basic arch related support added for SPEAr SoCs Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 07/17] SPEAr : Network driver support added Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 08/17] SPEAr : Network support configured for spear SoCs Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 09/17] SPEAr : macb driver support added for spear310 and spear320 Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 10/17] SPEAr : FSMC driver support added Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 11/17] SPEAr : Configuring FSMC driver for NAND interface Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 12/17] SPEAr : i2c driver moved completely into drivers/i2c Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 13/17] SPEAr : smi driver moved completely into drivers/mtd Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 14/17] SPEAr : USBD driver support added Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 15/17] SPEAr : Basic spear1300 architecture " Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 16/17] SPEAr : spear1300 SoC " Vipin KUMAR
2010-04-26 2:56 ` [U-Boot] [PATCH v2 17/17] SPEAr : Supporting various configurations for spear3xx and spear6xx boards Vipin KUMAR
2010-05-03 0:38 ` Tom Rix [this message]
2010-05-03 7:59 ` Vipin KUMAR
2010-05-03 0:37 ` [U-Boot] [PATCH v2 16/17] SPEAr : spear1300 SoC support added Tom Rix
2010-05-03 8:35 ` Vipin KUMAR
2010-05-03 10:19 ` Tom Rix
2010-05-03 11:17 ` Vipin KUMAR
2010-05-03 0:33 ` [U-Boot] [PATCH v2 15/17] SPEAr : Basic spear1300 architecture " Tom Rix
2010-05-03 11:14 ` Vipin KUMAR
2010-05-03 0:29 ` [U-Boot] [PATCH v2 14/17] SPEAr : USBD driver " Tom Rix
2010-05-03 0:27 ` [U-Boot] [PATCH v2 13/17] SPEAr : smi driver moved completely into drivers/mtd Tom Rix
2010-04-27 5:08 ` [U-Boot] [PATCH v2 12/17] SPEAr : i2c driver moved completely into drivers/i2c Heiko Schocher
2010-05-03 0:25 ` Tom Rix
2010-05-04 9:07 ` Vipin KUMAR
2010-05-04 17:56 ` Scott Wood
2010-05-06 1:44 ` Vipin KUMAR
2010-05-05 21:37 ` Tom Rix
2010-05-06 2:08 ` Vipin KUMAR
2010-04-27 21:09 ` [U-Boot] [PATCH v2 11/17] SPEAr : Configuring FSMC driver for NAND interface Scott Wood
2010-05-03 0:24 ` Tom Rix
2010-05-04 8:48 ` Vipin KUMAR
2010-04-27 21:09 ` [U-Boot] [PATCH v2 10/17] SPEAr : FSMC driver support added Scott Wood
2010-05-03 0:22 ` Tom Rix
2010-05-04 8:08 ` Vipin KUMAR
2010-05-03 0:14 ` [U-Boot] [PATCH v2 09/17] SPEAr : macb driver support added for spear310 and spear320 Tom Rix
2010-05-04 8:01 ` Vipin KUMAR
2010-05-02 23:49 ` [U-Boot] [PATCH v2 08/17] SPEAr : Network support configured for spear SoCs Tom Rix
2010-05-04 7:15 ` Vipin KUMAR
2010-05-02 23:48 ` [U-Boot] [PATCH v2 07/17] SPEAr : Network driver support added Tom Rix
2010-05-04 6:33 ` Vipin KUMAR
2010-05-04 13:14 ` Tom Rix
2010-05-02 23:40 ` [U-Boot] [PATCH v2 06/17] SPEAr : Basic arch related support added for SPEAr SoCs Tom Rix
2010-05-04 5:57 ` Vipin KUMAR
2010-05-02 23:37 ` [U-Boot] [PATCH v2 05/17] SPEAr : Reducing the max RAM size to 128MB Tom Rix
2010-05-04 5:50 ` Vipin KUMAR
2010-05-02 23:36 ` [U-Boot] [PATCH v2 04/17] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Tom Rix
2010-05-04 5:34 ` Vipin KUMAR
2010-05-04 12:18 ` Tom Rix
2010-05-06 4:11 ` Vipin KUMAR
2010-05-06 22:28 ` Wolfgang Denk
2010-05-02 23:33 ` [U-Boot] [PATCH v2 03/17] SPEAr : SMI erase and write timeouts increased Tom Rix
2010-05-04 3:43 ` Vipin KUMAR
2010-05-02 23:31 ` [U-Boot] [PATCH v2 02/17] change_bit routine defined Tom Rix
2010-05-04 1:54 ` Vipin KUMAR
2010-05-02 23:27 ` [U-Boot] [PATCH v2 01/17] u-boot.img file not created when srctree and objtree are different Tom Rix
2010-04-30 11:08 ` [U-Boot] [PATCH v2 00/17] Network support for spear platform and spear1300 support Vipin KUMAR
2010-04-30 12:48 ` Tom Rix
2010-05-01 10:09 ` Vipin Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BDE1B13.10602@bumblecow.com \
--to=tom@bumblecow.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.