summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Araneda <luaraneda@gmail.com>2018-09-13 01:02:07 -0300
committerMichal Simek <michal.simek@xilinx.com>2018-09-26 10:15:00 +0200
commit50f56e50d05aac364be1f05e0bed78fb344cb043 (patch)
tree4c0b4d9260a83a8485ce13671fce504aa1ddc09e
parentf213dbbdeca6d2444bfe90d9b422de056bc4d369 (diff)
downloadu-boot-50f56e50d05aac364be1f05e0bed78fb344cb043.tar.gz
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>
-rw-r--r--configs/zynq_zybo_defconfig1
-rw-r--r--include/configs/zynq_zybo.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 46a8f5a0de..82931713a2 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -72,3 +72,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_FUNCTION_THOR=y
+CONFIG_DISPLAY=y
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 547ecb68fd..7d00b412a7 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>