diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:46:20 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-02 21:46:20 +0100 |
| commit | 093e14c52280b4bcc84948bac605ee4d6e87b6e9 (patch) | |
| tree | 4dcfce22cafb51d6fc316e4fdc787001ba8f7fa6 /board | |
| parent | 5f91db7f582ca17b1f19f10189c025696f333d2e (diff) | |
| parent | 2b22fa4baee51e6b467c44ea1be0d1ecd86e8775 (diff) | |
| download | talos-obmc-uboot-093e14c52280b4bcc84948bac605ee4d6e87b6e9.tar.gz talos-obmc-uboot-093e14c52280b4bcc84948bac605ee4d6e87b6e9.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/sbc8548/sbc8548.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 65052e60c8..d57548a7df 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -56,9 +56,10 @@ int checkboard (void) { volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); volatile ccsr_local_ecm_t *ecm = (void *)(CFG_MPC85xx_ECM_ADDR); + volatile u_char *rev= (void *)CFG_BD_REV; printf ("Board: Wind River SBC8548 Rev. 0x%01x\n", - (volatile)(*(u_char *)CFG_BD_REV) >> 4); + (*rev) >> 4); /* * Initialize local bus. @@ -533,12 +534,12 @@ void ft_pci_setup(void *blob, bd_t *bd) { int node, tmp[2]; - const char *path; node = fdt_path_offset(blob, "/aliases"); tmp[0] = 0; if (node >= 0) { #ifdef CONFIG_PCI1 + const char *path; path = fdt_getprop(blob, node, "pci0", NULL); if (path) { tmp[1] = pci1_hose.last_busno - pci1_hose.first_busno; @@ -546,6 +547,7 @@ ft_pci_setup(void *blob, bd_t *bd) } #endif #ifdef CONFIG_PCIE1 + const char *path; path = fdt_getprop(blob, node, "pci1", NULL); if (path) { tmp[1] = pcie1_hose.last_busno - pcie1_hose.first_busno; |
