summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-02-04 11:03:20 +0100
committerMichal Simek <michal.simek@xilinx.com>2016-02-22 16:21:02 +0100
commitd9f317fd0d46beebeeeb5be8f3c7d925ed6174fd (patch)
tree871b811cee8f908954b6802bbec40f5a578b9da6
parentce0335f2b49967e707ac3cf237be878c9081d931 (diff)
downloadu-boot-imx-d9f317fd0d46beebeeeb5be8f3c7d925ed6174fd.zip
u-boot-imx-d9f317fd0d46beebeeeb5be8f3c7d925ed6174fd.tar.gz
u-boot-imx-d9f317fd0d46beebeeeb5be8f3c7d925ed6174fd.tar.bz2
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>
-rw-r--r--board/xilinx/zynq/board.c4
-rw-r--r--include/configs/zynq_microzed.h2
-rw-r--r--include/configs/zynq_picozed.h2
-rw-r--r--include/configs/zynq_zc70x.h2
-rw-r--r--include/configs/zynq_zc770.h2
-rw-r--r--include/configs/zynq_zed.h2
-rw-r--r--include/configs/zynq_zybo.h2
7 files changed, 0 insertions, 16 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 01bae5d..2f17e97 100644
--- 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 7396ff9..e66088d 100644
--- 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 3d2bed2..1fc57e1 100644
--- 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 a84688c..2e7056a 100644
--- 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 6121c09..35622ae 100644
--- 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 2120531..6f3915a 100644
--- 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 28d8f93..5287512 100644
--- 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