projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/mpc83xx: convert MPC8313ERDB to new-SPL
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mpc8313erdb
/
mpc8313erdb.c
diff --git
a/board/freescale/mpc8313erdb/mpc8313erdb.c
b/board/freescale/mpc8313erdb/mpc8313erdb.c
index
1071803
..
648f0ec
100644
(file)
--- 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>
#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
#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 (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
mpc83xx_gpio_init_f();
#endif
@@
-54,7
+54,7
@@
int board_early_init_f(void)
int board_early_init_r(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
mpc83xx_gpio_init_r();
#endif
@@
-67,7
+67,7
@@
int checkboard(void)
return 0;
}
return 0;
}
-#ifndef CONFIG_
NAND_SPL
+#ifndef CONFIG_
SPL_BUILD
static struct pci_region pci_regions[] = {
{
.bus_start = CONFIG_SYS_PCI1_MEM_BASE,
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
#endif
}
#endif
-#else /* CONFIG_
NAND_SPL
*/
+#else /* CONFIG_
SPL_BUILD
*/
void board_init_f(ulong bootflag)
{
board_early_init_f();
void board_init_f(ulong bootflag)
{
board_early_init_f();