diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-03-22 00:00:03 +0100 |
| commit | a17824c749aac3df0bbb528bb5d33af68296b0b1 (patch) | |
| tree | 399efb15b55d6992279eef98fa6878852d403352 /include/asm-blackfin/blackfin.h | |
| parent | 2a8dfe08359a1b663418b2faa1da1d7bce34d302 (diff) | |
| parent | b2777c087b5a564e9209988873da4ec749f85aad (diff) | |
| download | u-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.zip u-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.gz u-boot-imx-a17824c749aac3df0bbb528bb5d33af68296b0b1.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin
Diffstat (limited to 'include/asm-blackfin/blackfin.h')
| -rw-r--r-- | include/asm-blackfin/blackfin.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/include/asm-blackfin/blackfin.h b/include/asm-blackfin/blackfin.h index fbdbf30..0ec9207 100644 --- a/include/asm-blackfin/blackfin.h +++ b/include/asm-blackfin/blackfin.h @@ -25,22 +25,16 @@ #ifndef _BLACKFIN_H_ #define _BLACKFIN_H_ -#include <asm/cpu/defBF533.h> -#include <asm/cpu/bf533_serial.h> +#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY)) +# ifdef SHARED_RESOURCES +# include <asm/shared_resources.h> +# endif -#ifndef __ASSEMBLY__ -#ifndef ASSEMBLY +# include <linux/types.h> -#ifdef SHARED_RESOURCES - #include <asm/shared_resources.h> +extern u_long get_sclk(void); #endif -#include <asm/cpu/cdefBF53x.h> -#endif -#endif - -#include <asm/cpu/defBF533.h> -#include <asm/cpu/defBF533_extn.h> -#include <asm/cpu/bf533_serial.h> +#include <asm/arch-common/cdefBF5xx.h> #endif |