summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2013-01-16 18:34:09 -0600
committerKim Phillips <kim.phillips@freescale.com>2013-01-16 18:34:09 -0600
commita6187dccd813920524987792e49ef2feffb213e6 (patch)
tree6825884dd47867575aa29cd35f1cb248a91c313e /board/freescale
parent3a9d879f6f64585b819af728b53be0a05037fe0d (diff)
parent22f4442d12a3833e29b6580f6cf9bc0e55340504 (diff)
downloadu-boot-imx-a6187dccd813920524987792e49ef2feffb213e6.zip
u-boot-imx-a6187dccd813920524987792e49ef2feffb213e6.tar.gz
u-boot-imx-a6187dccd813920524987792e49ef2feffb213e6.tar.bz2
Merge remote-tracking branch 'mpc83xx/next'
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/mpc8313erdb/mpc8313erdb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
index 1071803..648f0ec 100644
--- a/board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
@@ -31,7 +31,7 @@
#include <vsc7385.h>
#include <ns16550.h>
#include <nand.h>
-#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_NAND_SPL)
+#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_SPL_BUILD)
#include <asm/gpio.h>
#endif
@@ -45,7 +45,7 @@ int board_early_init_f(void)
if (im->pmc.pmccr1 & PMCCR1_POWER_OFF)
gd->flags |= GD_FLG_SILENT;
#endif
-#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_NAND_SPL)
+#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_SPL_BUILD)
mpc83xx_gpio_init_f();
#endif
@@ -54,7 +54,7 @@ int board_early_init_f(void)
int board_early_init_r(void)
{
-#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_NAND_SPL)
+#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_SPL_BUILD)
mpc83xx_gpio_init_r();
#endif
@@ -67,7 +67,7 @@ int checkboard(void)
return 0;
}
-#ifndef CONFIG_NAND_SPL
+#ifndef CONFIG_SPL_BUILD
static struct pci_region pci_regions[] = {
{
.bus_start = CONFIG_SYS_PCI1_MEM_BASE,
@@ -140,7 +140,7 @@ void ft_board_setup(void *blob, bd_t *bd)
#endif
}
#endif
-#else /* CONFIG_NAND_SPL */
+#else /* CONFIG_SPL_BUILD */
void board_init_f(ulong bootflag)
{
board_early_init_f();