summaryrefslogtreecommitdiff
path: root/include/asm-ppc/u-boot.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-ppc/u-boot.h')
-rw-r--r--include/asm-ppc/u-boot.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 8014225dbc0..9f861ac2309 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -61,11 +61,11 @@ typedef struct bd_info {
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 @@ typedef struct bd_info {
#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