From: Soren Brinkmann <soren.brinkmann@xilinx.com>
Date: Tue, 29 Oct 2013 20:10:40 +0000 (-0700)
Subject: zynq_common: Allow boards to override env offset
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04dd83b78fafc14578c1debf6e3cff515572bb21;p=thirdparty%2Fu-boot.git

zynq_common: Allow boards to override env offset

Avoid redefinition of the CONFIG_ENV_OFFSET symbol, in case the board
specific config already set it. This allows board configurations to move
the U-Boot environment to a custom offset.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index e20961be501..5bc67094c62 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -203,7 +203,9 @@
 # endif
 
 # define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
-# define CONFIG_ENV_OFFSET		0xE0000
+# ifndef CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET		0xE0000
+# endif
 # define CONFIG_CMD_SAVEENV	/* Command to save ENV to Flash */
 #endif