libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.
When libpayload header files are included in the payload itself, it's possible that the payloads config settings will conflict with the ones in libpayload. It's also possible for the libpayload config settings to conflict with the payloads. To avoid that, the libpayload config settings have _LP_ (for libpayload) added to them. The symbols themselves as defined in the Config.in files are still the same, but the prefix added to them is now CONFIG_LP_ instead of just CONFIG_. Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65303 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Gabe Black <gabeblack@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> (cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6427 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
committed by
Isaac Christensen
parent
b77431336e
commit
1ee2c6dbdf
@@ -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_STORAGE_ATA
|
||||
#ifdef 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_STORAGE_ATAPI
|
||||
#ifdef 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_STORAGE_AHCI_ONLY_TESTED
|
||||
#ifdef 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_STORAGE_AHCI_ONLY_TESTED
|
||||
#ifdef 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])
|
||||
|
Reference in New Issue
Block a user