NAND: environment offset in OOB (CONFIG_ENV_OFFSET_OOB)

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 7aa910dc9871e1bfba9fda1f92bd8ef3cce06102..eddec22752a09dd7e6fd32d72ccb9fe90e10b535 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -218,7 +218,7 @@ void        hang            (void) __attribute__ ((noreturn));
 /* */
 phys_size_t initdram (int);
 int    display_options (void);
-void   print_size (phys_size_t, const char *);
+void   print_size(unsigned long long, const char *);
 int    print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
 
 /* common/main.c */
@@ -470,7 +470,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);
@@ -620,22 +619,22 @@ ulong     usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);
 int    init_timebase (void);
 
-/* lib_generic/gunzip.c */
+/* lib/gunzip.c */
 int gunzip(void *, int, unsigned char *, unsigned long *);
 int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
                                                int stoponerr, int offset);
 
-/* lib_generic/net_utils.c */
+/* lib/net_utils.c */
 #include <net.h>
 static inline IPaddr_t getenv_IPaddr (char *var)
 {
        return (string_to_ip(getenv(var)));
 }
 
-/* lib_generic/time.c */
+/* lib/time.c */
 void   udelay        (unsigned long);
 
-/* lib_generic/vsprintf.c */
+/* lib/vsprintf.c */
 ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);
 unsigned long long     simple_strtoull(const char *cp,char **endp,unsigned int base);
 long   simple_strtol(const char *cp,char **endp,unsigned int base);
@@ -645,10 +644,10 @@ int       sprintf(char * buf, const char *fmt, ...)
                __attribute__ ((format (__printf__, 2, 3)));
 int    vsprintf(char *buf, const char *fmt, va_list args);
 
-/* lib_generic/strmhz.c */
+/* lib/strmhz.c */
 char * strmhz(char *buf, long hz);
 
-/* lib_generic/crc32.c */
+/* lib/crc32.c */
 #include <u-boot/crc.h>
 
 /* common/console.c */
@@ -664,7 +663,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 +672,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 +689,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 +718,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__ */