diff options
| author | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
| commit | 5a1095a830299aef8dd32495e505e92ab1749e89 (patch) | |
| tree | 9383de2534455119d51200bc87766a330591df27 /common | |
| parent | 6af857c50df4e62ec08e51ad73c96f63f1480386 (diff) | |
| parent | d145878d59c80a44d8c6e6d606b898ab87d205ee (diff) | |
| download | blackbird-obmc-uboot-5a1095a830299aef8dd32495e505e92ab1749e89.tar.gz blackbird-obmc-uboot-5a1095a830299aef8dd32495e505e92ab1749e89.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index 11aa55597b..4ece2b6c9f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -34,6 +34,9 @@ #ifdef CONFIG_MPC5xxx #include <mpc5xxx.h> #endif +#if (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) +#include <asm/mp.h> +#endif #include <os.h> #include <post.h> @@ -43,9 +46,6 @@ #include <watchdog.h> #include <asm/errno.h> #include <asm/io.h> -#ifdef CONFIG_MP -#include <asm/mp.h> -#endif #include <asm/sections.h> #ifdef CONFIG_X86 #include <asm/init_helpers.h> @@ -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_MP) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500)) +#if (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 |
