diff mbox

[U-Boot,1/5,v1] integrator: pass configs for core modules

Message ID 1316332319-18382-1-git-send-email-linus.walleij@linaro.org
State Superseded
Headers show

Commit Message

Linus Walleij Sept. 18, 2011, 7:51 a.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>
---
 boards.cfg |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Linus Walleij Sept. 21, 2011, 11 a.m. UTC | #1 
Albert do you want this series through patchwork or through
a git pull request?

The patchwork entries are here:

http://patchwork.ozlabs.org/patch/115217/
http://patchwork.ozlabs.org/patch/115218/
http://patchwork.ozlabs.org/patch/115219/
http://patchwork.ozlabs.org/patch/115220/
http://patchwork.ozlabs.org/patch/115296/

Thanks,
Linus Walleij
Linus Walleij Oct. 10, 2011, 2:38 a.m. UTC | #2 
On Wed, Sep 21, 2011 at 1:00 PM, Linus Walleij <linus.walleij@linaro.org> wrote:

> Albert do you want this series through patchwork or through
> a git pull request?

Ping on this... I'm happy to help.

> The patchwork entries are here:
>
> http://patchwork.ozlabs.org/patch/115217/
> http://patchwork.ozlabs.org/patch/115218/
> http://patchwork.ozlabs.org/patch/115219/
> http://patchwork.ozlabs.org/patch/115220/
> http://patchwork.ozlabs.org/patch/115296/

Now also:
http://patchwork.ozlabs.org/patch/117924/
http://patchwork.ozlabs.org/patch/117925/

Yours,
Linus Walleij
Albert ARIBAUD Oct. 21, 2011, 7:32 p.m. UTC | #3 
Hi Linus,

Le 10/10/2011 04:38, Linus Walleij a écrit :
> On Wed, Sep 21, 2011 at 1:00 PM, Linus Walleij<linus.walleij@linaro.org>  wrote:
>
>> Albert do you want this series through patchwork or through
>> a git pull request?
>
> Ping on this... I'm happy to help.
>
>> The patchwork entries are here:
>>
>> http://patchwork.ozlabs.org/patch/115217/
>> http://patchwork.ozlabs.org/patch/115218/
>> http://patchwork.ozlabs.org/patch/115219/
>> http://patchwork.ozlabs.org/patch/115220/
>> http://patchwork.ozlabs.org/patch/115296/
>
> Now also:
> http://patchwork.ozlabs.org/patch/117924/
> http://patchwork.ozlabs.org/patch/117925/

Can you rebase? Some of these don't apply cleanly any more.

> Yours,
> Linus Walleij

Amicalement,
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 8a5bfc1..46e08e8 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -35,16 +35,16 @@ 
 # 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
 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
@@ -58,8 +58,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
@@ -152,8 +152,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
 efikamx                      arm         armv7       efikamx             -              mx5		efikamx:IMX_CONFIG=board/efikamx/imximage.cfg
 mx51evk                      arm         armv7       mx51evk             freescale      mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg