diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 10:17:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 11:19:00 -0400 |
| commit | 1622559066d890f1b7622be0ede8a5d64de66ef3 (patch) | |
| tree | 3d7a01ff07bff410c6650eae19b704cd0419c254 /include/configs/advantech_dms-ba16.h | |
| parent | 0342e335ba887817ed401e77be324e064ea7031e (diff) | |
| parent | f479cec3b623778c26b23f66dc28cf33100ce089 (diff) | |
| download | u-boot-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/advantech_dms-ba16.h')
| -rw-r--r-- | include/configs/advantech_dms-ba16.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 4886500d6a..30dd9e5966 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -261,6 +261,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 /* Framebuffer */ +#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN @@ -271,6 +272,7 @@ #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#endif #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 |