diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-10 09:28:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-10 09:28:16 -0500 |
| commit | e5aa3f4d97b11271c3a2407e272a131b7e975c61 (patch) | |
| tree | 55d66c2e34af73a4721df02368e6348e89708499 /include | |
| parent | 43a6a1ec9055a53a11d6d735f11cceea13912bbe (diff) | |
| parent | d4a0c098925d4594355506a12ae0dbbe6eed00f2 (diff) | |
Merge tag 'u-boot-imx-20190110' of git://git.denx.de/u-boot-imx
Fixes for 2019.01
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/m53menlo.h | 3 | ||||
| -rw-r--r-- | include/configs/tbs2910.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 3fca28da6b..0e03bb31a7 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -157,6 +157,9 @@ /* IIM Fuses */ #define CONFIG_FSL_IIM +/* Watchdog */ +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 + /* * Boot Linux */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index a60223c623..2d4b9c9bfe 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -122,6 +122,8 @@ #define CONFIG_ENV_OFFSET (384 * 1024) #define CONFIG_ENV_OVERWRITE +#define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ + #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \ "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \ |