summaryrefslogtreecommitdiff
path: root/board/freescale/mpc8313erdb/mpc8313erdb.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-12-06 13:33:18 +0000
committerKim Phillips <kim.phillips@freescale.com>2012-12-19 17:45:54 -0600
commit22f4442d12a3833e29b6580f6cf9bc0e55340504 (patch)
tree56f14ace95b011262a7452e34ec6446636507b8d /board/freescale/mpc8313erdb/mpc8313erdb.c
parent06f60ae3e454e15a410a0d4e96769bf938af8fcb (diff)
downloadu-boot-imx-22f4442d12a3833e29b6580f6cf9bc0e55340504.zip
u-boot-imx-22f4442d12a3833e29b6580f6cf9bc0e55340504.tar.gz
u-boot-imx-22f4442d12a3833e29b6580f6cf9bc0e55340504.tar.bz2
powerpc/mpc83xx: convert MPC8313ERDB to new-SPL
This converts MPC8313ERDB NAND boot to use the new SPL infrastructure. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/freescale/mpc8313erdb/mpc8313erdb.c')
-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();