summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Huau <leirbag2311@gmail.com>2014-09-03 13:57:54 -0700
committerTom Rini <trini@ti.com>2014-09-16 12:23:58 -0400
commitec3b48201d0338efa7f3ce4173ffe69e573e2511 (patch)
tree2f83ce335832dc5b22b4b2c9707c3613a603464e
parentf458e3559b4a77b72c2143b6c61e0bfbf07035bc (diff)
downloadu-boot-imx-ec3b48201d0338efa7f3ce4173ffe69e573e2511.zip
u-boot-imx-ec3b48201d0338efa7f3ce4173ffe69e573e2511.tar.gz
u-boot-imx-ec3b48201d0338efa7f3ce4173ffe69e573e2511.tar.bz2
common: fix include guards for CONFIG_MP
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>
-rw-r--r--common/board_f.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c
index ea33ead..5f33bce 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