diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 23:55:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 23:55:10 +0200 |
| commit | 55d150d95dbd4612f229e1f503c3a6aa8ed08a96 (patch) | |
| tree | e8b755c6b0c5d56c8d8777236baab8b1deb67451 /include/asm-ppc | |
| parent | 2191923072413972d8dbf3e1b2f8ce6762a85800 (diff) | |
| parent | 90e4e7836596d8ae5cead41a776b2b95c84182c6 (diff) | |
| download | u-boot-imx-55d150d95dbd4612f229e1f503c3a6aa8ed08a96.zip u-boot-imx-55d150d95dbd4612f229e1f503c3a6aa8ed08a96.tar.gz u-boot-imx-55d150d95dbd4612f229e1f503c3a6aa8ed08a96.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/u-boot.h | 8 |
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 |