From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marex@denx.de>
Date: Fri, 11 Dec 2015 15:24:13 +0100
Subject: [U-Boot] [PATCH 1/6] arm: socfpga: cyclone5-socdk: Enabling
	U-Boot environment in QSPI
In-Reply-To: <1449825468-2633-1-git-send-email-clsee@altera.com>
References: <1449825468-2633-1-git-send-email-clsee@altera.com>
Message-ID: <201512111524.13803.marex@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Friday, December 11, 2015 at 10:17:47 AM, Chin Liang See wrote:
> Enabling the support of storing U-Boot environment
> within serial NOR flash. By default, its still
> store into SDMMC
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/configs/socfpga_cyclone5_socdk.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/include/configs/socfpga_cyclone5_socdk.h
> b/include/configs/socfpga_cyclone5_socdk.h index e4a1657..fbab0bd 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -58,9 +58,17 @@
> 
>  #endif
> 
> +/* U-Boot environment */
>  #define CONFIG_ENV_IS_IN_MMC
> +#undef CONFIG_ENV_IS_IN_SPI_FLASH

Drop the undef please , we don't want this to confuse Kconfig later.

> +#ifdef CONFIG_ENV_IS_IN_MMC
>  #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
>  #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
> +#elif CONFIG_ENV_IS_IN_SPI_FLASH
> +#define CONFIG_ENV_SECT_SIZE		(64 * 1024)
> +#define CONFIG_ENV_OFFSET		0x400000
> +#endif
> 
>  /* USB */
>  #ifdef CONFIG_CMD_USB
> --
> 1.9.2.468.g3f0c02a

Best regards,
Marek Vasut