diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:33:23 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:33:23 +0100 |
| commit | fdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch) | |
| tree | afb703e6e43ff91e6f456f12fbb43fb598373fd5 /include/common.h | |
| parent | 1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index b162dbd7cf..3c4b37b0dc 100644 --- a/include/common.h +++ b/include/common.h @@ -402,6 +402,10 @@ void ppcDcbi(unsigned long value); void ppcSync(void); void ppcDcbz(unsigned long value); #endif +#if defined (CONFIG_MICROBLAZE) +unsigned short in16(unsigned int); +void out16(unsigned int, unsigned short value); +#endif #if defined (CONFIG_MPC83XX) void ppcDWload(unsigned int *addr, unsigned int *ret); @@ -440,8 +444,6 @@ int sdram_adjust_866 (void); int adjust_sdram_tbs_8xx (void); #if defined(CONFIG_8260) int prt_8260_clks (void); -#elif defined(CONFIG_MPC83XX) -int print_clock_conf(void); #elif defined(CONFIG_MPC5xxx) int prt_mpc5xxx_clks (void); #endif |