From: Bin Meng <bmeng.cn@gmail.com>
Date: Tue, 31 Mar 2015 03:51:04 +0000 (+0800)
Subject: x86: Move CONFIG_ENV_IS_IN_SPI_FLASH to x86-common.h
X-Git-Tag: v2025.01-rc5-pxa1908~13102
X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=d21d05f19a7e4f3b27895a835d0e6de6d7951722;p=u-boot.git

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 52657878c6..f2d798a52f 100644
--- 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 df32f2ac52..42042d1825 100644
--- 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 288acf30f1..f780b8fa51 100644
--- 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 823e051eb1..6dbae8faf4 100644
--- 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 9571c656be..07a5aca58f 100644
--- 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
 
 /*-----------------------------------------------------------------------