summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:00 +0200
commit2556ef78113b5f089dfcac5da90bf31dd568397b (patch)
tree1408dfcadfd046449060c058631c3938c7843284
parent0b5099a8419bf9c828df5e3e2c6878dc300d98e3 (diff)
downloadu-boot-imx-2556ef78113b5f089dfcac5da90bf31dd568397b.zip
u-boot-imx-2556ef78113b5f089dfcac5da90bf31dd568397b.tar.gz
u-boot-imx-2556ef78113b5f089dfcac5da90bf31dd568397b.tar.bz2
env_sf: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--common/Makefile2
-rw-r--r--common/env_sf.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile
index a9d66ae..e171ae0 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 */