diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 20:03:38 +0200 |
commit | b4f15fdaf77b7339e2984703c83269c7cdf680a9 (patch) | |
tree | 32bb3b65d98a229aead643ae11ef2dc433146411 /include/asm-ppc/u-boot.h | |
parent | b20d00328c5486a4b2cdf07ce7afaf2139dc741e (diff) | |
parent | 07a2505f67e091ff70506ae6a5022b416211df44 (diff) | |
download | u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.zip u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.tar.gz u-boot-imx-b4f15fdaf77b7339e2984703c83269c7cdf680a9.tar.bz2 |
Merge with /home/wd/git/u-boot/jon_loeliger
Diffstat (limited to 'include/asm-ppc/u-boot.h')
-rw-r--r-- | include/asm-ppc/u-boot.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h index a759315..5b6cd6f 100644 --- a/include/asm-ppc/u-boot.h +++ b/include/asm-ppc/u-boot.h @@ -45,6 +45,9 @@ typedef struct bd_info { #if defined(CONFIG_MPC5xxx) unsigned long bi_mbar_base; /* base of internal registers */ #endif +#if defined(CONFIG_MPC83XX) + unsigned long bi_immrbar; +#endif #if defined(CONFIG_MPC8220) unsigned long bi_mbar_base; /* base of internal registers */ unsigned long bi_inpfreq; /* Input Freq, In MHz */ @@ -59,7 +62,7 @@ typedef struct bd_info { unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ -#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) +#if defined(CONFIG_CPM2) unsigned long bi_cpmfreq; /* CPM_CLK Freq, in MHz */ unsigned long bi_brgfreq; /* BRG_CLK Freq, in MHz */ unsigned long bi_sccfreq; /* SCC_CLK Freq, in MHz */ |