ppc4xx: Consolidate some of the 405 and 440 macros/structs into 4xx

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

diff --git a/board/mpl/common/common_util.h b/board/mpl/common/common_util.h
index 70cd46928adaf0289772f5f6b4537ac0467e2c03..d4b1f68dfa6e5f12786c26e1324fb6d43606d08c 100644 (file)
--- a/board/mpl/common/common_util.h
+++ b/board/mpl/common/common_util.h
@@ -27,16 +27,20 @@
 typedef struct {
        char signature[4];
        char serial_name[17];   /* "MIP405_1000xxxxx" */
-       char eth_addr[21];                      /* "00:60:C2:0a:00:00" */
+       char eth_addr[21];      /* "00:60:C2:0a:00:00" */
 } backup_t;
 
 void get_backup_values(backup_t *buf);
-int switch_cs(unsigned char boot);
+
+#if defined(CONFIG_PIP405) || defined(CONFIG_MIP405)
+#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_ */
-