summaryrefslogtreecommitdiff
path: root/include/asm-ppc/u-boot.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-09 17:38:59 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-09 17:38:59 +0200
commit38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d (patch)
treedf795a78bfb6b851feb172f0e0f26d9ada260b91 /include/asm-ppc/u-boot.h
parentc19c3134799585c9feaad63a420fe6e704f2f2a4 (diff)
parent846b0dd2dca945c8bede8a34e2fa86e876715a06 (diff)
downloadu-boot-imx-38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d.zip
u-boot-imx-38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d.tar.gz
u-boot-imx-38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d.tar.bz2
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include/asm-ppc/u-boot.h')
-rw-r--r--include/asm-ppc/u-boot.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 5b6cd6f..161a295 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -101,19 +101,19 @@ typedef struct bd_info {
unsigned char bi_enet3addr[6];
#endif
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined (CONFIG_440_GX) || \
- defined(CONFIG_440_EP) || defined(CONFIG_440_GR)
+#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined (CONFIG_440GX) || \
+ defined(CONFIG_440EP) || defined(CONFIG_440GR)
unsigned int bi_opbfreq; /* OPB clock in Hz */
int bi_iic_fast[2]; /* Use fast i2c mode */
#endif
#if defined(CONFIG_NX823)
unsigned char bi_sernum[8];
#endif
-#if defined(CONFIG_440_EP) || defined(CONFIG_440_GR)
+#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
int bi_phynum[2]; /* Determines phy mapping */
int bi_phymode[2]; /* Determines phy mode */
#endif
-#if defined(CONFIG_440_GX)
+#if defined(CONFIG_440GX)
int bi_phynum[4]; /* Determines phy mapping */
int bi_phymode[4]; /* Determines phy mode */
#endif