diff options
| author | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-09 11:18:45 -0400 |
| commit | bcb879c0e37db1cf527ff408df93918f155012ea (patch) | |
| tree | c092b7e27e69b3c419b6cd238768ceb73f793644 /arch/arm/cpu/armv7/am33xx/board.c | |
| parent | 146b468eb0203c9b1aa1de93723ffc82c85d1dc1 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/board.c')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index fb44cc8290..28c16f8d02 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -142,7 +142,7 @@ int arch_misc_init(void) return 0; } -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* * This function is the place to do per-board things such as ramp up the * MPU clock frequency. @@ -200,9 +200,7 @@ static void watchdog_disable(void) while (readl(&wdtimer->wdtwwps) != 0x0) ; } -#endif -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) void s_init(void) { /* |