TQM8260: environment in flash instead EEPROM, baudrate 115k

[oweals/u-boot.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 5285055dc84ec8583bbf4b737e0e4eb8c2d29b38..9e9ee15fb87dc4f94ec1e24fa4d83c8b3ba5e1a1 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -23,7 +23,7 @@
 
 BIN_FILES      = img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
 
-OBJ_LINKS      = environment.o crc32.o md5.o sha1.o image.o
+OBJ_LINKS      = env_embedded.o crc32.o md5.o sha1.o image.o
 OBJ_FILES      = img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o
 
 ifeq ($(ARCH),mips)
@@ -44,6 +44,10 @@ LOGO_H       = $(OBJTREE)/include/bmp_logo.h
 ifeq ($(LOGO_BMP),)
 LOGO_BMP= logos/denx.bmp
 endif
+ifeq ($(VENDOR),atmel)
+LOGO_BMP= logos/atmel.bmp
+endif
+
 
 #-------------------------------------------------------------------------
 
@@ -133,7 +137,7 @@ MAKEDEPEND = makedepend
 
 all:   $(obj).depend $(BINS) $(LOGO_H) subdirs
 
-$(obj)envcrc$(SFX):    $(obj)envcrc.o $(obj)crc32.o $(obj)environment.o $(obj)sha1.o
+$(obj)envcrc$(SFX):    $(obj)envcrc.o $(obj)crc32.o $(obj)env_embedded.o $(obj)sha1.o
                $(CC) $(CFLAGS) -o $@ $^
 
 $(obj)ubsha1$(SFX):    $(obj)ubsha1.o $(obj)sha1.o
@@ -167,6 +171,10 @@ $(obj)mpc86x_clk$(SFX):    $(obj)mpc86x_clk.o
                $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
                $(STRIP) $@
 
+$(obj)bin2header$(SFX): $(obj)bin2header.o
+               $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
+               $(STRIP) $@
+
 $(obj)envcrc.o:        $(src)envcrc.c
                $(CC) -g $(CFLAGS) -c -o $@ $<
 
@@ -229,11 +237,11 @@ else
                done
 endif
 
-$(obj)environment.c:
-               @rm -f $(obj)environment.c
-               ln -s $(src)../common/environment.c $(obj)environment.c
+$(obj)env_embedded.c:
+               @rm -f $(obj)env_embedded.c
+               ln -s $(src)../common/env_embedded.c $(obj)env_embedded.c
 
-$(obj)environment.o:   $(obj)environment.c
+$(obj)env_embedded.o:  $(obj)env_embedded.c
                $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 $(obj)zlib.h: