diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-25 14:49:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-25 14:49:54 -0400 |
| commit | fd42e1b589b5ae7e89dc327a70e5852999a23aeb (patch) | |
| tree | 7f5a4ada7b95af8b94b7dc86638cde9a2663f88c /board/sunxi | |
| parent | e312e745db7bcde95c759986d218e8ab5259f64f (diff) | |
| parent | 59441ac3c135c412c679bdd1c82c8f2a9b805bbc (diff) | |
Merge git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board/sunxi')
| -rw-r--r-- | board/sunxi/board.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index f6e28b050d..36cf96381c 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -136,7 +136,7 @@ int dram_init(void) return 0; } -#if defined(CONFIG_NAND_SUNXI) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_NAND_SUNXI) static void nand_pinmux_setup(void) { unsigned int pin; @@ -173,6 +173,9 @@ void board_nand_init(void) { nand_pinmux_setup(); nand_clock_setup(); +#ifndef CONFIG_SPL_BUILD + sunxi_nand_init(); +#endif } #endif |