Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/Makefile | 2 +- common/env_sf.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/common/Makefile b/common/Makefile index 4f333df..bc89741 100644 --- a/common/Makefile +++ b/common/Makefile @@ -56,7 +56,7 @@ COBJS-y += env_flash.o COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o -COBJS-y += env_sf.o +COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o COBJS-y += env_nowhere.o
# command diff --git a/common/env_sf.c b/common/env_sf.c index a442776..faf6260 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -26,9 +26,6 @@ * MA 02111-1307 USA */ #include <common.h> - -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH - #include <environment.h> #include <spi_flash.h>
@@ -135,5 +132,3 @@ int env_init(void)
return 0; } - -#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */