From: Stefan Roese <sr@denx.de>
Date: Thu, 3 Mar 2016 15:57:38 +0000 (+0100)
Subject: arm: socfpga: Allow boards to define a custom environment size
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ead2fb29e8fc3752e844d5ff4f9e668b42a4e744;p=u-boot.git

arm: socfpga: Allow boards to define a custom environment size

This patch makes it possible that boards can define a board-specific env
size. This is used by the SR1500 SoCFPGA board port.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Marek Vasut <marex@denx.de>
---

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 7b5fe606fd..56d32e6b53 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -284,7 +284,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
+#if !defined(CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE			4096
+#endif
 
 /* Environment for SDMMC boot */
 #if defined(CONFIG_ENV_IS_IN_MMC) && !defined(CONFIG_ENV_OFFSET)