Merge: Add support for AMCC 440SPe CPU based eval board (Yucca).

[platform/kernel/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index efc638d..6d7c41a 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -208,8 +208,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 *);
@@ -302,7 +302,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
 
@@ -364,7 +365,8 @@ void        trap_init     (ulong);
     defined (CONFIG_75x)       || \
     defined (CONFIG_74xx)      || \
     defined (CONFIG_MPC8220)   || \
-    defined(CONFIG_MPC85xx)
+    defined (CONFIG_MPC85xx)   || \
+    defined (CONFIG_MPC83XX)
 unsigned char  in8(unsigned int);
 void           out8(unsigned int, unsigned char);
 unsigned short in16(unsigned int);
@@ -456,6 +458,10 @@ void       get_sys_info  ( sys_info_t * );
 #if defined(CONFIG_4xx) || defined(CONFIG_IOP480)
 #  if defined(CONFIG_440)
     typedef PPC440_SYS_INFO sys_info_t;
+#      if defined(CONFIG_440SPE)
+        unsigned long determine_sysper(void);
+        unsigned long determine_pci_clock_per(void);
+#      endif
 #  else
     typedef PPC405_SYS_INFO sys_info_t;
 #  endif