diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2011-11-24 13:43:43 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-28 09:23:24 +0100 |
commit | bda834847dd7570e0effc4762fbfc4e05d705a24 (patch) | |
tree | a2360f0f7cb522f39eb73a05d377980d6dfa2e3e /drivers/ata | |
parent | 092366c1a953e0c62b9f2f4d4ac908249339f629 (diff) | |
download | barebox-bda834847dd7570e0effc4762fbfc4e05d705a24.tar.gz barebox-bda834847dd7570e0effc4762fbfc4e05d705a24.tar.xz |
ATA/DISK: Reorganize file structure and names for future updates
'ATA' means more an interface than a disk drive. Change the names to reflect
their real meaning.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/Kconfig | 23 | ||||
-rw-r--r-- | drivers/ata/Makefile | 2 | ||||
-rw-r--r-- | drivers/ata/disk_drive.c | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 5be1805550..025ff942b7 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -1,27 +1,30 @@ -menuconfig ATA +menuconfig DISK select BLOCK - bool "ATA " + bool "Disk support " help - Add support for ATA types of drives like harddisks and CDROMs. + Add support for disk like drives like harddisks, CDROMs, SD cards and + CF cards. -if ATA +if DISK -config ATA_WRITE +config DISK_WRITE select BLOCK_WRITE - bool "support writing to ATA drives" + bool "support writing to disk drives" comment "drive types" -config ATA_DISK - bool "disk drives" +config DISK_DRIVE + bool "Generic disk drives" help - Add support for regular disk drives + Add support for generic disk drives. Common behaviour for this kind + of devices is using a partition table in the first sector. Say Y here + if you intend to work with disk drives (also CF cards and SD cards). comment "interface types" config ATA_BIOS bool "BIOS based" - select ATA_DISK + select DISK_DRIVE depends on X86_BIOS_BRINGUP help Gain disk drive access via int13 calls to the standard PC-BIOS. diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 30d15ccb02..c3260d70f8 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,6 +1,6 @@ # drive types -obj-$(CONFIG_ATA_DISK) += disk_drive.o +obj-$(CONFIG_DISK_DRIVE) += disk_drive.o # interface types diff --git a/drivers/ata/disk_drive.c b/drivers/ata/disk_drive.c index 6a5dc873f7..c2a6a5120d 100644 --- a/drivers/ata/disk_drive.c +++ b/drivers/ata/disk_drive.c @@ -144,7 +144,7 @@ static int atablk_read(struct block_device *blk, void *buf, int block, return atablk->intf->read(atablk->dev, block, num_blocks, buf); } -#ifdef CONFIG_ATA_WRITE +#ifdef CONFIG_DISK_WRITE static int atablk_write(struct block_device *blk, const void *buf, int block, int num_blocks) { @@ -156,7 +156,7 @@ static int atablk_write(struct block_device *blk, const void *buf, int block, static struct block_device_ops ataops = { .read = atablk_read, -#ifdef CONFIG_ATA_WRITE +#ifdef CONFIG_DISK_WRITE .write = atablk_write, #endif }; |