Add support for reading and writing mac addresses to or from ID EEPROM.

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 66cd5175f312fbda52e0b9d1ec5d274dc10728e1..7e54da93bfd11757bb155c722d6168db3ef3ebdd 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -79,10 +79,18 @@ typedef volatile unsigned char      vu_char;
 #endif
 #include <asm/immap_8260.h>
 #endif
+#ifdef CONFIG_MPC86xx
+#include <mpc86xx.h>
+#include <asm/immap_86xx.h>
+#endif
 #ifdef CONFIG_MPC85xx
 #include <mpc85xx.h>
 #include <asm/immap_85xx.h>
 #endif
+#ifdef CONFIG_MPC83XX
+#include <mpc83xx.h>
+#include <asm/immap_83xx.h>
+#endif
 #ifdef CONFIG_4xx
 #include <ppc4xx.h>
 #endif
@@ -189,6 +197,9 @@ int checkdram     (void);
 char * strmhz(char *buf, long hz);
 int    last_stage_init(void);
 extern ulong monitor_flash_len;
+#ifdef CFG_ID_EEPROM
+int mac_read_from_eeprom(void);
+#endif
 
 /* common/flash.c */
 void flash_perror (int);
@@ -204,8 +215,8 @@ extern ulong load_addr;             /* Default Load Address */
 /* common/cmd_nvedit.c */
 int    env_init     (void);
 void   env_relocate (void);
-char   *getenv      (uchar *);
-int    getenv_r     (uchar *name, uchar *buf, unsigned len);
+char   *getenv      (char *);
+int    getenv_r     (char *name, char *buf, unsigned len);
 int    saveenv      (void);
 #ifdef CONFIG_PPC              /* ARM version to be fixed! */
 void inline setenv   (char *, char *);
@@ -213,6 +224,7 @@ void inline setenv   (char *, char *);
 void   setenv       (char *, char *);
 #endif /* CONFIG_PPC */
 #ifdef CONFIG_ARM
+# include <asm/mach-types.h>
 # include <asm/setup.h>
 # include <asm/u-boot-arm.h>   /* ARM version to be fixed! */
 #endif /* CONFIG_ARM */
@@ -297,7 +309,8 @@ void        board_ether_init (void);
 #endif
 
 #if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_MBX) || \
-    defined(CONFIG_IAD210)     || defined(CONFIG_XPEDITE1K)
+    defined(CONFIG_IAD210)     || defined(CONFIG_XPEDITE1K) || \
+    defined(CONFIG_METROBOX)    || defined(CONFIG_KAREF)
 void   board_get_enetaddr (uchar *addr);
 #endif
 
@@ -359,7 +372,9 @@ void        trap_init     (ulong);
     defined (CONFIG_75x)       || \
     defined (CONFIG_74xx)      || \
     defined (CONFIG_MPC8220)   || \
-    defined(CONFIG_MPC85xx)
+    defined (CONFIG_MPC85xx)   || \
+    defined (CONFIG_MPC86xx)   || \
+    defined (CONFIG_MPC83XX)
 unsigned char  in8(unsigned int);
 void           out8(unsigned int, unsigned char);
 unsigned short in16(unsigned int);
@@ -382,16 +397,25 @@ int       checkicache   (void);
 int    checkdcache   (void);
 void   upmconfig     (unsigned int, unsigned int *, unsigned int);
 ulong  get_tbclk     (void);
+void   reset_cpu     (ulong addr);
 
 /* $(CPU)/serial.c */
 int    serial_init   (void);
+void   serial_addr   (unsigned int);
 void   serial_setbrg (void);
 void   serial_putc   (const char);
+void   serial_putc_raw(const char);
 void   serial_puts   (const char *);
-void   serial_addr   (unsigned int);
 int    serial_getc   (void);
 int    serial_tstc   (void);
 
+void   _serial_setbrg (const int);
+void   _serial_putc   (const char, const int);
+void   _serial_putc_raw(const char, const int);
+void   _serial_puts   (const char *, const int);
+int    _serial_getc   (const int);
+int    _serial_tstc   (const int);
+
 /* $(CPU)/speed.c */
 int    get_clocks (void);
 int    get_clocks_866 (void);
@@ -399,8 +423,9 @@ int sdram_adjust_866 (void);
 int    adjust_sdram_tbs_8xx (void);
 #if defined(CONFIG_8260)
 int    prt_8260_clks (void);
-#endif
-#if defined(CONFIG_MPC5xxx)
+#elif defined(CONFIG_MPC83XX)
+int print_clock_conf(void);
+#elif defined(CONFIG_MPC5xxx)
 int    prt_mpc5xxx_clks (void);
 #endif
 #if defined(CONFIG_MPC8220)
@@ -437,6 +462,10 @@ ulong      get_bus_freq  (ulong);
 typedef MPC85xx_SYS_INFO sys_info_t;
 void   get_sys_info  ( sys_info_t * );
 #endif
+#if defined(CONFIG_MPC86xx)
+typedef MPC86xx_SYS_INFO sys_info_t;
+void   get_sys_info  ( sys_info_t * );
+#endif
 
 #if defined(CONFIG_4xx) || defined(CONFIG_IOP480)
 #  if defined(CONFIG_440)
@@ -451,7 +480,7 @@ void        get_sys_info  ( sys_info_t * );
 #if defined(CONFIG_8xx) || defined(CONFIG_8260)
 void   cpu_init_f    (volatile immap_t *immr);
 #endif
-#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2)
+#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2) ||defined(CONFIG_MPC86xx)
 void   cpu_init_f    (void);
 #endif
 
@@ -576,4 +605,9 @@ int pcmcia_init (void);
 void   show_boot_progress (int status);
 #endif
 
+#ifdef CONFIG_INIT_CRITICAL
+#error CONFIG_INIT_CRITICAL is depracted!
+#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
+#endif
+
 #endif /* __COMMON_H_ */