Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

[karo-tx-uboot.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 749d994230939d1a680cc1a248ddcc0f9bc3361a..619c9f2acbd08e85408ae5eb311be8ea0b6da3c2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -41,6 +41,7 @@ include $(TOPDIR)/config.mk
 # Enable all the config-independent tools
 ifneq ($(HOST_TOOLS_ALL),)
 CONFIG_LCD_LOGO = y
+CONFIG_CMD_LOADS = y
 CONFIG_CMD_NET = y
 CONFIG_INCA_IP = y
 CONFIG_NETCONSOLE = y
@@ -115,9 +116,15 @@ endif
 ifeq ($(VENDOR),esd)
 LOGO_BMP= logos/esd.bmp
 endif
+ifeq ($(VENDOR),freescale)
+LOGO_BMP= logos/freescale.bmp
+endif
 ifeq ($(VENDOR),ronetix)
 LOGO_BMP= logos/ronetix.bmp
 endif
+ifeq ($(VENDOR),syteco)
+LOGO_BMP= logos/syteco.bmp
+endif
 
 # now $(obj) is defined
 HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
@@ -138,7 +145,8 @@ HOSTCPPFLAGS =      -idirafter $(SRCTREE)/include \
                -idirafter $(OBJTREE)/include \
                -I $(SRCTREE)/lib/libfdt \
                -I $(SRCTREE)/tools \
-               -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
+               -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
+               -DUSE_HOSTCC \
                -D__KERNEL_STRICT_NAMES