diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 22:24:28 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 22:24:28 +0200 |
| commit | cac423a730d3506154744485af1bbc1cd3a1e6a8 (patch) | |
| tree | 358b627972d9125de573c623f33e2da789f1de51 /include/configs/omap5_uevm.h | |
| parent | c1b43ac7699640c8086bd73faa798bc9722d32c9 (diff) | |
| parent | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (diff) | |
| download | u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.zip u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.gz u-boot-imx-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.bz2 | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap5_uevm.h')
| -rw-r--r-- | include/configs/omap5_uevm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 550cabd..9e0339b 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -37,7 +37,7 @@ /* TWL6035 */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_TWL6035_POWER +#define CONFIG_PALMAS_POWER #endif /* MMC ENV related defines */ @@ -56,4 +56,5 @@ #define CONFIG_SYS_PROMPT "OMAP5430 EVM # " +#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 #endif /* __CONFIG_OMAP5_EVM_H */ |