diff mbox

[U-Boot,1/7,v3] integrator: pass configs for core modules

Message ID 1320855245-4097-1-git-send-email-linus.walleij@linaro.org
State Accepted
Commit 7d2fd0d1d00dee2a7f49a68ea9905511cdc1a626
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Linus Walleij Nov. 9, 2011, 4:14 p.m. UTC 
Alter the board.cfg to pass core module configuration flags
so we can make compile-time switches for different core
modules. These are already in use for some low-level code,
they just got lost in the conversion to the new build
system.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Rebased to U-Boot ARM HEAD at Alberts request, see message
  4EA1C8E7.7090105@aribaud.net
ChangeLog v2->v3:
- Rebased to U-Boot ARM HEAD at Alberts request, see message
  4EB84700.1030109@aribaud.net
---
 boards.cfg |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Albert ARIBAUD Nov. 10, 2011, 3:26 p.m. UTC | #1 
Hi Linus,

Le 09/11/2011 17:14, Linus Walleij a écrit :
> Alter the board.cfg to pass core module configuration flags
> so we can make compile-time switches for different core
> modules. These are already in use for some low-level code,
> they just got lost in the conversion to the new build
> system.
>
> Signed-off-by: Linus Walleij<linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Rebased to U-Boot ARM HEAD at Alberts request, see message
>    4EA1C8E7.7090105@aribaud.net
> ChangeLog v2->v3:
> - Rebased to U-Boot ARM HEAD at Alberts request, see message
>    4EB84700.1030109@aribaud.net
> ---
>   boards.cfg |   16 ++++++++--------
>   1 files changed, 8 insertions(+), 8 deletions(-)

This patch as well as 2/7, 4/7, 5/7, 6/7 and 7/7 have been applied to 
u-boot-arm/master, thanks.

Amicalement,
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 88be71b..7113745 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -35,7 +35,7 @@ 
 # Target                     ARCH        CPU         Board name          Vendor	        SoC         Options
 ###########################################################################################################
 
-integratorcp_cm1136          arm         arm1136     integrator          armltd         -           integratorcp
+integratorcp_cm1136          arm         arm1136     integrator          armltd         -           integratorcp:CM1136
 qong                         arm         arm1136     -                   davedenx       mx31
 mx31ads                      arm         arm1136     -                   freescale      mx31
 imx31_litekit                arm         arm1136     -                   logicpd        mx31
@@ -47,9 +47,9 @@  flea3                        arm         arm1136     -                   CarMedi
 mx35pdk                      arm         arm1136     -                   freescale      mx35
 omap2420h4                   arm         arm1136     -                   ti             omap24xx
 tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
-integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap
-integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap
-integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp
+integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
+integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap:CM920T
+integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp:CM920T
 a320evb                      arm         arm920t     -                   faraday        a320
 at91rm9200ek                 arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek
 at91rm9200ek_ram             arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek:RAMBOOT
@@ -63,8 +63,8 @@  cm41xx                       arm         arm920t     -                   -
 VCMA9                        arm         arm920t     vcma9               mpl            s3c24x0
 smdk2410                     arm         arm920t     -                   samsung        s3c24x0
 omap1510inn                  arm         arm925t     -                   ti
-integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap
-integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp
+integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap:CM926EJ_S
+integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp:CM924EJ_S
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
 versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
 versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
@@ -162,8 +162,8 @@  nhk8815_onenand              arm         arm926ejs   nhk8815             st
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
-integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap
-integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp
+integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
+integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 highbank                     arm         armv7       highbank            -              highbank
 am335x_evm                   arm         armv7       am335x              ti             am33xx