diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:56:34 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:57:51 -0400 |
| commit | 72e20f5704987c27e549c85706b125fd4bac02c7 (patch) | |
| tree | c5a252708f5a4f6e04cd9390c5bd29b8bd48fda4 /tools | |
| parent | 405bb978ee2321b6cf5381a012c812bdc7679e40 (diff) | |
| parent | 251484cfb845d5d54c652a1801270ede1521ca6d (diff) | |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
include/configs/at91sam9261ek.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/logos/atmel.bmp | bin | 26334 -> 0 bytes | |||
| -rw-r--r-- | tools/logos/timesys.bmp | bin | 0 -> 14094 bytes |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8a1087009c..1c26be9f54 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -42,13 +42,13 @@ LOGO_H = $(OBJTREE)/include/bmp_logo.h ifeq ($(LOGO_BMP),) LOGO_BMP= logos/denx.bmp ifeq ($(BOARD),at91sam9261ek) -LOGO_BMP= logos/atmel.bmp +LOGO_BMP= logos/timesys.bmp endif ifeq ($(BOARD),at91sam9263ek) -LOGO_BMP= logos/atmel.bmp +LOGO_BMP= logos/timesys.bmp endif ifeq ($(BOARD),at91sam9rlek) -LOGO_BMP= logos/atmel.bmp +LOGO_BMP= logos/timesys.bmp endif endif diff --git a/tools/logos/atmel.bmp b/tools/logos/atmel.bmp Binary files differdeleted file mode 100644 index 3c445c9bc3..0000000000 --- a/tools/logos/atmel.bmp +++ /dev/null diff --git a/tools/logos/timesys.bmp b/tools/logos/timesys.bmp Binary files differnew file mode 100644 index 0000000000..0a0a981230 --- /dev/null +++ b/tools/logos/timesys.bmp |
