diff mbox

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

Message ID 1319439678-29600-1-git-send-email-linus.walleij@linaro.org
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Linus Walleij Oct. 24, 2011, 7:01 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>
---
ChangeLog v1->v2:
- Rebased to U-Boot ARM HEAD at Alberts request, see message
  4EA1C8E7.7090105@aribaud.net
---
 boards.cfg |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Linus Walleij Nov. 3, 2011, 9:14 p.m. UTC | #1 
Albert, are the v2 patches OK?

In patchworx it's these:
http://patchwork.ozlabs.org/patch/121278/
http://patchwork.ozlabs.org/patch/121279/
http://patchwork.ozlabs.org/patch/121280/
http://patchwork.ozlabs.org/patch/121281/
http://patchwork.ozlabs.org/patch/121282/
http://patchwork.ozlabs.org/patch/121283/
http://patchwork.ozlabs.org/patch/121284/

Thanks,
Linus Walleij
Albert ARIBAUD Nov. 7, 2011, 9 p.m. UTC | #2 
Hi Linus,

Le 03/11/2011 22:14, Linus Walleij a écrit :
> Albert, are the v2 patches OK?
>
> In patchworx it's these:
> http://patchwork.ozlabs.org/patch/121278/
> http://patchwork.ozlabs.org/patch/121279/
> http://patchwork.ozlabs.org/patch/121280/
> http://patchwork.ozlabs.org/patch/121281/
> http://patchwork.ozlabs.org/patch/121282/
> http://patchwork.ozlabs.org/patch/121283/
> http://patchwork.ozlabs.org/patch/121284/
>
> Thanks,
> Linus Walleij

Can you please rebase them on top of current u-boot-arm/master?

Amicalement,
Linus Walleij Nov. 9, 2011, 4:22 p.m. UTC | #3 
On Mon, Nov 7, 2011 at 10:00 PM, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Can you please rebase them on top of current u-boot-arm/master?

OK I rebased and sent them off with the same series enumeration.
Since 3/7 was merged out-of-series I've only rebased and sent
out 1,2,4,5,6,7. (Just as it appears in patchwork FTM.)

Yours,
Linus Walleij
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 4162172..721e89c 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
@@ -45,9 +45,9 @@  mx31pdk                      arm         arm1136     -                   freesca
 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
@@ -61,8 +61,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
@@ -158,8 +158,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
 am335x_evm                   arm         armv7       am335x              ti             am33xx
 efikamx                      arm         armv7       efikamx             -              mx5		efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg