diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-11-20 15:04:02 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-26 22:08:19 +0100 |
| commit | 0390e267058b73a96a4878a5d9257af6d0684850 (patch) | |
| tree | 599e37e4bd65e07eed36de0e21c259419eb9e508 /common | |
| parent | 84db715ea4b593dcd49ebad72ee647e62e2414cc (diff) | |
| download | u-boot-imx-0390e267058b73a96a4878a5d9257af6d0684850.zip u-boot-imx-0390e267058b73a96a4878a5d9257af6d0684850.tar.gz u-boot-imx-0390e267058b73a96a4878a5d9257af6d0684850.tar.bz2 | |
common/Makefile: don't include env_embedded.o into libcommon
Some boards use an embedded environment, where env_embedded.o has to
be linked at a special position in the U-Boot image; to make this
possible, we do not include it into libcommon.o for such boards.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index e0db382..abea91c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -25,8 +25,6 @@ include $(TOPDIR)/config.mk LIB = $(obj)libcommon.o -AOBJS = - # core COBJS-y += main.o COBJS-y += console.o @@ -52,9 +50,9 @@ COBJS-y += cmd_version.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-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o +XCOBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o -COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o +XCOBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o @@ -169,12 +167,14 @@ COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o COBJS := $(sort $(COBJS-y)) -SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) +XCOBJS := $(sort $(XCOBJS-y)) +SRCS := $(COBJS:.o=.c) $(XCOBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +XOBJS := $(addprefix $(obj),$(XCOBJS)) CPPFLAGS += -I.. -all: $(LIB) $(AOBJS) +all: $(LIB) $(XOBJS) $(LIB): $(obj).depend $(OBJS) $(call cmd_link_o_target, $(OBJS)) |