Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

[platform/kernel/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 155d7fe..918aa3d 100644 (file)
--- a/include/configs/xilinx_zynqmp_r5.h
+++ b/include/configs/xilinx_zynqmp_r5.h
@@ -6,40 +6,18 @@
 #ifndef __CONFIG_ZYNQMP_R5_H
 #define __CONFIG_ZYNQMP_R5_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
-
-/* CPU clock */
-#define CONFIG_CPU_FREQ_HZ     500000000
+#define CFG_EXTRA_ENV_SETTINGS
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  \
+#define CFG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* Boot configuration */
-#define CONFIG_SYS_LOAD_ADDR           0 /* default? */
-
-#define CONFIG_SYS_MAXARGS             32 /* max number of command args */
 
-#define CONFIG_SYS_MALLOC_LEN          0x1400000
-
-#define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
-#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
-                                       CONFIG_SYS_INIT_RAM_SIZE - \
-                                       GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_RAM_ADDR  0xFFFF0000
+#define CFG_SYS_INIT_RAM_SIZE  0x1000
 
 /* Extend size of kernel image for uncompression */
-#define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
-
-#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 */