From 2556ef78113b5f089dfcac5da90bf31dd568397b Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:48:00 +0200 Subject: [PATCH] env_sf: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 2 +- common/env_sf.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common/Makefile b/common/Makefile index a9d66ae157..e171ae0b4c 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 a4427764f2..faf62608b4 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -26,9 +26,6 @@ * MA 02111-1307 USA */ #include - -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH - #include #include @@ -135,5 +132,3 @@ int env_init(void) return 0; } - -#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */ -- 2.30.2