diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-01 22:38:01 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-01 22:38:01 +0100 |
| commit | 0f8b8d0f4c1579a55aaebd1974517552766ab7e5 (patch) | |
| tree | a4bdaab2f3f5608deb67e76d77b5c30dfb906862 /board | |
| parent | 07dd6eb040a4a09110b2cc084b51893f234c1b57 (diff) | |
| parent | df90968b48fb34fa9072fab150db2ac89678f537 (diff) | |
| download | u-boot-0f8b8d0f4c1579a55aaebd1974517552766ab7e5.tar.gz u-boot-0f8b8d0f4c1579a55aaebd1974517552766ab7e5.tar.xz u-boot-0f8b8d0f4c1579a55aaebd1974517552766ab7e5.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/cds/common/ft_board.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/board/cds/common/ft_board.c b/board/cds/common/ft_board.c index 9d97905ca9..3eda1009ef 100644 --- a/board/cds/common/ft_board.c +++ b/board/cds/common/ft_board.c @@ -37,17 +37,24 @@ static void cds_pci_fixup(void *blob) map = ft_get_prop(blob, "/" OF_SOC "/pci@8000/interrupt-map", &len); - len /= sizeof(u32); + if (!map) + map = ft_get_prop(blob, "/" OF_PCI "/interrupt-map", &len); - slot = get_pci_slot(); + if (map) { + len /= sizeof(u32); - for (i=0;i<len;i+=7) { - /* We rotate the interrupt pins so that the mapping - * changes depending on the slot the carrier card is in. - */ - map[3] = ((map[3] + slot - 2) % 4) + 1; + slot = get_pci_slot(); - map+=7; + for (i=0;i<len;i+=7) { + /* We rotate the interrupt pins so that the mapping + * changes depending on the slot the carrier card is in. + */ + map[3] = ((map[3] + slot - 2) % 4) + 1; + + map+=7; + } + } else { + printf("*** Warning - No PCI node found\n"); } } #endif |