aboutsummaryrefslogtreecommitdiffstats
path: root/common/Makefile
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:01 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:01 +0200
commit0cf4fd3cf8d0e00605bec5fc56f89c6415015a46 (patch)
tree2a878fa9d848eb8820c64168a006b3ec5c1afc5e /common/Makefile
parentc0878af6e32f0fd8e13a6ca315b9add64441115a (diff)
downloadu-boot-midas-0cf4fd3cf8d0e00605bec5fc56f89c6415015a46.tar.gz
u-boot-midas-0cf4fd3cf8d0e00605bec5fc56f89c6415015a46.tar.bz2
u-boot-midas-0cf4fd3cf8d0e00605bec5fc56f89c6415015a46.zip
rename environment.c in env_embedded.c to reflect is functionality
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/Makefile')
-rw-r--r--common/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile
index cf861c575c..fad9bc1b61 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -48,10 +48,10 @@ COBJS-y += cmd_bootm.o
COBJS-y += cmd_nvedit.o
# environment
-COBJS-y += environment.o
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_NAND) += env_nand.o
COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
@@ -167,10 +167,10 @@ all: $(LIB) $(AOBJS)
$(LIB): $(obj).depend $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)
-$(obj)environment.o: $(src)environment.c $(obj)../tools/envcrc
+$(obj)env_embedded.o: $(src)env_embedded.c $(obj)../tools/envcrc
$(CC) $(AFLAGS) -Wa,--no-warn \
-DENV_CRC=$(shell $(obj)../tools/envcrc) \
- -c -o $@ $(src)environment.c
+ -c -o $@ $(src)env_embedded.c
$(obj)../tools/envcrc:
$(MAKE) -C ../tools