diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-09-11 15:31:55 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-11 15:31:55 +0100 |
| commit | 1fc11f736c720c12c772b989f734fcf5be91332b (patch) | |
| tree | 9b2a8d4397daa8f4ae233680d37be6d5c962e435 | |
| parent | 9d3cb9febe859d6cc628ede2cc0175289101826a (diff) | |
| parent | 38ad82da0c1180ecdeb212a8f4245e945bcc546e (diff) | |
Merge with git://www.denx.de/git/u-boot.git
| -rw-r--r-- | board/stxssa/stxssa.c | 9 | ||||
| -rw-r--r-- | include/configs/stxssa.h | 2 | ||||
| -rw-r--r-- | nand_spl/board/amcc/bamboo/Makefile | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 5882124150..9a2bfbef8e 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -378,9 +378,12 @@ 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,}, +#ifdef CONFIG_MPC85XX_PCI2 + {}, +#endif #endif }; @@ -393,6 +396,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/include/configs/stxssa.h b/include/configs/stxssa.h index f32ff67d9f..b41dafaf98 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -230,7 +230,7 @@ #define CFG_PCI2_IO_SIZE 0x01000000 /* 16M */ #if defined(CONFIG_PCI) /* PCI Ethernet card */ - +#define CONFIG_MPC85XX_PCI2 1 #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index 0df86f99d4..8b5461dcf4 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -84,6 +84,12 @@ $(obj)nand_ecc.c: @rm -f $(obj)nand_ecc.c ln -s $(SRCTREE)/drivers/nand/nand_ecc.c $(obj)nand_ecc.c +ifneq ($(OBJTREE), $(SRCTREE)) +$(obj)sdram.c: + @rm -f $(obj)sdram.c + ln -s $(SRCTREE)/nand_spl/board/$(BOARDDIR)/sdram.c $(obj)sdram.c +endif + ######################################################################### $(obj)%.o: $(obj)%.S |