diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-08 10:18:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-08 10:18:18 -0500 |
| commit | b685c7348c521b14591a49ec6b78a2ad28a176e0 (patch) | |
| tree | c2f85f890fd93241dbc36c5ff73106a49e587484 /include | |
| parent | 7ba34ff09f1ef105521f914e4ad4e4ac19975bac (diff) | |
| parent | 587c3f8ebe356b558f1876414885c1b4a31294ab (diff) | |
| download | blackbird-obmc-uboot-b685c7348c521b14591a49ec6b78a2ad28a176e0.tar.gz blackbird-obmc-uboot-b685c7348c521b14591a49ec6b78a2ad28a176e0.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 2 | ||||
| -rw-r--r-- | include/fsl_wdog.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 2712b27fd1..c946176416 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -241,6 +241,7 @@ #define CONFIG_IMX_THERMAL +#ifndef CONFIG_SPL_BUILD #define CONFIG_VIDEO #ifdef CONFIG_VIDEO #define CONFIG_CFB_CONSOLE @@ -257,5 +258,6 @@ #define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif +#endif #endif diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h index d15a70cedb..f698d4d64e 100644 --- a/include/fsl_wdog.h +++ b/include/fsl_wdog.h @@ -16,3 +16,4 @@ struct watchdog_regs { #define WCR_WDT 0x08 #define WCR_SRS 0x10 #define SET_WCR_WT(x) (x << 8) +#define WCR_WT_MSK SET_WCR_WT(0xFF) |
