summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers/storage
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-29 15:47:34 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-06-30 18:55:15 +0200
commit1b4d39428eac80bc76713b1f21a2c85e8900c1b8 (patch)
treee2b9dfea6be47c785fa55964950c691643d0a232 /payloads/libpayload/drivers/storage
parentde60c8899680f362a908d68efe9e4154ab3380be (diff)
downloadcoreboot-1b4d39428eac80bc76713b1f21a2c85e8900c1b8.tar.xz
libpayload: Make Kconfig bools use IS_ENABLED()
This will make the code work with the different styles of Kconfig (emit unset bools vs don't emit unset bools) Roughly, the patch does this, and a little bit of fixing up: perl -pi -e 's,ifdef (CONFIG_LP_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]` perl -pi -e 's,ifndef (CONFIG_LP_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]` Change-Id: Ib8a839b056a1f806a8597052e1b571ea3d18a79f Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/10711 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/drivers/storage')
-rw-r--r--payloads/libpayload/drivers/storage/ahci.c8
-rw-r--r--payloads/libpayload/drivers/storage/ahci_ata.c4
-rw-r--r--payloads/libpayload/drivers/storage/ata.c2
-rw-r--r--payloads/libpayload/drivers/storage/storage.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c
index 4eef8435f6..deae9e2471 100644
--- a/payloads/libpayload/drivers/storage/ahci.c
+++ b/payloads/libpayload/drivers/storage/ahci.c
@@ -152,7 +152,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl,
switch (port->signature) {
case HBA_PxSIG_ATA:
printf("ahci: ATA drive on port #%d.\n", portnum);
-#ifdef CONFIG_LP_STORAGE_ATA
+#if IS_ENABLED(CONFIG_LP_STORAGE_ATA)
dev->ata_dev.identify = ahci_identify_device;
dev->ata_dev.read_sectors = ahci_ata_read_sectors;
return ata_attach_device(&dev->ata_dev, PORT_TYPE_SATA);
@@ -160,7 +160,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl,
break;
case HBA_PxSIG_ATAPI:
printf("ahci: ATAPI drive on port #%d.\n", portnum);
-#ifdef CONFIG_LP_STORAGE_ATAPI
+#if IS_ENABLED(CONFIG_LP_STORAGE_ATAPI)
dev->atapi_dev.identify = ahci_identify_device;
dev->atapi_dev.packet_read_cmd = ahci_packet_read_cmd;
return atapi_attach_device(&dev->atapi_dev, PORT_TYPE_SATA);
@@ -217,7 +217,7 @@ static void ahci_port_probe(hba_ctrl_t *const ctrl,
ahci_dev_init(ctrl, port, portnum);
}
-#ifdef CONFIG_LP_STORAGE_AHCI_ONLY_TESTED
+#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
static u32 working_controllers[] = {
0x8086 | 0x2929 << 16, /* Mobile ICH9 */
0x8086 | 0x1e03 << 16, /* Mobile Panther Point PCH */
@@ -233,7 +233,7 @@ static void ahci_init_pci(pcidev_t dev)
const u16 vendor = pci_read_config16(dev, 0x00);
const u16 device = pci_read_config16(dev, 0x02);
-#ifdef CONFIG_LP_STORAGE_AHCI_ONLY_TESTED
+#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
const u32 vendor_device = pci_read_config32(dev, 0x0);
for (i = 0; i < ARRAY_SIZE(working_controllers); ++i)
if (vendor_device == working_controllers[i])
diff --git a/payloads/libpayload/drivers/storage/ahci_ata.c b/payloads/libpayload/drivers/storage/ahci_ata.c
index a9380b647b..2c916fda49 100644
--- a/payloads/libpayload/drivers/storage/ahci_ata.c
+++ b/payloads/libpayload/drivers/storage/ahci_ata.c
@@ -56,7 +56,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev,
printf("ahci: Sector count too high (max. 256).\n");
count = 256;
}
-#ifdef CONFIG_LP_STORAGE_64BIT_LBA
+#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
} else if (ata_dev->read_cmd == ATA_READ_DMA_EXT) {
if (start >= (1ULL << 48)) {
printf("ahci: Sector is not 48-bit addressable.\n");
@@ -84,7 +84,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev,
dev->cmdtable->fis[ 6] = (start >> 16) & 0xff;
dev->cmdtable->fis[ 7] = FIS_H2D_DEV_LBA;
dev->cmdtable->fis[ 8] = (start >> 24) & 0xff;
-#ifdef CONFIG_LP_STORAGE_64BIT_LBA
+#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
if (ata_dev->read_cmd == ATA_READ_DMA_EXT) {
dev->cmdtable->fis[ 9] = (start >> 32) & 0xff;
dev->cmdtable->fis[10] = (start >> 40) & 0xff;
diff --git a/payloads/libpayload/drivers/storage/ata.c b/payloads/libpayload/drivers/storage/ata.c
index f1cf28f91e..80178c313d 100644
--- a/payloads/libpayload/drivers/storage/ata.c
+++ b/payloads/libpayload/drivers/storage/ata.c
@@ -212,7 +212,7 @@ int ata_attach_device(ata_dev_t *const dev, const storage_port_t port_type)
ata_strncpy(model, id + 27, sizeof(model));
printf("ata: Identified %s [%s]\n", model, fw);
-#ifdef CONFIG_LP_STORAGE_64BIT_LBA
+#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
if (id[ATA_CMDS_AND_FEATURE_SETS + 1] & (1 << 10)) {
printf("ata: Support for LBA-48 enabled.\n");
dev->read_cmd = ATA_READ_DMA_EXT;
diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c
index ccfd02cc23..c4cfd40293 100644
--- a/payloads/libpayload/drivers/storage/storage.c
+++ b/payloads/libpayload/drivers/storage/storage.c
@@ -28,7 +28,7 @@
*/
#include <libpayload.h>
-#ifdef CONFIG_LP_STORAGE_AHCI
+#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
# include <storage/ahci.h>
#endif
#include <storage/storage.h>
@@ -110,7 +110,7 @@ ssize_t storage_read_blocks512(const size_t dev_num,
*/
void storage_initialize(void)
{
-#ifdef CONFIG_LP_STORAGE_AHCI
+#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
ahci_initialize();
#endif
}