commit 82a333b1ec3be7d73e028d9225ad4c018d014468
author Luis Araneda <luaraneda@gmail.com> Thu Sep 13 01:02:07 2018 -0300
committer Michal Simek <michal.simek@xilinx.com> Wed Sep 26 10:15:00 2018 +0200
tree 4c0b4d9260a83a8485ce13671fce504aa1ddc09e
parent 9a6dc34ec4d2e608f0a0a65851bb4bd2a7812946

arm: zynq: zybo: migrate CONFIG_DISPLAY to defconfig

Only add CONFIG_DISPLAY to defconfig because CONFIG_I2C_EDID
is automatically selected by CONFIG_DISPLAY

Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

configs/zynq_zybo_defconfig

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 46a8f5a..8293171 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -72,3 +72,4 @@
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_DISPLAY=y

include/configs/zynq_zybo.h

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 547ecb6..7d00b41 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -12,8 +12,6 @@
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR	0x50
-#define CONFIG_DISPLAY
-#define CONFIG_I2C_EDID
 
 #include <configs/zynq-common.h>