diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 6 | ||||
| -rw-r--r-- | common/env_embedded.c (renamed from common/environment.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile index cf861c5..fad9bc1 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 diff --git a/common/environment.c b/common/env_embedded.c index 3b9914f..3b9914f 100644 --- a/common/environment.c +++ b/common/env_embedded.c |