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

libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.

Browse Source 
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:
Gabe Black
2013-08-09 04:27:35 -07:00
committed by Isaac Christensen
parent b77431336e
commit 1ee2c6dbdf
58 changed files with 523 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
payloads/libpayload/drivers/Makefile.inc
View File

@@ -29,65 +29,65 @@
## SUCH DAMAGE.
##
libc-$(CONFIG_PCI) += pci.c
libc-$(CONFIG_LP_PCI) += pci.c
libc-$(CONFIG_SPEAKER) += speaker.c
libc-$(CONFIG_LP_SPEAKER) += speaker.c
libc-$(CONFIG_X86_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_LP_X86_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
libc-$(CONFIG_LP_PC_KEYBOARD) += keyboard.c
libc-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.c
libc-$(CONFIG_LP_CBMEM_CONSOLE) += cbmem_console.c
libc-$(CONFIG_NVRAM) += nvram.c
libc-$(CONFIG_NVRAM) += options.c
libc-$(CONFIG_LP_NVRAM) += nvram.c
libc-$(CONFIG_LP_NVRAM) += options.c
# Video console drivers
libc-$(CONFIG_VIDEO_CONSOLE) += video/video.c
libc-$(CONFIG_VGA_VIDEO_CONSOLE) += video/vga.c
libc-$(CONFIG_LP_VIDEO_CONSOLE) += video/video.c
libc-$(CONFIG_LP_VGA_VIDEO_CONSOLE) += video/vga.c
# Geode LX console drivers
libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/geodelx.c
libc-$(CONFIG_GEODELX_VIDEO_CONSOLE) += video/font8x16.c
libc-$(CONFIG_LP_GEODELX_VIDEO_CONSOLE) += video/geodelx.c
libc-$(CONFIG_LP_GEODELX_VIDEO_CONSOLE) += video/font8x16.c
# coreboot generic framebuffer driver
libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/corebootfb.c
libc-$(CONFIG_COREBOOT_VIDEO_CONSOLE) += video/font8x16.c
# AHCI/ATAPI driver
libc-$(CONFIG_STORAGE) += storage/storage.c
libc-$(CONFIG_STORAGE_AHCI) += storage/ahci.c
libc-$(CONFIG_STORAGE_AHCI) += storage/ahci_common.c
ifeq ($(CONFIG_STORAGE_ATA),y)
libc-$(CONFIG_STORAGE_ATA) += storage/ata.c
libc-$(CONFIG_STORAGE_ATA) += storage/ahci_ata.c
libc-$(CONFIG_LP_STORAGE) += storage/storage.c
libc-$(CONFIG_LP_STORAGE_AHCI) += storage/ahci.c
libc-$(CONFIG_LP_STORAGE_AHCI) += storage/ahci_common.c
ifeq ($(CONFIG_LP_STORAGE_ATA),y)
libc-$(CONFIG_LP_STORAGE_ATA) += storage/ata.c
libc-$(CONFIG_LP_STORAGE_ATA) += storage/ahci_ata.c
endif
ifeq ($(CONFIG_STORAGE_ATAPI),y)
libc-$(CONFIG_STORAGE_ATAPI) += storage/atapi.c
libc-$(CONFIG_STORAGE_ATAPI) += storage/ahci_atapi.c
ifeq ($(CONFIG_LP_STORAGE_ATAPI),y)
libc-$(CONFIG_LP_STORAGE_ATAPI) += storage/atapi.c
libc-$(CONFIG_LP_STORAGE_ATAPI) += storage/ahci_atapi.c
endif
# USB stack
libc-$(CONFIG_USB) += usb/usbinit.c
libc-$(CONFIG_USB) += usb/usb.c
libc-$(CONFIG_USB) += usb/usb_dev.c
libc-$(CONFIG_USB) += usb/quirks.c
libc-$(CONFIG_USB_GEN_HUB) += usb/generic_hub.c
libc-$(CONFIG_USB_HUB) += usb/usbhub.c
libc-$(CONFIG_USB_UHCI) += usb/uhci.c
libc-$(CONFIG_USB_UHCI) += usb/uhci_rh.c
libc-$(CONFIG_USB_OHCI) += usb/ohci.c
libc-$(CONFIG_USB_OHCI) += usb/ohci_rh.c
libc-$(CONFIG_USB_EHCI) += usb/ehci.c
libc-$(CONFIG_USB_EHCI) += usb/ehci_rh.c
libc-$(CONFIG_USB_XHCI) += usb/xhci.c
libc-$(CONFIG_USB_XHCI) += usb/xhci_debug.c
libc-$(CONFIG_USB_XHCI) += usb/xhci_devconf.c
libc-$(CONFIG_USB_XHCI) += usb/xhci_events.c
libc-$(CONFIG_USB_XHCI) += usb/xhci_commands.c
libc-$(CONFIG_USB_XHCI) += usb/xhci_rh.c
libc-$(CONFIG_USB_HID) += usb/usbhid.c
libc-$(CONFIG_USB_MSC) += usb/usbmsc.c
libc-$(CONFIG_LP_USB) += usb/usbinit.c
libc-$(CONFIG_LP_USB) += usb/usb.c
libc-$(CONFIG_LP_USB) += usb/usb_dev.c
libc-$(CONFIG_LP_USB) += usb/quirks.c
libc-$(CONFIG_LP_USB_GEN_HUB) += usb/generic_hub.c
libc-$(CONFIG_LP_USB_HUB) += usb/usbhub.c
libc-$(CONFIG_LP_USB_UHCI) += usb/uhci.c
libc-$(CONFIG_LP_USB_UHCI) += usb/uhci_rh.c
libc-$(CONFIG_LP_USB_OHCI) += usb/ohci.c
libc-$(CONFIG_LP_USB_OHCI) += usb/ohci_rh.c
libc-$(CONFIG_LP_USB_EHCI) += usb/ehci.c
libc-$(CONFIG_LP_USB_EHCI) += usb/ehci_rh.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci_debug.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci_devconf.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci_events.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci_commands.c
libc-$(CONFIG_LP_USB_XHCI) += usb/xhci_rh.c
libc-$(CONFIG_LP_USB_HID) += usb/usbhid.c
libc-$(CONFIG_LP_USB_MSC) += usb/usbmsc.c
# used by both USB HID and keyboard
libc-y += hid.c

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

@@ -41,7 +41,7 @@ struct layout_maps {
static struct layout_maps *map;
static struct layout_maps keyboard_layouts[] = {
#ifdef CONFIG_PC_KEYBOARD_LAYOUT_US
#ifdef CONFIG_LP_PC_KEYBOARD_LAYOUT_US
{ .country = "us", .map = {
{ /* No modifier */
0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
@@ -97,7 +97,7 @@ static struct layout_maps keyboard_layouts[] = {
}
}},
#endif
#ifdef CONFIG_PC_KEYBOARD_LAYOUT_DE
#ifdef CONFIG_LP_PC_KEYBOARD_LAYOUT_DE
{ .country = "de", .map = {
{ /* No modifier */
0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,

2
payloads/libpayload/drivers/nvram.c
View File

@@ -60,7 +60,7 @@
* doesn't try to do this on its own.
*/
#define RTC_PORT_STANDARD 0x70
#ifdef CONFIG_RTC_PORT_EXTENDED_VIA
#ifdef CONFIG_LP_RTC_PORT_EXTENDED_VIA
#define RTC_PORT_EXTENDED 0x74
#else
#define RTC_PORT_EXTENDED 0x72

12
payloads/libpayload/drivers/serial.c
View File

@@ -39,7 +39,7 @@ static int serial_is_mem_mapped = 0;
static uint8_t serial_read_reg(int offset)
{
#ifdef CONFIG_IO_ADDRESS_SPACE
#ifdef CONFIG_LP_IO_ADDRESS_SPACE
if (!serial_is_mem_mapped)
return inb(IOBASE + offset);
else
@@ -49,7 +49,7 @@ static uint8_t serial_read_reg(int offset)
static void serial_write_reg(uint8_t val, int offset)
{
#ifdef CONFIG_IO_ADDRESS_SPACE
#ifdef CONFIG_LP_IO_ADDRESS_SPACE
if (!serial_is_mem_mapped)
outb(val, IOBASE + offset);
else
@@ -57,7 +57,7 @@ static void serial_write_reg(uint8_t val, int offset)
writeb(val, MEMBASE + offset);
}
#ifdef CONFIG_SERIAL_SET_SPEED
#ifdef CONFIG_LP_SERIAL_SET_SPEED
static void serial_hardware_init(int speed, int word_bits,
int parity, int stop_bits)
{
@@ -102,7 +102,7 @@ void serial_init(void)
(lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED);
if (!serial_is_mem_mapped) {
#ifdef CONFIG_IO_ADDRESS_SPACE
#ifdef CONFIG_LP_IO_ADDRESS_SPACE
if ((inb(IOBASE + 0x05) == 0xFF) &&
(inb(IOBASE + 0x06) == 0xFF)) {
printf("IO space mapped serial not present.");
@@ -114,8 +114,8 @@ void serial_init(void)
#endif
}
#ifdef CONFIG_SERIAL_SET_SPEED
serial_hardware_init(CONFIG_SERIAL_BAUD_RATE, 8, 0, 1);
#ifdef CONFIG_LP_SERIAL_SET_SPEED
serial_hardware_init(CONFIG_LP_SERIAL_BAUD_RATE, 8, 0, 1);
#endif
console_add_input_driver(&consin);
console_add_output_driver(&consout);

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

@@ -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])

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);
#ifdef CONFIG_STORAGE_64BIT_LBA
#ifdef 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>
#ifdef CONFIG_STORAGE_AHCI
#ifdef 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_STORAGE_AHCI
#ifdef CONFIG_LP_STORAGE_AHCI
ahci_initialize();
#endif
}

2
payloads/libpayload/drivers/usb/ehci.c
View File

@@ -805,7 +805,7 @@ ehci_init (unsigned long physical_bar)
return controller;
}
#ifdef CONFIG_USB_PCI
#ifdef CONFIG_LP_USB_PCI
hci_t *
ehci_pci_init (pcidev_t addr)
{

2
payloads/libpayload/drivers/usb/ohci.c
View File

@@ -251,7 +251,7 @@ ohci_init (unsigned long physical_bar)
return controller;
}
#ifdef CONFIG_USB_PCI
#ifdef CONFIG_LP_USB_PCI
hci_t *
ohci_pci_init (pcidev_t addr)
{

6
payloads/libpayload/drivers/usb/usb.c
View File

@@ -464,7 +464,7 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
break;
case hid_device:
usb_debug ("HID\n");
#ifdef CONFIG_USB_HID
#ifdef CONFIG_LP_USB_HID
controller->devices[adr]->init = usb_hid_init;
return adr;
#else
@@ -482,7 +482,7 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
break;
case msc_device:
usb_debug ("MSC\n");
#ifdef CONFIG_USB_MSC
#ifdef CONFIG_LP_USB_MSC
controller->devices[adr]->init = usb_msc_init;
return adr;
#else
@@ -491,7 +491,7 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
break;
case hub_device:
usb_debug ("hub\n");
#ifdef CONFIG_USB_HUB
#ifdef CONFIG_LP_USB_HUB
controller->devices[adr]->init = usb_hub_init;
return adr;
#else

2
payloads/libpayload/drivers/usb/usbhid.c
View File

@@ -138,7 +138,7 @@ struct layout_maps {
static const struct layout_maps *map;
static const struct layout_maps keyboard_layouts[] = {
// #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US
// #ifdef CONFIG_LP_PC_KEYBOARD_LAYOUT_US
{ .country = "us", .map = {
{ /* No modifier */
-1, -1, -1, -1, 'a', 'b', 'c', 'd',

28
payloads/libpayload/drivers/usb/usbinit.c
View File

@@ -36,7 +36,7 @@
#include "xhci.h"
#include <usb/usbdisk.h>
#ifdef CONFIG_USB_PCI
#ifdef CONFIG_LP_USB_PCI
/**
* Initializes USB controller attached to PCI
*
@@ -71,7 +71,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
pciid >> 16, pciid & 0xFFFF, func);
switch (prog_if) {
case 0x00:
#ifdef CONFIG_USB_UHCI
#ifdef CONFIG_LP_USB_UHCI
usb_debug("UHCI controller\n");
uhci_pci_init (pci_device);
#else
@@ -80,7 +80,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
break;
case 0x10:
#ifdef CONFIG_USB_OHCI
#ifdef CONFIG_LP_USB_OHCI
usb_debug("OHCI controller\n");
ohci_pci_init(pci_device);
#else
@@ -89,7 +89,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
break;
case 0x20:
#ifdef CONFIG_USB_EHCI
#ifdef CONFIG_LP_USB_EHCI
usb_debug("EHCI controller\n");
ehci_pci_init(pci_device);
#else
@@ -98,7 +98,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
break;
case 0x30:
#ifdef CONFIG_USB_XHCI
#ifdef CONFIG_LP_USB_XHCI
usb_debug("xHCI controller\n");
xhci_pci_init(pci_device);
#else
@@ -156,17 +156,17 @@ static void usb_scan_pci_bus(int bus)
}
#endif
#ifdef CONFIG_USB_MEMORY
#ifdef CONFIG_LP_USB_MEMORY
static void usb_scan_memory(void)
{
#ifdef CONFIG_USB_XHCI
xhci_init(CONFIG_USB_XHCI_BASE_ADDRESS);
#ifdef CONFIG_LP_USB_XHCI
xhci_init(CONFIG_LP_USB_XHCI_BASE_ADDRESS);
#endif
#ifdef CONFIG_USB_EHCI
ehci_init(CONFIG_USB_EHCI_BASE_ADDRESS);
#ifdef CONFIG_LP_USB_EHCI
ehci_init(CONFIG_LP_USB_EHCI_BASE_ADDRESS);
#endif
#ifdef CONFIG_USB_OHCI
ohci_init(CONFIG_USB_OHCI_BASE_ADDRESS);
#ifdef CONFIG_LP_USB_OHCI
ohci_init(CONFIG_LP_USB_OHCI_BASE_ADDRESS);
#endif
}
#endif
@@ -176,10 +176,10 @@ static void usb_scan_memory(void)
*/
int usb_initialize(void)
{
#ifdef CONFIG_USB_PCI
#ifdef CONFIG_LP_USB_PCI
usb_scan_pci_bus(0);
#endif
#ifdef CONFIG_USB_MEMORY
#ifdef CONFIG_LP_USB_MEMORY
usb_scan_memory();
#endif
return 0;

6
payloads/libpayload/drivers/usb/xhci.c
View File

@@ -297,7 +297,7 @@ _free_controller:
return NULL;
}
#ifdef CONFIG_USB_PCI
#ifdef CONFIG_LP_USB_PCI
hci_t *
xhci_pci_init (pcidev_t addr)
{
@@ -344,8 +344,8 @@ xhci_reinit (hci_t *controller)
return;
/* Enable all available slots */
xhci->opreg->config = xhci->capreg->MaxSlots & CONFIG_MASK_MaxSlotsEn;
xhci->max_slots_en = xhci->capreg->MaxSlots & CONFIG_MASK_MaxSlotsEn;
xhci->opreg->config = xhci->capreg->MaxSlots & CONFIG_LP_MASK_MaxSlotsEn;
xhci->max_slots_en = xhci->capreg->MaxSlots & CONFIG_LP_MASK_MaxSlotsEn;
/* Set DCBAA */
xhci->opreg->dcbaap_lo = virt_to_phys(xhci->dcbaa);

2
payloads/libpayload/drivers/usb/xhci_private.h
View File

@@ -389,7 +389,7 @@ typedef struct xhci {
u32 dcbaap_lo;
u32 dcbaap_hi;
u32 config;
#define CONFIG_MASK_MaxSlotsEn 0xff
#define CONFIG_LP_MASK_MaxSlotsEn 0xff
u8 res3[0x3ff-0x3c+1];
struct {
u32 portsc;

12
payloads/libpayload/drivers/video/video.c
View File

@@ -31,27 +31,27 @@
#include <libpayload.h>
#include <video_console.h>
#ifdef CONFIG_GEODELX_VIDEO_CONSOLE
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
extern struct video_console geodelx_video_console;
#endif
#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
extern struct video_console coreboot_video_console;
#endif
#ifdef CONFIG_VGA_VIDEO_CONSOLE
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
extern struct video_console vga_video_console;
#endif
static struct video_console *console_list[] =
{
#ifdef CONFIG_GEODELX_VIDEO_CONSOLE
#ifdef CONFIG_LP_GEODELX_VIDEO_CONSOLE
&geodelx_video_console,
#endif
#ifdef CONFIG_COREBOOT_VIDEO_CONSOLE
#ifdef CONFIG_LP_COREBOOT_VIDEO_CONSOLE
&coreboot_video_console,
#endif
#ifdef CONFIG_VGA_VIDEO_CONSOLE
#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE
&vga_video_console,
#endif
};