Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/pci: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 16 years ago
parent 55d6d2d39f
commit ab6878c7bc
11 changed files with 8 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      drivers/pci/Makefile
  2. 4
      drivers/pci/fsl_pci_init.c
  3. 4
      drivers/pci/pci.c
  4. 4
      drivers/pci/pci_auto.c
  5. 2
      drivers/pci/pci_indirect.c
  6. 4
      drivers/pci/tsi108_pci.c
  7. 4
      drivers/pci/w83c553f.c
  8. 2
      include/configs/BAB7xx.h
  9. 2
      include/configs/HIDDEN_DRAGON.h
  10. 2
      include/configs/Sandpoint8240.h
  11. 2
      include/configs/Sandpoint8245.h

10
drivers/pci/Makefile
Unescape View File

@ -25,15 +25,13 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libpci.a
COBJS-y += fsl_pci_init.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
COBJS-y += tsi108_pci.o
COBJS-y += w83c553f.o
COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
COBJS-$(CONFIG_PCI) += pci.o pci_auto.o pci_indirect.o
COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
COBJS-$(CONFIG_SH7751_PCI) +=pci_sh7751.o
COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
COBJS-$(CONFIG_TSI108_PCI) += tsi108_pci.o
COBJS-$(CONFIG_WINBOND_83C553) += w83c553f.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)

4
drivers/pci/fsl_pci_init.c
Unescape View File

@ -18,8 +18,6 @@
#include <common.h>
#ifdef CONFIG_FSL_PCI_INIT
/*
* PCI/PCIE Controller initialization for mpc85xx/mpc86xx soc's
*
@ -197,5 +195,3 @@ fsl_pci_init(struct pci_controller *hose)
pci_hose_write_config_word(hose, dev, PCI_SEC_STATUS, 0xffff);
}
}
#endif /* CONFIG_FSL_PCI */

4
drivers/pci/pci.c
Unescape View File

@ -30,8 +30,6 @@
#include <common.h>
#ifdef CONFIG_PCI
#include <command.h>
#include <asm/processor.h>
#include <asm/io.h>
@ -544,5 +542,3 @@ void pci_init(void)
/* now call board specific pci_init()... */
pci_init_board();
}
#endif /* CONFIG_PCI */

4
drivers/pci/pci_auto.c
Unescape View File

@ -15,8 +15,6 @@
#include <common.h>
#ifdef CONFIG_PCI
#include <pci.h>
#undef DEBUG
@ -408,5 +406,3 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
return sub_bus;
}
#endif /* CONFIG_PCI */

2
drivers/pci/pci_indirect.c
Unescape View File

@ -11,7 +11,6 @@
#include <common.h>
#ifdef CONFIG_PCI
#if (!defined(__I386__) && !defined(CONFIG_IXDP425))
#include <asm/processor.h>
@ -135,4 +134,3 @@ void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
}
#endif /* !__I386__ && !CONFIG_IXDP425 */
#endif /* CONFIG_PCI */

4
drivers/pci/tsi108_pci.c
Unescape View File

@ -27,8 +27,6 @@
#include <config.h>
#ifdef CONFIG_TSI108_PCI
#include <common.h>
#include <pci.h>
#include <asm/io.h>
@ -182,5 +180,3 @@ void ft_pci_setup(void *blob, bd_t *bd)
}
}
#endif /* CONFIG_OF_LIBFDT */
#endif /* CONFIG_TSI108_PCI */

4
drivers/pci/w83c553f.c
Unescape View File

@ -30,8 +30,6 @@
#include <common.h>
#include <config.h>
#ifdef CFG_WINBOND_83C553
#include <asm/io.h>
#include <pci.h>
@ -222,5 +220,3 @@ void initialise_dma(void)
out8(W83C553F_DMA1 + W83C553F_DMA1_CS, 0x00);
out16(W83C553F_DMA2 + W83C553F_DMA2_CS, 0x0000);
}
#endif /* CFG_WINBOND_83C553 */

2
include/configs/BAB7xx.h
Unescape View File

@ -338,7 +338,7 @@ extern unsigned char scsi_sym53c8xx_ccf;
/*
* Winbond Configuration
*/
#define CFG_WINBOND_83C553 1 /* has a winbond bridge */
#define CONFIG_WINBOND_83C553 1 /* has a winbond bridge */
#define CFG_USE_WINBOND_IDE 0 /* use winbond 83c553 internal ide */
#define CFG_WINBOND_ISA_CFG_ADDR 0x80005800 /* pci-isa bridge config addr */
#define CFG_WINBOND_IDE_CFG_ADDR 0x80005900 /* ide config addr */

2
include/configs/HIDDEN_DRAGON.h
Unescape View File

@ -201,7 +201,7 @@
*/
#define CFG_WINBOND_83C553 1 /*has a winbond bridge */
#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */
#define CFG_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */
#define CFG_WINBOND_ISA_CFG_ADDR 0x80005800 /*pci-isa bridge config addr */
#define CFG_WINBOND_IDE_CFG_ADDR 0x80005900 /*ide config addr */

2
include/configs/Sandpoint8240.h
Unescape View File

@ -235,7 +235,7 @@
*/
#define CFG_WINBOND_83C553 1 /*has a winbond bridge */
#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */
#define CFG_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */
#define CFG_WINBOND_ISA_CFG_ADDR 0x80005800 /*pci-isa bridge config addr */
#define CFG_WINBOND_IDE_CFG_ADDR 0x80005900 /*ide config addr */

2
include/configs/Sandpoint8245.h
Unescape View File

@ -203,7 +203,7 @@
*/
#define CFG_WINBOND_83C553 1 /*has a winbond bridge */
#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */
#define CFG_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */
#define CFG_WINBOND_ISA_CFG_ADDR 0x80005800 /*pci-isa bridge config addr */
#define CFG_WINBOND_IDE_CFG_ADDR 0x80005900 /*ide config addr */

Write Preview
Loading…
Cancel
Save