diff options
| author | wdenk <wdenk> | 2003-12-27 19:24:54 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-12-27 19:24:54 +0000 |
| commit | 7cb22f97ee41f344cf6542c077abf124c38ec5c6 (patch) | |
| tree | f8370b91be3a7e71d304c05c64d6ec15a8867517 /include | |
| parent | b2001f273fcb34d0f2ca43a9b01a24e5c50da6cd (diff) | |
| download | talos-obmc-uboot-7cb22f97ee41f344cf6542c077abf124c38ec5c6.tar.gz talos-obmc-uboot-7cb22f97ee41f344cf6542c077abf124c38ec5c6.zip | |
* Make CPU clock on ICA-IP board controllable by a "cpuclk"
environment variable which can set to "100", "133", or "150". The
CPU clock will be configured accordingly upon next reboot. Other
values are ignored. In case of an invalid or undefined "cpuclk"
value, the compile-time default CPU clock speed will be used.
* Enable Quad-UART on BMS2003 board (initialize the PCMCIA memory
window that is used to access the UART registers by the Linux driver)
* Patch by Reinhard Meyer, 20 Dec 2003:
Fix clock calculation for the MPC5200 for higher clock frequencies
(above 2**32 / 10 = 429.5 MHz).
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/configs/Sandpoint8240.h | 2 | ||||
| -rw-r--r-- | include/configs/incaip.h | 9 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/common.h b/include/common.h index 39c232a0ff..ece5d64cf3 100644 --- a/include/common.h +++ b/include/common.h @@ -362,6 +362,9 @@ ulong get_HCLK (void); ulong get_PCLK (void); ulong get_UCLK (void); #endif +#if defined CONFIG_INCA_IP +uint incaip_get_cpuclk (void); +#endif ulong get_bus_freq (ulong); #if defined(CONFIG_MPC85xx) diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 5bf184ea94..1c37f63962 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -269,7 +269,7 @@ */ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */ -#define CONFIG_PLL_PCI_TO_MEM_MULTIPLIER 2 +#define CONFIG_PLL_PCI_TO_MEM_MULTIPLIER 1 #define CFG_ROMNAL 7 /*rom/flash next access time */ #define CFG_ROMFAL 11 /*rom/flash access time */ diff --git a/include/configs/incaip.h b/include/configs/incaip.h index 15d5c2ee28..e6fa193426 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -36,12 +36,7 @@ #define CPU_CLOCK_RATE 133000000 /* 133 MHz clock for the MIPS core */ #endif -#if CPU_CLOCK_RATE == 100000000 -#define INFINEON_EBU_BOOTCFG 0x20C4 /* CMULT = 4 for 100 MHz */ -#else -#define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 for 150 MHz */ -#endif - +#define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -106,7 +101,7 @@ #define CFG_BOOTPARAMS_LEN 128*1024 -#define CFG_HZ (CPU_CLOCK_RATE/2) +#define CFG_HZ (incaip_get_cpuclk() / 2) #define CFG_SDRAM_BASE 0x80000000 |
