ppc4xx: Use common NS16550 driver for PPC4xx UART

[platform/kernel/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 5591e1d..d618227 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -96,7 +96,7 @@ typedef volatile unsigned char        vu_char;
 #include <asm/immap_83xx.h>
 #endif
 #ifdef CONFIG_4xx
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #endif
 #ifdef CONFIG_HYMOD
 #include <board/hymod/hymod.h>
@@ -189,6 +189,15 @@ typedef void (interrupt_handler_t)(void *);
 #define MIN(x, y)  min(x, y)
 #define MAX(x, y)  max(x, y)
 
+#if defined(CONFIG_ENV_IS_EMBEDDED)
+#define TOTAL_MALLOC_LEN       CONFIG_SYS_MALLOC_LEN
+#elif ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \
+       (CONFIG_ENV_ADDR >= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) ) || \
+      defined(CONFIG_ENV_IS_IN_NVRAM)
+#define        TOTAL_MALLOC_LEN        (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE)
+#else
+#define        TOTAL_MALLOC_LEN        CONFIG_SYS_MALLOC_LEN
+#endif
 
 /**
  * container_of - cast a member of a structure out to the containing structure
@@ -256,15 +265,12 @@ int       env_init     (void);
 void   env_relocate (void);
 int    envmatch     (uchar *, int);
 char   *getenv      (char *);
-int    getenv_r     (char *name, char *buf, unsigned len);
+int    getenv_f     (char *name, char *buf, unsigned len);
 int    saveenv      (void);
 #ifdef CONFIG_PPC              /* ARM version to be fixed! */
 int inline setenv   (char *, char *);
 #else
 int    setenv       (char *, char *);
-#ifdef CONFIG_HAS_UID
-void   forceenv     (char *, char *);
-#endif
 #endif /* CONFIG_PPC */
 #ifdef CONFIG_ARM
 # include <asm/mach-types.h>
@@ -470,7 +476,6 @@ void ft_pci_setup(void *blob, bd_t *bd);
 /* $(CPU)/serial.c */
 int    serial_init   (void);
 void   serial_exit   (void);
-void   serial_addr   (unsigned int);
 void   serial_setbrg (void);
 void   serial_putc   (const char);
 void   serial_putc_raw(const char);
@@ -530,6 +535,7 @@ ulong get_PERCLK2(void);
 ulong get_PERCLK3(void);
 #endif
 ulong  get_bus_freq  (ulong);
+int get_serial_clock(void);
 
 #if defined(CONFIG_MPC85xx)
 typedef MPC85xx_SYS_INFO sys_info_t;
@@ -632,6 +638,10 @@ static inline IPaddr_t getenv_IPaddr (char *var)
        return (string_to_ip(getenv(var)));
 }
 
+/* lib/qsort.c */
+void qsort(void *base, size_t nmemb, size_t size,
+          int(*compar)(const void *, const void *));
+
 /* lib/time.c */
 void   udelay        (unsigned long);
 
@@ -664,7 +674,7 @@ int disable_ctrlc (int);    /* 1 to disable, 0 to enable Control-C detect */
  * STDIO based functions (can always be used)
  */
 /* serial stuff */
-void   serial_printf (const char *fmt, ...)
+int    serial_printf (const char *fmt, ...)
                __attribute__ ((format (__printf__, 1, 2)));
 /* stdin */
 int    getc(void);
@@ -673,9 +683,9 @@ int tstc(void);
 /* stdout */
 void   putc(const char c);
 void   puts(const char *s);
-void   printf(const char *fmt, ...)
+int    printf(const char *fmt, ...)
                __attribute__ ((format (__printf__, 1, 2)));
-void   vprintf(const char *fmt, va_list args);
+int    vprintf(const char *fmt, va_list args);
 
 /* stderr */
 #define eputc(c)               fputc(stderr, c)
@@ -690,7 +700,7 @@ void        vprintf(const char *fmt, va_list args);
 #define stderr         2
 #define MAX_FILES      3
 
-void   fprintf(int file, const char *fmt, ...)
+int    fprintf(int file, const char *fmt, ...)
                __attribute__ ((format (__printf__, 2, 3)));
 void   fputs(int file, const char *s);
 void   fputc(int file, const char c);
@@ -719,7 +729,7 @@ void show_boot_progress(int val);
 int cpu_status(int nr);
 int cpu_reset(int nr);
 int cpu_disable(int nr);
-int cpu_release(int nr, int argc, char *argv[]);
+int cpu_release(int nr, int argc, char * const argv[]);
 #endif
 
 #endif /* __ASSEMBLY__ */