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

env_nowhere: 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:01 +02:00
parent 93f6d72544
commit c0878af6e3
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@ -57,7 +57,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
COBJS-y += env_nowhere.o COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
# command # command
COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o

5
common/env_nowhere.c
View File

@ -25,9 +25,6 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
#include <command.h> #include <command.h>
#include <environment.h> #include <environment.h>
#include <linux/stddef.h> #include <linux/stddef.h>
@ -61,5 +58,3 @@ int env_init(void)
return (0); return (0);
} }
#endif /* CONFIG_ENV_IS_NOWHERE) */