Skip to content
Snippets Groups Projects
Commit d21d05f1 authored by Bin Meng's avatar Bin Meng Committed by Simon Glass
Browse files

x86: Move CONFIG_ENV_IS_IN_SPI_FLASH to x86-common.h


Since all x86 boards use spi flash as its bootloader storage media,
it makes sense to make CONFIG_ENV_IS_IN_SPI_FLASH a common option.
So far only minnowmax board does not support it so undefine it in
its board configuration file.

Signed-off-by: default avatarBin Meng <bmeng.cn@gmail.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent 9704f23b
No related branches found
No related tags found
No related merge requests found
...@@ -16,4 +16,7 @@ ...@@ -16,4 +16,7 @@
#include <configs/x86-common.h> #include <configs/x86-common.h>
#include <configs/x86-chromebook.h> #include <configs/x86-chromebook.h>
#define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0x003f8000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
#undef CONFIG_CFB_CONSOLE #undef CONFIG_CFB_CONSOLE
/* Environment configuration */ /* Environment configuration */
#undef CONFIG_ENV_IS_NOWHERE
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0 #define CONFIG_ENV_OFFSET 0
......
...@@ -63,10 +63,6 @@ ...@@ -63,10 +63,6 @@
#define CONFIG_PHYLIB #define CONFIG_PHYLIB
/* Environment configuration */ /* Environment configuration */
#undef CONFIG_ENV_IS_NOWHERE
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0 #define CONFIG_ENV_OFFSET 0
......
...@@ -69,4 +69,8 @@ ...@@ -69,4 +69,8 @@
/* Avoid a warning in the Realtek Ethernet driver */ /* Avoid a warning in the Realtek Ethernet driver */
#define CONFIG_SYS_CACHELINE_SIZE 16 #define CONFIG_SYS_CACHELINE_SIZE 16
/* Environment in SPI flash is unsupported for now */
#undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Environment configuration * Environment configuration
*/ */
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x01000 #define CONFIG_ENV_SIZE 0x01000
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment