Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
* 'master' of git://git.denx.de/u-boot-mpc83xx: mpc8313erdb: fix mtdparts address powerpc/83xx/km: add support for 8321 based tuge1 board powerpc/83xx/km: merge tuxa and tuda1 boards to tuxx1 powerpc/83xx/km: remove obsolete defines for tuda1 powerpc/83xx/km: update SDRAM parameters for km8321 boards mpc8313erdb: Enable GPIO support on the MPC8313E RDB mpc83xx: Add a GPIO driver for the MPC83XX family gpio: Replace ARM gpio.h with the common API in include/asm-generic gpio: Modify common gpio.h to more closely match Linux
This commit is contained in:
@@ -31,6 +31,9 @@
|
||||
#include <vsc7385.h>
|
||||
#include <ns16550.h>
|
||||
#include <nand.h>
|
||||
#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_NAND_SPL)
|
||||
#include <asm/gpio.h>
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
@@ -42,6 +45,18 @@ 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)
|
||||
mpc83xx_gpio_init_f();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int board_early_init_r(void)
|
||||
{
|
||||
#if defined(CONFIG_MPC83XX_GPIO) && !defined(CONFIG_NAND_SPL)
|
||||
mpc83xx_gpio_init_r();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user