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>

diff --git a/common/Makefile b/common/Makefile
index e0db38264c27c49013af3ac5ff24fc97712a2326..abea91cb7775f84ee76abdf08b815722abc5f662 100644 (file)
--- 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))