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/smdk5420.h | |
| parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
| parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
| download | blackbird-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz blackbird-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/smdk5420.h')
| -rw-r--r-- | include/configs/smdk5420.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index c15acec89d..a46ca74166 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -13,6 +13,10 @@ #include <configs/exynos5-dt-common.h> #include <configs/exynos5-common.h> +#undef CONFIG_LCD +#undef CONFIG_EXYNOS_FB +#undef CONFIG_EXYNOS_DP + #undef CONFIG_KEYBOARD #define CONFIG_BOARD_COMMON |
