* Patches by Pantelis Antoniou, 30 Mar 2004:

[people/ms/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 4c3940333ab131912a8eebacc1731293a81ac288..9645ef489c8fdea1428e1772bcf8ef5dd91eede2 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -64,6 +64,15 @@ typedef volatile unsigned char       vu_char;
 #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
@@ -134,7 +143,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 *);
@@ -196,6 +205,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);
@@ -319,7 +332,7 @@ void        relocate_code (ulong, gd_t *, ulong);
 ulong  get_endaddr   (void);
 void   trap_init     (ulong);
 #if defined (CONFIG_4xx)       || \
-    defined (CONFIG_5xxx)      || \
+    defined (CONFIG_MPC5xxx)   || \
     defined (CONFIG_74xx_7xx)  || \
     defined (CONFIG_74x)       || \
     defined (CONFIG_75x)       || \
@@ -459,7 +472,7 @@ int init_timebase (void);
 
 /* lib_generic/vsprintf.c */
 ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);
-#if CFG_64BIT_VSPRINTF
+#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);