diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
| commit | d4d1e9bee7c45ea8c513d3af697c864107f1c4d1 (patch) | |
| tree | 3cd7eba359e6729454f4fac5b96209eb959ecf72 /board/stxssa | |
| parent | 1487adbdcf9594bb2eb686325a6f9540dad1b70a (diff) | |
| parent | 27d2b1ed216b457a66c17d38ce5ffdf3c2c32d1e (diff) | |
Merge branch 'denx'
Diffstat (limited to 'board/stxssa')
| -rw-r--r-- | board/stxssa/stxssa.c | 11 | ||||
| -rw-r--r-- | board/stxssa/u-boot.lds | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 5882124150..9bacb98d86 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -378,9 +378,14 @@ static struct pci_config_table pci_stxgp3_config_table[] = { #endif -static struct pci_controller hose = { +static struct pci_controller hose[] = { #ifndef CONFIG_PCI_PNP - config_table: pci_stxgp3_config_table, + { config_table: pci_stxgp3_config_table,}, +#else + {}, +#endif +#ifdef CONFIG_MPC85XX_PCI2 + {}, #endif }; @@ -393,6 +398,6 @@ pci_init_board(void) #ifdef CONFIG_PCI extern void pci_mpc85xx_init(struct pci_controller *hose); - pci_mpc85xx_init(&hose); + pci_mpc85xx_init(hose); #endif /* CONFIG_PCI */ } diff --git a/board/stxssa/u-boot.lds b/board/stxssa/u-boot.lds index 95ecf66a8d..65e1bcfb12 100644 --- a/board/stxssa/u-boot.lds +++ b/board/stxssa/u-boot.lds @@ -145,6 +145,7 @@ SECTIONS . = ALIGN(256); __init_end = .; + . = .; __bss_start = .; .bss : { |