| Message ID | 1445585213-6930-1-git-send-email-sr@denx.de |
|---|---|
| State | Deferred |
| Delegated to: | Marek Vasut |
| Headers | show |
On Friday, October 23, 2015 at 09:26:51 AM, Stefan Roese wrote: > This patch enables the usage of board-specific values for the > environment offset and size in SPI NOR flash. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Marek Vasut <marex@denx.de> > Cc: Pavel Machek <pavel@denx.de> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Marek Vasut <marex@denx.de> [...] Best regards, Marek Vasut
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index cece095..ebf0c48 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -281,7 +281,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 +#ifndef CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE 4096 +#endif /* * SPL @@ -327,8 +329,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_DM_SEQ_ALIAS 1 #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD +#ifndef CONFIG_SYS_SPI_U_BOOT_OFFS #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #endif +#endif /* * Stack setup
This patch enables the usage of board-specific values for the environment offset and size in SPI NOR flash. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Marek Vasut <marex@denx.de> Cc: Pavel Machek <pavel@denx.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> --- include/configs/socfpga_common.h | 4 ++++ 1 file changed, 4 insertions(+)