diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-02 11:20:28 +0530 |
| commit | d0fc6571e7c769847836aad3071a3b21a820eae5 (patch) | |
| tree | 2c3f69540a367929200c47bf024ecc5ae2a17dbb /include/configs/nitrogen6x.h | |
| parent | 3fa3bdcfdcb724087762c9dcf6b48e2525bbd6ff (diff) | |
| parent | 90b51c33f362926e17d4c07dcef1ce822abaa89f (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'include/configs/nitrogen6x.h')
| -rw-r--r-- | include/configs/nitrogen6x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f7e7315a9..b2b17ce96 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -24,6 +24,7 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +#define CONFIG_SYS_GENERIC_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) @@ -141,6 +142,7 @@ #define CONFIG_CMD_HDMIDETECT #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI +#define CONFIG_IMX_VIDEO_SKIP /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE |