diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
| commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
| tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /include/asm-blackfin/arch-common/cdefBF5xx.h | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.gz talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/asm-blackfin/arch-common/cdefBF5xx.h')
| -rw-r--r-- | include/asm-blackfin/arch-common/cdefBF5xx.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/include/asm-blackfin/arch-common/cdefBF5xx.h b/include/asm-blackfin/arch-common/cdefBF5xx.h deleted file mode 100644 index aec70ce8b7..0000000000 --- a/include/asm-blackfin/arch-common/cdefBF5xx.h +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************ - * - * cdefBF53x.h - * - * (c) Copyright 2002-2003 Analog Devices, Inc. All rights reserved. - * - ************************************************************************/ - -#ifndef _CDEFBF53x_H -#define _CDEFBF53x_H - -#if defined(__ADSPBF531__) - #include <asm/arch-bf533/cdefBF531.h> -#elif defined(__ADSPBF532__) - #include <asm/arch-bf533/cdefBF532.h> -#elif defined(__ADSPBF533__) - #include <asm/arch-bf533/cdefBF533.h> - #include <asm/arch-bf533/defBF533_extn.h> - #include <asm/arch-bf533/bf533_serial.h> -#elif defined(__ADSPBF537__) - #include <asm/arch-bf537/cdefBF537.h> - #include <asm/arch-bf537/defBF537_extn.h> - #include <asm/arch-bf537/bf537_serial.h> -#elif defined(__ADSPBF561__) - #include <asm/arch-bf561/cdefBF561.h> - #include <asm/arch-bf561/defBF561_extn.h> - #include <asm/arch-bf561/bf561_serial.h> -#elif defined(__ADSPBF535__) - #include <asm/cpu/cdefBF5d35.h> -#elif defined(__AD6532__) - #include <asm/cpu/cdefAD6532.h> -#else - #if defined(__ADSPLPBLACKFIN__) - #include <asm/arch-bf533/cdefBF532.h> - #else - #include <asm/arch-bf533/cdefBF535.h> - #endif -#endif - -#endif /* _CDEFBF53x_H */ |
