commit 4da8899bb73b02c2dc29802e9690b7351d085759
author Michal Simek <michal.simek@xilinx.com> Wed Apr 11 16:13:55 2018 +0200
committer Michal Simek <michal.simek@xilinx.com> Mon Apr 23 13:15:32 2018 +0200
tree 8e6ee48ca0a38b71affe146d4ed0591f519d4cf4
parent 1b84621b57df2dfe19d7cfceb770f22001ecbed5

arm: zynq: Make ENV_SIZE and ENV_OFFSET optional via board file

Boards have an option to rewrite variable locations in their own board
files. This is necessary for qspi and nand configurations where boot
image can be bigger then 896k(current limit).

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

include/configs/zynq-common.h

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index ae82a7a..baad8db 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -127,7 +127,9 @@
 #endif
 
 /* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE			(128 << 10)
+#ifndef CONFIG_ENV_SIZE
+# define CONFIG_ENV_SIZE			(128 << 10)
+#endif
 
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -135,7 +137,9 @@
 /* Environment */
 #ifndef CONFIG_ENV_IS_NOWHERE
 # define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
-# define CONFIG_ENV_OFFSET		0xE0000
+# ifndef CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET		0xE0000
+# endif
 #endif
 
 /* enable preboot to be loaded before CONFIG_BOOTDELAY */