diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
| commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
| tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /cpu | |
| parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
| parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
| download | u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.zip u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.gz u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc85xx/cpu.c | 3 | ||||
| -rw-r--r-- | cpu/ppc4xx/4xx_pcie.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 7c50c2f..5b72fe5 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -147,7 +147,8 @@ int checkcpu (void) puts("Clock Configuration:"); for (i = 0; i < CONFIG_NUM_CPUS; i++) { - if (!(i & 3)) printf ("\n "); + if (!(i & 3)) + printf ("\n "); printf("CPU%d:%-4s MHz, ", i,strmhz(buf1, sysinfo.freqProcessor[i])); } diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c index 58d96bb..07fbb0e 100644 --- a/cpu/ppc4xx/4xx_pcie.c +++ b/cpu/ppc4xx/4xx_pcie.c @@ -1028,10 +1028,10 @@ void ppc4xx_setup_pcie_rootpoint(struct pci_controller *hose, int port) #endif } - /* Set up 16GB inbound memory window at 0 */ + /* Set up 4GB inbound memory window at 0 */ out_le32(mbase + PCI_BASE_ADDRESS_0, 0); out_le32(mbase + PCI_BASE_ADDRESS_1, 0); - out_le32(mbase + PECFG_BAR0HMPA, 0x7fffffc); + out_le32(mbase + PECFG_BAR0HMPA, 0x7ffffff); out_le32(mbase + PECFG_BAR0LMPA, 0); out_le32(mbase + PECFG_PIM01SAH, 0xffff0000); |