* Add support for PPChameleon Eval Board
* Add support for P3G4 board
* Fix problem with MGT5100 FEC driver: add "early" MAC address
initialization
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 8014225..9f861ac 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -61,11 +61,11 @@
unsigned long bi_pcifreq; /* PCI Bus Freq, in MHz */
#endif
unsigned long bi_baudrate; /* Console Baudrate */
-#if defined(CONFIG_405GP) || \
+#if defined(CONFIG_405) || \
+ defined(CONFIG_405GP) || \
defined(CONFIG_405CR) || \
- defined(CONFIG_440) || \
- defined(CONFIG_405) || \
- defined(CONFIG_405EP)
+ defined(CONFIG_405EP) || \
+ defined(CONFIG_440)
unsigned char bi_s_version[4]; /* Version of this structure */
unsigned char bi_r_version[32]; /* Version of the ROM (IBM) */
unsigned int bi_procfreq; /* CPU (Internal) Freq, in Hz */
@@ -76,14 +76,15 @@
#if defined(CONFIG_HYMOD)
hymod_conf_t bi_hymod_conf; /* hymod configuration information */
#endif
-#if defined(CONFIG_EVB64260) || \
- defined(CONFIG_PN62) || \
- defined(CONFIG_SXNI855T) || \
+#if defined(CFG_GT_6426x) || \
+ defined(CONFIG_PN62) || \
+ defined(CONFIG_PPCHAMELEONEVB) || \
+ defined(CONFIG_SXNI855T) || \
defined(CONFIG_SVM_SC8xx)
/* second onboard ethernet port */
unsigned char bi_enet1addr[6];
#endif
-#if defined(CONFIG_EVB64260) || defined(CONFIG_SVM_SC8xx)
+#if defined(CFG_GT_6426x) || defined(CONFIG_SVM_SC8xx)
/* third onboard ethernet port */
unsigned char bi_enet2addr[6];
#endif