ARM: zynqmp: Setup CONFIG_FIT/VERBOSE via defconfig

Do not hardcode setting which can be done via menuconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 12b567d13b70075762dbac60dc6ec0f4e440fee2..8fab64f9b281a625b5ec2868e84cdae3e90a36d5 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -4,6 +4,8 @@ CONFIG_ZYNQMP_QSPI=y
 CONFIG_NAND_ARASAN=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_TFTPPUT=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d37b93b3f51a2783554016252d564533a9b3386a..53c5d1d5217dcb98958a1a55a3a74a03ed50d98c 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -233,9 +233,6 @@
 #define CONFIG_CMD_SCSI
 #endif
 
-#define CONFIG_FIT
-#define CONFIG_FIT_VERBOSE       /* enable fit_format_{error,warning}() */
-
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 
 #define CONFIG_CMD_BOOTI

diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 3c247bb8216dbb3e7fac5c72ad1ef60aefbae221..ce1ed4bfaf2d861fd34ee3957a66e63a029bea4f 100644 (file)
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -29,8 +29,6 @@
 #undef CONFIG_OF_LIBFDT
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #undef CONFIG_BOARD_LATE_INIT
-#undef CONFIG_FIT
-#undef CONFIG_FIT_VERBOSE
 #undef CONFIG_CMD_BOOTZ
 #undef CONFIG_BOOTCOMMAND
 #undef CONFIG_SYS_HUSH_PARSER