* [U-Boot] [PATCH] common: fix include guards for CONFIG_MP
@ 2014-09-03 20:57 Gabriel Huau
2014-09-03 21:03 ` York Sun
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Gabriel Huau @ 2014-09-03 20:57 UTC (permalink / raw)
To: 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(-)
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
--
2.0.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] common: fix include guards for CONFIG_MP
2014-09-03 20:57 [U-Boot] [PATCH] common: fix include guards for CONFIG_MP Gabriel Huau
@ 2014-09-03 21:03 ` York Sun
2014-09-10 15:27 ` York Sun
2014-09-17 0:46 ` [U-Boot] " Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: York Sun @ 2014-09-03 21:03 UTC (permalink / raw)
To: u-boot
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
>
Looks good.
York
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] common: fix include guards for CONFIG_MP
2014-09-03 20:57 [U-Boot] [PATCH] common: fix include guards for CONFIG_MP Gabriel Huau
2014-09-03 21:03 ` York Sun
@ 2014-09-10 15:27 ` York Sun
2014-09-17 0:46 ` [U-Boot] " Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: York Sun @ 2014-09-10 15:27 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] common: fix include guards for CONFIG_MP
2014-09-03 20:57 [U-Boot] [PATCH] common: fix include guards for CONFIG_MP Gabriel Huau
2014-09-03 21:03 ` York Sun
2014-09-10 15:27 ` York Sun
@ 2014-09-17 0:46 ` Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2014-09-17 0:46 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140916/984dc168/attachment.pgp>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-17 0:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-03 20:57 [U-Boot] [PATCH] common: fix include guards for CONFIG_MP Gabriel Huau
2014-09-03 21:03 ` York Sun
2014-09-10 15:27 ` York Sun
2014-09-17 0:46 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox