diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:40:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:40:52 +0100 |
| commit | a8b7e476259e9dfcd63cec4a5e166a11bee0c505 (patch) | |
| tree | aca44a10bf5e8117fdeb05ee3de4723e84906a06 | |
| parent | 4fae35a53b3e958254d6574a1cc7e10811fc6726 (diff) | |
| parent | 33fa5c0bfaf465de8ceb23fcd6b397f68b35a817 (diff) | |
| download | u-boot-imx-a8b7e476259e9dfcd63cec4a5e166a11bee0c505.zip u-boot-imx-a8b7e476259e9dfcd63cec4a5e166a11bee0c505.tar.gz u-boot-imx-a8b7e476259e9dfcd63cec4a5e166a11bee0c505.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
| -rw-r--r-- | board/sbc8641d/sbc8641d.c | 6 |
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 |