summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
commit42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch)
tree9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /tools
parent2c8d41969b47eb0b973912830c58689b2ba0e50a (diff)
parent54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff)
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile4
-rw-r--r--tools/logos/atmel.bmpbin0 -> 26334 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 5285055dc84..8533a8e5ced 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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
+
#-------------------------------------------------------------------------
diff --git a/tools/logos/atmel.bmp b/tools/logos/atmel.bmp
new file mode 100644
index 00000000000..3c445c9bc36
--- /dev/null
+++ b/tools/logos/atmel.bmp
Binary files differ