diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-06 13:24:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:43 -0400 |
| commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
| tree | b1116470884e46c0a66c49525771cf9b49c3835d /include/configs/trats.h | |
| parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
| parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
| download | talos-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz talos-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.zip | |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'include/configs/trats.h')
| -rw-r--r-- | include/configs/trats.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h index 0c875cb47f..22b0c90ee9 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -242,12 +242,8 @@ #define CONFIG_SYS_WHITE_ON_BLACK /* LCD */ -#define CONFIG_EXYNOS_FB -#define CONFIG_LCD -#define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP #define CONFIG_FB_ADDR 0x52504000 -#define CONFIG_S6E8AX0 #define CONFIG_EXYNOS_MIPI_DSIM #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) |
