projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Patches by Richard Woodruff, 10 Jun 2004:
[oweals/u-boot.git]
/
include
/
common.h
diff --git
a/include/common.h
b/include/common.h
index acdcf6973727438857efd5d1937fc6a8cda56629..71dd1d9b571bd152b18434edb6bb88525863ef97 100644
(file)
--- a/
include/common.h
+++ b/
include/common.h
@@
-48,22
+48,31
@@
typedef volatile unsigned char vu_char;
defined(CONFIG_MPC859DSL) || \
defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \
defined(CONFIG_MPC866P)
defined(CONFIG_MPC859DSL) || \
defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \
defined(CONFIG_MPC866P)
-# define CONFIG_MPC866_
et_al
1
+# define CONFIG_MPC866_
FAMILY
1
#elif defined(CONFIG_MPC870) \
|| defined(CONFIG_MPC875) \
|| defined(CONFIG_MPC880) \
|| defined(CONFIG_MPC885)
#elif defined(CONFIG_MPC870) \
|| defined(CONFIG_MPC875) \
|| defined(CONFIG_MPC880) \
|| defined(CONFIG_MPC885)
-# define CONFIG_
DUET
1
+# define CONFIG_
MPC885_FAMILY
1
#endif
#if defined(CONFIG_MPC860) \
|| defined(CONFIG_MPC860T) \
#endif
#if defined(CONFIG_MPC860) \
|| defined(CONFIG_MPC860T) \
- || defined(CONFIG_MPC866_
et_al
) \
- || defined(CONFIG_
DUET
)
+ || defined(CONFIG_MPC866_
FAMILY
) \
+ || defined(CONFIG_
MPC885_FAMILY
)
# define CONFIG_MPC86x 1
#endif
#elif defined(CONFIG_5xx)
#include <asm/5xx_immap.h>
#elif defined(CONFIG_8260)
# define CONFIG_MPC86x 1
#endif
#elif defined(CONFIG_5xx)
#include <asm/5xx_immap.h>
#elif defined(CONFIG_8260)
+#if defined(CONFIG_MPC8247) \
+ || defined(CONFIG_MPC8248) \
+ || defined(CONFIG_MPC8271) \
+ || defined(CONFIG_MPC8272)
+#define CONFIG_MPC8272_FAMILY 1
+#endif
+#if defined(CONFIG_MPC8272_FAMILY)
+#define CONFIG_MPC8260 1
+#endif
#include <asm/immap_8260.h>
#endif
#ifdef CONFIG_MPC85xx
#include <asm/immap_8260.h>
#endif
#ifdef CONFIG_MPC85xx
@@
-196,6
+205,10
@@
void setenv (char *, char *);
# include <asm/u-boot-i386.h>
#endif /* CONFIG_I386 */
# include <asm/u-boot-i386.h>
#endif /* CONFIG_I386 */
+#ifdef CONFIG_AUTO_COMPLETE
+int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);
+#endif
+
void pci_init (void);
void pci_init_board(void);
void pciinfo (int, int);
void pci_init (void);
void pci_init_board(void);
void pciinfo (int, int);
@@
-259,6
+272,8
@@
extern ssize_t spi_write (uchar *, int, uchar *, int);
void rpxclassic_init (void);
#endif
void rpxclassic_init (void);
#endif
+void rpxlite_init (void);
+
#ifdef CONFIG_MBX
/* $(BOARD)/mbx8xx.c */
void mbx_init (void);
#ifdef CONFIG_MBX
/* $(BOARD)/mbx8xx.c */
void mbx_init (void);
@@
-302,7
+317,11
@@
int testdram(void);
uint get_immr (uint);
#endif
uint get_pir (void);
uint get_immr (uint);
#endif
uint get_pir (void);
+#if defined(CONFIG_MPC5xxx)
+uint get_svr (void);
+#endif
uint get_pvr (void);
uint get_pvr (void);
+uint get_svr (void);
uint rd_ic_cst (void);
void wr_ic_cst (uint);
void wr_ic_adr (uint);
uint rd_ic_cst (void);
void wr_ic_cst (uint);
void wr_ic_adr (uint);
@@
-359,6
+378,7
@@
int serial_tstc (void);
int get_clocks (void);
int get_clocks_866 (void);
int sdram_adjust_866 (void);
int get_clocks (void);
int get_clocks_866 (void);
int sdram_adjust_866 (void);
+int adjust_sdram_tbs_8xx (void);
#if defined(CONFIG_8260)
int prt_8260_clks (void);
#endif
#if defined(CONFIG_8260)
int prt_8260_clks (void);
#endif
@@
-369,12
+389,15
@@
int prt_mpc5xxx_clks (void);
ulong get_OPB_freq (void);
ulong get_PCI_freq (void);
#endif
ulong get_OPB_freq (void);
ulong get_PCI_freq (void);
#endif
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
+#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
|| defined(CONFIG_LH7A40X)
ulong get_FCLK (void);
ulong get_HCLK (void);
ulong get_PCLK (void);
ulong get_UCLK (void);
#endif
ulong get_FCLK (void);
ulong get_HCLK (void);
ulong get_PCLK (void);
ulong get_UCLK (void);
#endif
+#if defined(CONFIG_LH7A40X)
+ulong get_PLLCLK (void);
+#endif
#if defined CONFIG_INCA_IP
uint incaip_get_cpuclk (void);
#endif
#if defined CONFIG_INCA_IP
uint incaip_get_cpuclk (void);
#endif