sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)

Browse Source 
This patch is a raw application of

 find payloads/ -type f | \
   xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'

Change-Id: I883b03b189f59b5d998a09a2596b0391a2d5cf33
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31775
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Julius Werner
2019-03-05 16:55:15 -08:00
committed by Patrick Georgi
parent b431833c12
commit eab2a29c8b
61 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
payloads/libpayload/drivers/storage/ahci.c
View File

@@ -153,7 +153,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);
#if IS_ENABLED(CONFIG_LP_STORAGE_ATA)
#if 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);
@@ -161,7 +161,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);
#if IS_ENABLED(CONFIG_LP_STORAGE_ATAPI)
#if 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);
@@ -218,7 +218,7 @@ static void ahci_port_probe(hba_ctrl_t *const ctrl,
ahci_dev_init(ctrl, port, portnum);
}
#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
#if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED)
static u32 working_controllers[] = {
0x8086 | 0x2929 << 16, /* Mobile ICH9 */
0x8086 | 0x1c03 << 16, /* Mobile Cougar Point PCH */
@@ -236,7 +236,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);
#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
#if 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])

4
payloads/libpayload/drivers/storage/ahci_ata.c
View File

@@ -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;
}
#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
#if 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;
#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
#if 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;

2
payloads/libpayload/drivers/storage/ata.c
View File

@@ -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);
#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
#if 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;

4
payloads/libpayload/drivers/storage/storage.c
View File

@@ -28,7 +28,7 @@
*/
#include <libpayload.h>
#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
#if 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)
{
#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
#if CONFIG(LP_STORAGE_AHCI)
ahci_initialize();
#endif
}