From d21d05f19a7e4f3b27895a835d0e6de6d7951722 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 31 Mar 2015 11:51:04 +0800 Subject: [PATCH] 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 Acked-by: Simon Glass --- include/configs/chromebook_link.h | 3 +++ include/configs/crownbay.h | 4 ---- include/configs/galileo.h | 4 ---- include/configs/minnowmax.h | 4 ++++ include/configs/x86-common.h | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 5265787..f2d798a 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -16,4 +16,7 @@ #include #include +#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 df32f2a..42042d1 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 288acf3..f780b8f 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 823e051..6dbae8f 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 9571c65..07a5aca 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 /*----------------------------------------------------------------------- -- 2.7.4