diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 19:01:35 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 19:01:35 (GMT) |
| commit | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (patch) | |
| tree | 65ce91815907466f07e87d8b79eaf19763c282bf /arch/arm/cpu/armv7/am33xx/board.c | |
| parent | 94b972d366c29b92319865e3ded16da062aa8507 (diff) | |
| parent | 2e8f5dc16ad360cc15ea402a1dc4d421a04adbbd (diff) | |
| download | u-boot-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
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 fb44cc8..28c16f8 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) { /* |