V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

drivers/block: Move conditional compilation to Makefile 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-08-13 01:40:39 +02:00
parent 1a6ffbfaf4
commit 1a02806c4b
7 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/Makefile
View File

@ -25,14 +25,14 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libblock.a LIB := $(obj)libblock.a
COBJS-y += ahci.o COBJS-$(CONFIG_SCSI_AHCI) += ahci.o
COBJS-y += ata_piix.o COBJS-$(CONFIG_ATA_PIIX) += ata_piix.o
COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o
COBJS-$(CONFIG_LIBATA) += libata.o COBJS-$(CONFIG_LIBATA) += libata.o
COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
COBJS-y += sil680.o COBJS-$(CONFIG_IDE_SIL680) += sil680.o
COBJS-y += sym53c8xx.o COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
COBJS-y += systemace.o COBJS-$(CONFIG_SYSTEMACE) += systemace.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

3
drivers/block/ahci.c
View File

@ -26,8 +26,6 @@
*/ */
#include <common.h> #include <common.h>
#ifdef CONFIG_SCSI_AHCI
#include <command.h> #include <command.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
@ -700,4 +698,3 @@ void scsi_print_error(ccb * pccb)
{ {
/*The ahci error info can be read in the ahci driver*/ /*The ahci error info can be read in the ahci driver*/
} }
#endif

4
drivers/block/ata_piix.c
View File

@ -35,8 +35,6 @@
#include <ide.h> #include <ide.h>
#include <ata.h> #include <ata.h>
#ifdef CFG_ATA_PIIX /*ata_piix driver */
extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE]; extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE];
extern int curr_device; extern int curr_device;
@ -756,5 +754,3 @@ int scan_sata(int dev)
{ {
return 0; return 0;
} }
#endif

5
drivers/block/sil680.c
View File

@ -27,7 +27,7 @@
* The following parameters must be defined in the configuration file * The following parameters must be defined in the configuration file
* of the target board: * of the target board:
* *
* #define CFG_IDE_SIL680 * #define CONFIG_IDE_SIL680
* *
* #define CONFIG_PCI_PNP * #define CONFIG_PCI_PNP
* NOTE it may also be necessary to define this if the default of 8 is * NOTE it may also be necessary to define this if the default of 8 is
@ -54,7 +54,6 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CFG_IDE_SIL680)
#include <ata.h> #include <ata.h>
#include <ide.h> #include <ide.h>
#include <pci.h> #include <pci.h>
@ -106,5 +105,3 @@ int ide_preinit (void)
void ide_set_reset (int flag) { void ide_set_reset (int flag) {
return; return;
} }
#endif /* CFG_IDE_SIL680 */

5
drivers/block/sym53c8xx.c
View File

@ -35,8 +35,6 @@
#include <common.h> #include <common.h>
#ifdef CONFIG_SCSI_SYM53C8XX
#include <command.h> #include <command.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
@ -870,6 +868,3 @@ void scsi_chip_init(void)
#endif #endif
} }
#endif #endif
#endif /* CONFIG_SCSI_SYM53C8XX */

3
drivers/block/systemace.c
View File

@ -44,8 +44,6 @@
#include <part.h> #include <part.h>
#include <asm/io.h> #include <asm/io.h>
#ifdef CONFIG_SYSTEMACE
/* /*
* The ace_readw and writew functions read/write 16bit words, but the * The ace_readw and writew functions read/write 16bit words, but the
* offset value is the BYTE offset as most used in the Xilinx * offset value is the BYTE offset as most used in the Xilinx
@ -255,4 +253,3 @@ static unsigned long systemace_read(int dev, unsigned long start,
return blkcnt; return blkcnt;
} }
#endif /* CONFIG_SYSTEMACE */

2
include/configs/sc520_cdp.h
View File

@ -178,7 +178,7 @@
#define CFG_SATA_MAXBUS 2 /*Max Sata buses supported */ #define CFG_SATA_MAXBUS 2 /*Max Sata buses supported */
#define CFG_SATA_DEVS_PER_BUS 2 /*Max no. of devices per bus/port */ #define CFG_SATA_DEVS_PER_BUS 2 /*Max no. of devices per bus/port */
#define CFG_SATA_MAX_DEVICE (CFG_SATA_MAXBUS* CFG_SATA_DEVS_PER_BUS) #define CFG_SATA_MAX_DEVICE (CFG_SATA_MAXBUS* CFG_SATA_DEVS_PER_BUS)
#define CFG_ATA_PIIX 1 /*Supports ata_piix driver */ #define CONFIG_ATA_PIIX 1 /*Supports ata_piix driver */
/************************************************************ /************************************************************
* DISK Partition support * DISK Partition support