ARM: zynq: Read memory size setting from DT

OF_CONTROL is setup by default and memory reading is done via DT. Remove
all config files with memory references.

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

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 01bae5d67e3f9ee686013a4db934a7ff9cac9144..2f17e977a4b3627370633362cd23cf7d279c2cf9 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -100,7 +100,6 @@ int checkboard(void)
 
 int dram_init(void)
 {
-#if CONFIG_IS_ENABLED(OF_CONTROL)
        int node;
        fdt_addr_t addr;
        fdt_size_t size;
@@ -118,9 +117,6 @@ int dram_init(void)
                return -1;
        }
        gd->ram_size = size;
-#else
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
-#endif
        zynq_ddrc_init();
 
        return 0;

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index 7396ff9bd967af1a43f9e5c281f69e5fe2caccf2..e66088da4f795961ec4bc30e6b41de4a281a2c83 100644 (file)
--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_MICROZED_H
 #define __CONFIG_ZYNQ_MICROZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index 3d2bed25e5afddf3ce4562c9c73515b47149a252..1fc57e1e0fca58e48b429388bd266e9d031c00e0 100644 (file)
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_PICOZED_H
 #define __CONFIG_ZYNQ_PICOZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index a84688cff2c5390af9053f26c375a32824a1f0de..2e7056ab1ff0d80220f6a96a3a7cd8af2116286e 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 6121c099c29742e0b403a75b27ae072eed0fc5c1..35622ae34649955f5953baae00f7ebd1ce6ea468 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZC770_H
 #define __CONFIG_ZYNQ_ZC770_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #if defined(CONFIG_ZC770_XM012)

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 212053102b04ecf8d5413e1071f76663a1bd8c5f..6f3915a0f86a3035dd74cf9dd6aa5a1a014c6984 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZED_H
 #define __CONFIG_ZYNQ_ZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (512 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 28d8f93f408df0a3e6fb0d63c41b8df09ef6ea00..5287512d185cc09508c8ca45e0cb7531710651a6 100644 (file)
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_ZYNQ_ZYBO_H
 #define __CONFIG_ZYNQ_ZYBO_H
 
-#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB