Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / include / configs / xilinx_zynqmp_r5.h

diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h
index 05105e5d44e85d43a3367d63e96083158f86be0b..c6cf82e244553bef73eff15c861a813664269743 100644 (file)
--- a/include/configs/xilinx_zynqmp_r5.h
+++ b/include/configs/xilinx_zynqmp_r5.h
@@ -16,8 +16,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-# define CONFIG_ENV_SIZE       (128 << 10)
-
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
@@ -26,8 +24,6 @@
 
 #define CONFIG_SYS_MAXARGS             32 /* max number of command args */
 
-#define CONFIG_NR_DRAM_BANKS           1
-
 #define CONFIG_SYS_MALLOC_LEN          0x1400000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
@@ -39,13 +35,6 @@
 /* Extend size of kernel image for uncompression */
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 
-#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
-
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-/* 0x0 - 0x40 is used for placing exception vectors */
-#define CONFIG_SYS_MEMTEST_START       0x40
-#define CONFIG_SYS_MEMTEST_END         0x100
-#define CONFIG_SYS_MEMTEST_SCRATCH     0
-
 #endif /* __CONFIG_ZYNQ_ZYNQMP_R5_H */