| Message ID | 1409777874-16158-1-git-send-email-contact@huau-gabriel.fr |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 09/03/2014 01:57 PM, Gabriel Huau wrote: > This was breaking the build for some boards: > MPC8536DS MPC8536DS_36BIT MPC8536DS_SDCARD MPC8536DS_SPIFLASH qemu-ppce500 > > Include only these features for some PPC boards if the configuration for MultiProcessor > is enabled. > > Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr> > Cc: Tom Rini <trini@ti.com> > Cc: York Sun <yorksun@freescale.com> > --- > common/board_f.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/common/board_f.c b/common/board_f.c > index 4ece2b6..deea9ca 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -34,7 +34,7 @@ > #ifdef CONFIG_MPC5xxx > #include <mpc5xxx.h> > #endif > -#if (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) > +#if defined(CONFIG_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) > #include <asm/mp.h> > #endif > > @@ -392,7 +392,7 @@ static int setup_dest_addr(void) > gd->ram_top = board_get_usable_ram_top(gd->mon_len); > gd->relocaddr = gd->ram_top; > debug("Ram top: %08lX\n", (ulong)gd->ram_top); > -#if (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) > +#if defined(CONFIG_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) > /* > * We need to make sure the location we intend to put secondary core > * boot code is reserved and not used by any part of u-boot > Acked-by: York Sun <yorksun@freescale.com> York
On Wed, Sep 03, 2014 at 01:57:54PM -0700, Gabriel Huau wrote: > This was breaking the build for some boards: > MPC8536DS MPC8536DS_36BIT MPC8536DS_SDCARD MPC8536DS_SPIFLASH qemu-ppce500 > > Include only these features for some PPC boards if the configuration for MultiProcessor > is enabled. > > Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr> > Cc: Tom Rini <trini@ti.com> > Cc: York Sun <yorksun@freescale.com> > Acked-by: York Sun <yorksun@freescale.com> Applied to u-boot/master, thanks!
diff --git a/common/board_f.c b/common/board_f.c index 4ece2b6..deea9ca 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -34,7 +34,7 @@ #ifdef CONFIG_MPC5xxx #include <mpc5xxx.h> #endif -#if (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) +#if defined(CONFIG_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) #include <asm/mp.h> #endif @@ -392,7 +392,7 @@ static int setup_dest_addr(void) gd->ram_top = board_get_usable_ram_top(gd->mon_len); gd->relocaddr = gd->ram_top; debug("Ram top: %08lX\n", (ulong)gd->ram_top); -#if (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) +#if defined(CONFIG_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) /* * We need to make sure the location we intend to put secondary core * boot code is reserved and not used by any part of u-boot
This was breaking the build for some boards: MPC8536DS MPC8536DS_36BIT MPC8536DS_SDCARD MPC8536DS_SPIFLASH qemu-ppce500 Include only these features for some PPC boards if the configuration for MultiProcessor is enabled. Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr> Cc: Tom Rini <trini@ti.com> Cc: York Sun <yorksun@freescale.com> --- common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)