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: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 52657878c6f3c33bdb8789a68c341bc7f4ed563b..f2d798a52f0b28bc7f2fd157f84b684b9f25f6c6 100644 (file)
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -16,4 +16,7 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
+#define CONFIG_ENV_SECT_SIZE           0x1000
+#define CONFIG_ENV_OFFSET              0x003f8000
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index df32f2ac528df1b2e455c42182f080ee2fc4f18d..42042d18255af0d9e54f981ad7098eb2b4a263f2 100644 (file)
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -61,10 +61,6 @@
 #undef CONFIG_CFB_CONSOLE
 
 /* 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_OFFSET              0
 

diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 288acf30f1b8333c4407be99bfbc9625d174134a..f780b8fa512a2d888dffc3f82669c5b2ce419355 100644 (file)
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -63,10 +63,6 @@
 #define CONFIG_PHYLIB
 
 /* 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_OFFSET              0
 

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 823e051eb11774cfd46e6a4d5f33fd73c351e2b8..6dbae8faf4064c12a9a725a4a9ebdeb1639eb131 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -69,4 +69,8 @@
 /* Avoid a warning in the Realtek Ethernet driver */
 #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 */

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 9571c656be07b87c0098e67db6af80b30f5fd2f0..07a5aca58fd0435682cd3b501b7ef3d06e86b4fc 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -207,7 +207,7 @@
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                        0x01000
 
 /*-----------------------------------------------------------------------