summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-02-25 13:13:37 -0600
committerJon Loeliger <jdl@freescale.com>2008-02-25 13:18:12 -0600
commit33fa5c0bfaf465de8ceb23fcd6b397f68b35a817 (patch)
tree7b5a9bbbe75866a785c9cff6283cdcdec9b35827
parentb29661fc1151077776454288051bc9a488351ce8 (diff)
downloadu-boot-imx-33fa5c0bfaf465de8ceb23fcd6b397f68b35a817.zip
u-boot-imx-33fa5c0bfaf465de8ceb23fcd6b397f68b35a817.tar.gz
u-boot-imx-33fa5c0bfaf465de8ceb23fcd6b397f68b35a817.tar.bz2
86xx: Fix renamed GUR symbols in sbc8641d board.
Back in commit a551cee99ad1d1da20fd23ad265de47448852f56 (86xx: Fix GUR PCI config registers properly), we should have changed the MPC86xx_PORBMSR_HA and MPC86xx_PORDEVSR_IO_SEL symbols in the sbc8641d board as well. Fix this oversight. Signed-off-by: Jon Loeliger <jdl@freescale.com>
-rw-r--r--board/sbc8641d/sbc8641d.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index 78656e9..e7334ef 100644
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -230,7 +230,8 @@ void pci_init_board(void)
volatile immap_t *immap = (immap_t *) CFG_CCSRBAR;
volatile ccsr_gur_t *gur = &immap->im_gur;
uint devdisr = gur->devdisr;
- uint io_sel = (gur->pordevsr & MPC86xx_PORDEVSR_IO_SEL) >> 16;
+ uint io_sel = (gur->pordevsr & MPC8641_PORDEVSR_IO_SEL)
+ >> MPC8641_PORDEVSR_IO_SEL_SHIFT;
#ifdef CONFIG_PCI1
{
@@ -238,7 +239,8 @@ void pci_init_board(void)
extern void fsl_pci_init(struct pci_controller *hose);
struct pci_controller *hose = &pci1_hose;
#ifdef DEBUG
- uint host1_agent = (gur->porbmsr & MPC86xx_PORBMSR_HA) >> 17;
+ uint host1_agent = (gur->porbmsr & MPC8641_PORBMSR_HA)
+ >> MPC8641_PORBMSR_HA_SHIFT;
uint pex1_agent = (host1_agent == 0) || (host1_agent == 1);
#endif
if ((io_sel == 2 || io_sel == 3 || io_sel == 5