* Enable NAND flash support for NC650 board.

[karo-tx-uboot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 206f8cf3ad3104c74d40af0e996e5a9e81d9e17f..353a15ac5688121674c67ad3f0f8bbc4a8fa16c8 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)
-# define CONFIG_MPC866_et_al 1
+# define CONFIG_MPC866_FAMILY 1
 #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)     \
-   || 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)
+#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
@@ -117,6 +126,17 @@ typedef void (interrupt_handler_t)(void *);
 # endif
 #endif
 
+#ifndef CONFIG_SERIAL_MULTI
+
+#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) \
+ || defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
+ || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
+
+#define CONFIG_SERIAL_MULTI    1
+
+#endif
+
+#endif /* CONFIG_SERIAL_MULTI */
 
 /*
  * General Purpose Utilities
@@ -134,7 +154,7 @@ typedef void (interrupt_handler_t)(void *);
  * Function Prototypes
  */
 
-#if CONFIG_SERIAL_SOFTWARE_FIFO
+#ifdef CONFIG_SERIAL_SOFTWARE_FIFO
 void   serial_buffered_init (void);
 void   serial_buffered_putc (const char);
 void   serial_buffered_puts (const char *);
@@ -189,6 +209,7 @@ void inline setenv   (char *, char *);
 void   setenv       (char *, char *);
 #endif /* CONFIG_PPC */
 #ifdef CONFIG_ARM
+# include <asm/mach-types.h>
 # include <asm/setup.h>
 # include <asm/u-boot-arm.h>   /* ARM version to be fixed! */
 #endif /* CONFIG_ARM */
@@ -196,6 +217,10 @@ void       setenv       (char *, char *);
 # 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);
@@ -259,6 +284,8 @@ extern ssize_t spi_write (uchar *, int, uchar *, int);
 void rpxclassic_init (void);
 #endif
 
+void rpxlite_init (void);
+
 #ifdef CONFIG_MBX
 /* $(BOARD)/mbx8xx.c */
 void   mbx_init (void);
@@ -266,7 +293,8 @@ void        board_serial_init (void);
 void   board_ether_init (void);
 #endif
 
-#if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_MBX) || defined(CONFIG_IAD210)
+#if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_MBX) || \
+    defined(CONFIG_IAD210)     || defined(CONFIG_XPEDITE1K)
 void   board_get_enetaddr (uchar *addr);
 #endif
 
@@ -301,7 +329,11 @@ int testdram(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_svr       (void);
 uint   rd_ic_cst     (void);
 void   wr_ic_cst     (uint);
 void   wr_ic_adr     (uint);
@@ -318,10 +350,12 @@ void      relocate_code (ulong, gd_t *, ulong);
 ulong  get_endaddr   (void);
 void   trap_init     (ulong);
 #if defined (CONFIG_4xx)       || \
+    defined (CONFIG_MPC5xxx)   || \
     defined (CONFIG_74xx_7xx)  || \
     defined (CONFIG_74x)       || \
     defined (CONFIG_75x)       || \
-    defined (CONFIG_74xx)
+    defined (CONFIG_74xx)      || \
+    defined(CONFIG_MPC85xx)
 unsigned char  in8(unsigned int);
 void           out8(unsigned int, unsigned char);
 unsigned short in16(unsigned int);
@@ -335,6 +369,7 @@ void                out32r(unsigned int, unsigned long value);
 void           ppcDcbf(unsigned long value);
 void           ppcDcbi(unsigned long value);
 void           ppcSync(void);
+void           ppcDcbz(unsigned long value);
 #endif
 
 /* $(CPU)/cpu.c */
@@ -355,25 +390,40 @@ int       serial_tstc   (void);
 
 /* $(CPU)/speed.c */
 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_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 int    prt_mpc5xxx_clks (void);
 #endif
 #ifdef CONFIG_4xx
 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
+#if defined(CONFIG_LH7A40X)
+ulong  get_PLLCLK (void);
+#endif
 #if defined CONFIG_INCA_IP
 uint   incaip_get_cpuclk (void);
 #endif
+#if defined(CONFIG_IMX)
+ulong get_systemPLLCLK(void);
+ulong get_FCLK(void);
+ulong get_HCLK(void);
+ulong get_BCLK(void);
+ulong get_PERCLK1(void);
+ulong get_PERCLK2(void);
+ulong get_PERCLK3(void);
+#endif
 ulong  get_bus_freq  (ulong);
 
 #if defined(CONFIG_MPC85xx)
@@ -394,9 +444,10 @@ void       get_sys_info  ( sys_info_t * );
 #if defined(CONFIG_8xx) || defined(CONFIG_8260)
 void   cpu_init_f    (volatile immap_t *immr);
 #endif
-#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx)
+#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2)
 void   cpu_init_f    (void);
 #endif
+
 int    cpu_init_r    (void);
 #if defined(CONFIG_8260)
 int    prt_8260_rsr  (void);
@@ -438,7 +489,7 @@ ulong       vfd_setmem (ulong);
 /* $(CPU)/.../video.c */
 ulong  video_setmem (ulong);
 
-/* ppc/cache.c */
+/* lib_$(ARCH)/cache.c */
 void   flush_cache   (unsigned long, unsigned long);
 
 
@@ -454,6 +505,9 @@ int init_timebase (void);
 
 /* lib_generic/vsprintf.c */
 ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);
+#ifdef CFG_64BIT_VSPRINTF
+unsigned long long     simple_strtoull(const char *cp,char **endp,unsigned int base);
+#endif
 long   simple_strtol(const char *cp,char **endp,unsigned int base);
 void   panic(const char *fmt, ...);
 int    sprintf(char * buf, const char *fmt, ...);