diff options
author | Stefan Roese <sr@denx.de> | 2007-11-13 08:16:40 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-11-13 08:16:40 +0100 |
commit | 5c568d6a7f950b9e7e32a63a5893f979b8789b4d (patch) | |
tree | 44ed0fdc0548facecfa35e8d6eedf0616c3ca269 /board/cds/common | |
parent | 49801028715cd8bc22863cdfc0ee7919b7a6af4b (diff) | |
parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
download | u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.zip u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.gz u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'board/cds/common')
-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 9d97905..3eda100 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 |