diff options
| author | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
| commit | 362f16b1e9e94024a511adae9977d145ef942b50 (patch) | |
| tree | e0e359fb074493fa8deab65abe0feb4b8fefde3a /arch/arm/cpu/armv7/omap-common/hwinit-common.c | |
| parent | 302e609fe653baf1ae3a7573d2f4eafd86ab696b (diff) | |
| parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
| download | blackbird-obmc-uboot-362f16b1e9e94024a511adae9977d145ef942b50.tar.gz blackbird-obmc-uboot-362f16b1e9e94024a511adae9977d145ef942b50.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/hwinit-common.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 5f50a19801..1b4477f469 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -123,7 +123,8 @@ void s_init(void) hw_data_init(); #ifdef CONFIG_SPL_BUILD - if (warm_reset() && (omap_revision() <= OMAP5430_ES1_0)) + if (warm_reset() && + (is_omap44xx() || (omap_revision() == OMAP5430_ES1_0))) force_emif_self_refresh(); #endif watchdog_init(); |
