diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-08 15:44:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-08 15:44:44 -0400 |
| commit | a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc (patch) | |
| tree | a20f104d8896941c598f2fcb61ce26c327959cd9 /include | |
| parent | ee3c6532be343e495d11adfe15a457d24d9747d9 (diff) | |
| parent | 5a49b2929c0c73e43470cc53b80a6dfa47b5efda (diff) | |
| download | u-boot-a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc.zip u-boot-a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc.tar.gz u-boot-a6d4cd4778bcc30f451f2d5d92ec4722ff5b71cc.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 64a1900..997a92c 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -211,11 +211,13 @@ #if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \ defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \ defined CONFIG_I2C4_ENABLE || defined CONFIG_R_I2C_ENABLE -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MVTWSI +#ifndef CONFIG_DM_I2C +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x7f #endif +#endif #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD) #define CONFIG_SYS_I2C_SOFT @@ -473,6 +475,11 @@ extern int soft_i2c_gpio_scl; #define CONSOLE_STDOUT_SETTINGS \ "stdout=serial,vga\0" \ "stderr=serial,vga\0" +#elif CONFIG_DM_VIDEO +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONSOLE_STDOUT_SETTINGS \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" #else #define CONSOLE_STDOUT_SETTINGS \ "stdout=serial\0" \ |