LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with git://www.denx.de/git/u-boot.git

This commit is contained in:
Peter Pearse 2007-09-11 15:31:55 +01:00
parent 9d3cb9febe 38ad82da0c
commit 1fc11f736c
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/stxssa/stxssa.c
View File

@ -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 */
}

2
include/configs/stxssa.h
View File

@ -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 */

6
nand_spl/board/amcc/bamboo/Makefile
View File

@ -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