ARM: zynq: Use memory initialization based on DTS file

Remove hardcoded memory sizes. Use information from DT memory node.

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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 7c7195cbbb30711acb265f61e8246073b6632659..381c1bc8a175c525defa2db7dbb439f28cb60bcb 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -370,7 +370,6 @@
 #endif
 
 #define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_SDRAM_BASE          0
 
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x1000)

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index 95e148591cdb000a474165acb0a6656d7c545315..23ebe62045e2f705c88c413bd1fba490af31c648 100644 (file)
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_AFX_H
 #define __CONFIG_ZYNQ_AFX_H
 
-#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 #if defined(CONFIG_AFX_NOR)
 # undef CONFIG_SYS_NO_FLASH

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index 8b4c1fa79c9d97657e8b35741c7716c929be533b..bc504045cae087290c40b2b3e03ea5963a7dd091 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
 
 #define CONFIG_ZYNQ_SDHCI0

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index 6a7298797d628c6149232f6e15079d253c25850d..ce803fa29a13ed70af5a73597ed8159bc5221116 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_SDHCI1

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index e5e449afcacb0ac7b353210faf132d156109d055..b7521131c6f6718f385b56845488619eb5ac40f9 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_SDHCI0

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 3d7306428b6d3228d7789e7fbe575d95213a0303..33db700870c01ca53ed7bb1a9eb872b44cab6d3b 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_XM010)

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 8482b63a68c92197e8717f8cf6c46126408b1343..9994e723ce109b82429319b11f9dcecb11b5b5e2 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 81382477bd0d03aa9c5a9e16065b736af22f0e4d..e0844bac9a5f447a70c1a32544788f06b566eb7f 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