Merge branch 'master_merge_new-image' of /home/tur/git/u-boot

[oweals/u-boot.git] / board / mpl / common / common_util.h

diff --git a/board/mpl/common/common_util.h b/board/mpl/common/common_util.h
index caf7f9b3ca21509cb0ed82319cb4cecd4d9de2e3..d4b1f68dfa6e5f12786c26e1324fb6d43606d08c 100644 (file)
--- a/board/mpl/common/common_util.h
+++ b/board/mpl/common/common_util.h
@@ -31,19 +31,16 @@ typedef struct {
 } backup_t;
 
 void get_backup_values(backup_t *buf);
-int switch_cs(unsigned char boot);
+
 #if defined(CONFIG_PIP405) || defined(CONFIG_MIP405)
-int get_boot_mode(void);
-void setup_cs_reloc(void);
 #define BOOT_MPS       0x01
 #define BOOT_PCI       0x02
 #endif
 
 void show_stdio_dev(void);
 void check_env(void);
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
 void doc_init (void);
 #endif
 
 #endif /* _COMMON_UTIL_H_ */
-