diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
| commit | 3deb22a4844cbda1a05c60dd29d8926e4dddaa4e (patch) | |
| tree | 767063f0d9e0acfd7445db47abf0d4ac94abdc1d /arch/arm/cpu/armv7/am33xx | |
| parent | 3b31605aef069d183a9d0c1e3aa6f957503cd56b (diff) | |
| parent | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff) | |
| download | u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.zip u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.gz u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/emif4.c | 2 |
2 files changed, 2 insertions, 4 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) { /* diff --git a/arch/arm/cpu/armv7/am33xx/emif4.c b/arch/arm/cpu/armv7/am33xx/emif4.c index 3e39752..2c67c32 100644 --- a/arch/arm/cpu/armv7/am33xx/emif4.c +++ b/arch/arm/cpu/armv7/am33xx/emif4.c @@ -35,7 +35,7 @@ void dram_init_banksize(void) } -#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) +#ifndef CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_TI81XX static struct dmm_lisa_map_regs *hw_lisa_map_regs = (struct dmm_lisa_map_regs *)DMM_BASE; |