leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env_flash: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-09-10 22:48:04 +02:00
parent 5a1aceb068
commit 507641d249
2 changed files with 1 additions and 6 deletions

2
common/Makefile
View File

@ -52,7 +52,7 @@ COBJS-y += env_common.o
COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-y += env_embedded.o
COBJS-y += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += 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

5
common/env_flash.c
View File

@ -27,9 +27,6 @@
/* #define DEBUG */
#include <common.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
@ -383,5 +380,3 @@ void env_relocate_spec (void)
#endif
#endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
}
#endif /* CONFIG_ENV_IS_IN_FLASH */