diff --git a/common/Makefile b/common/Makefile
index cb3a7425f7476ef1f4fa6fe605ecc8587ca97601..a9d66ae157c77afd1a0f613b069e84c0716c7048 100644
--- a/common/Makefile
+++ b/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
 
diff --git a/common/env_onenand.c b/common/env_onenand.c
index 4e466eaa4e16cc33a909d055692b8c491f25435c..09a79d01918acde9250c6467e6611ed3d39507a6 100644
--- a/common/env_onenand.c
+++ b/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 */