common: fix include guards for CONFIG_MP
PATCH 1/1 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.
--- common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/board_f.c +2 -2
@@ -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
Signature · 1 line
2.0.1
PATCH 1/1 common: fix include guards for CONFIG_MP
Quoted 28 lines · Gabriel Huau
This was breaking the build for some boards:
MPC8536DSMPC8536DS_36BITMPC8536DS_SDCARDMPC8536DS_SPIFLASHqemu-ppce500Include only these features for some PPC boards if the configuration for MultiProcessor is enabled.
Signed-off-by Gabriel Huau <[email protected]>Cc Tom Rini <[email protected]>Cc York Sun <[email protected]>--- common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)common/board_f.c +1
-1@@ -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
common/board_f.c static int setup_dest_addr(void) · line 398
Quoted 8 lines
common/board_f.c +1
-1@@ -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
PATCH 1/1 common: fix include guards for CONFIG_MP
In reply to Gabriel HuauQuoted 28 lines · Gabriel Huau
This was breaking the build for some boards:
MPC8536DSMPC8536DS_36BITMPC8536DS_SDCARDMPC8536DS_SPIFLASHqemu-ppce500Include only these features for some PPC boards if the configuration for MultiProcessor is enabled.
Signed-off-by Gabriel Huau <[email protected]>Cc Tom Rini <[email protected]>Cc York Sun <[email protected]>--- common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)common/board_f.c +1
-1@@ -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
common/board_f.c static int setup_dest_addr(void) · line 398
Quoted 8 lines
common/board_f.c +1
-1@@ -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
York
Quoted 10 lines · Gabriel Huau
This was breaking the build for some boards:
MPC8536DSMPC8536DS_36BITMPC8536DS_SDCARDMPC8536DS_SPIFLASHqemu-ppce500Include only these features for some PPC boards if the configuration for MultiProcessor is enabled.
Signed-off-by Gabriel Huau <[email protected]>Cc Tom Rini <[email protected]>Cc York Sun <[email protected]>Acked-by York Sun <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
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>