Browse Source

env_onenand: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Jean-Christophe PLAGNIOL-VILLARD 16 years ago
parent
commit
55c5f49910
2 changed files with 1 additions and 6 deletions
  1. 1 1
      common/Makefile
  2. 0 5
      common/env_onenand.c

+ 1 - 1
common/Makefile

@@ -55,7 +55,7 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
-COBJS-y += env_onenand.o
+COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
 COBJS-y += env_sf.o
 COBJS-y += env_nowhere.o
 

+ 0 - 5
common/env_onenand.c

@@ -22,9 +22,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -126,5 +123,3 @@ int env_init(void)
 
 	return 0;
 }
-
-#endif /* CONFIG_ENV_IS_IN_ONENAND */