Merge branch 'master' of git://git.denx.de/u-boot-pxa

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index df64bf0f4198b841a38c44d16c442b3b1dbd522c..b75ea60b88e4a46f3861331bc8621a642088377a 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -269,6 +269,7 @@ void        forceenv     (char *, char *);
 #ifdef CONFIG_AUTO_COMPLETE
 int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);
 #endif
+int get_env_id (void);
 
 void   pci_init      (void);
 void   pci_init_board(void);
@@ -597,6 +598,8 @@ ulong       video_setmem (ulong);
 
 /* lib_$(ARCH)/cache.c */
 void   flush_cache   (unsigned long, unsigned long);
+void   flush_dcache_range(unsigned long start, unsigned long stop);
+void   invalidate_dcache_range(unsigned long start, unsigned long stop);
 
 
 /* lib_$(ARCH)/ticks.S */
@@ -678,6 +681,13 @@ void       fputc(int file, const char c);
 int    ftstc(int file);
 int    fgetc(int file);
 
+/*
+ * CONSOLE multiplexing.
+ */
+#ifdef CONFIG_CONSOLE_MUX
+#include <iomux.h>
+#endif
+
 int    pcmcia_init (void);
 
 #ifdef CONFIG_STATUS_LED