projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blackfin: convert blackfin board_f and board_r to use generic board init functions
[oweals/u-boot.git]
/
arch
/
blackfin
/
include
/
asm
/
blackfin_local.h
diff --git
a/arch/blackfin/include/asm/blackfin_local.h
b/arch/blackfin/include/asm/blackfin_local.h
index ab31dcb815130181fc8f3cf09c09cbbc3049e106..868c82ea7db71e04a64d5965c8caedc6de64ec2b 100644
(file)
--- a/
arch/blackfin/include/asm/blackfin_local.h
+++ b/
arch/blackfin/include/asm/blackfin_local.h
@@
-42,16
+42,9
@@
# include <linux/types.h>
# include <linux/types.h>
-extern u_long get_vco(void);
-extern u_long get_cclk(void);
-extern u_long get_sclk(void);
-extern u_long get_sclk0(void);
-extern u_long get_sclk1(void);
-extern u_long get_dclk(void);
-
# define bfin_revid() (bfin_read_CHIPID() >> 28)
# define bfin_revid() (bfin_read_CHIPID() >> 28)
-extern
bool
bfin_os_log_check(void);
+extern
int
bfin_os_log_check(void);
extern void bfin_os_log_dump(void);
extern void blackfin_icache_flush_range(const void *, const void *);
extern void bfin_os_log_dump(void);
extern void blackfin_icache_flush_range(const void *, const void *);
@@
-81,6
+74,8
@@
extern void blackfin_dcache_flush_invalidate_range(const void *, const void *);
# define NOP_PAD_ANOMALY_05000198
#endif
# define NOP_PAD_ANOMALY_05000198
#endif
+#define BFIN_BUG() while (1) asm volatile("emuexcpt;");
+
#define _bfin_readX(addr, size, asm_size, asm_ext) ({ \
u32 __v; \
__asm__ __volatile__( \
#define _bfin_readX(addr, size, asm_size, asm_ext) ({ \
u32 __v; \
__asm__ __volatile__( \
@@
-111,7
+106,7
@@
extern void blackfin_dcache_flush_invalidate_range(const void *, const void *);
sizeof(*(addr)) == 1 ? bfin_read8(addr) : \
sizeof(*(addr)) == 2 ? bfin_read16(addr) : \
sizeof(*(addr)) == 4 ? bfin_read32(addr) : \
sizeof(*(addr)) == 1 ? bfin_read8(addr) : \
sizeof(*(addr)) == 2 ? bfin_read16(addr) : \
sizeof(*(addr)) == 4 ? bfin_read32(addr) : \
- ({ BUG(); 0; }); \
+ ({ B
FIN_B
UG(); 0; }); \
})
#define bfin_write(addr, val) \
do { \
})
#define bfin_write(addr, val) \
do { \
@@
-119,7
+114,8
@@
do { \
case 1: bfin_write8(addr, val); break; \
case 2: bfin_write16(addr, val); break; \
case 4: bfin_write32(addr, val); break; \
case 1: bfin_write8(addr, val); break; \
case 2: bfin_write16(addr, val); break; \
case 4: bfin_write32(addr, val); break; \
- default: BUG(); \
+ default: \
+ BFIN_BUG(); \
} \
} while (0)
} \
} while (0)