diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-10-19 12:03:44 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-10-19 12:03:44 -0500 |
| commit | d22200f0204ce3210ed47d4e13864ebc60b93918 (patch) | |
| tree | c47f9526f6d90d5f50018d962e1ad6a7d57bc43c /cpu/ppc4xx/start.S | |
| parent | 4d45f69e362b05892c9e92a7907e5820995612aa (diff) | |
| parent | fcfed4f2f234836a0b308fd0a782f4625cd40bad (diff) | |
| download | u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.zip u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.tar.gz u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/ppc4xx/start.S')
| -rw-r--r-- | cpu/ppc4xx/start.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S index 3f29314..3fe13da 100644 --- a/cpu/ppc4xx/start.S +++ b/cpu/ppc4xx/start.S @@ -1697,7 +1697,8 @@ ppc405ep_init: mtdcr ebccfgd,r3 #endif - addi r3,0,CPC0_PCI_HOST_CFG_EN +#ifndef CFG_CPC0_PCI + li r3,CPC0_PCI_HOST_CFG_EN #ifdef CONFIG_BUBINGA /* !----------------------------------------------------------------------- @@ -1712,6 +1713,9 @@ ppc405ep_init: beq ..pci_cfg_set /* if not set, then bypass reg write*/ #endif ori r3,r3,CPC0_PCI_ARBIT_EN +#else /* CFG_CPC0_PCI */ + li r3,CFG_CPC0_PCI +#endif /* CFG_CPC0_PCI */ ..pci_cfg_set: mtdcr CPC0_PCI, r3 /* Enable internal arbiter*/ |