Nico Huber (nico.h@gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7057
-gerrit
commit 4c4579e8e20c6ee439e3ce297967c1759e1417eb Author: Nico Huber nico.h@gmx.de Date: Sun Oct 12 16:23:42 2014 +0200
Adapt more CONFIG_* defines to current libpayload
Also, see this previous commit: 60d45fc Adapt CONFIG_* defines to current libpayload
Change-Id: I292ce760ff31c97e7fb55b0f19563baddd264f2a Signed-off-by: Nico Huber nico.h@gmx.de --- drivers/usb.c | 2 +- fs/blockdev.c | 12 ++++++------ main/filo.c | 4 ++-- x86/linux_load.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/usb.c b/drivers/usb.c index 0da6efa..2edf811 100644 --- a/drivers/usb.c +++ b/drivers/usb.c @@ -20,7 +20,7 @@ #include <libpayload-config.h>
/* Only use this code if libpayload is compiled with USB stack */ -#ifdef CONFIG_USB +#ifdef CONFIG_LP_USB #include <fs.h> #include <usb/usb.h> #include <usb/usbmsc.h> diff --git a/fs/blockdev.c b/fs/blockdev.c index 0105712..e112ad2 100644 --- a/fs/blockdev.c +++ b/fs/blockdev.c @@ -21,7 +21,7 @@ #include <endian.h> #include <libpayload.h> #include <libpayload-config.h> -#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE) +#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE) #include <storage/storage.h> #endif #include <config.h> @@ -251,10 +251,10 @@ int devopen(const char *name, int *reopen)
int tmp_drive = drive; switch (type) { -#if (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE)) || \ +#if (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE)) || \ defined(CONFIG_IDE_DISK) || defined(CONFIG_IDE_NEW_DISK) case DISK_IDE: -#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE) +#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE) if (drive < storage_device_count()) { if (storage_probe(drive) != POLL_MEDIUM_PRESENT) return 0; @@ -391,12 +391,12 @@ static void *read_sector(unsigned long sector) if (cache_sect[hash] != sector) { cache_sect[hash] = (unsigned long) -1; switch (dev_type) { -#if (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE)) || \ +#if (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE)) || \ defined(CONFIG_IDE_DISK) || defined(CONFIG_IDE_NEW_DISK) case DISK_IDE: { int tmp_drive = dev_drive; -#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE) +#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE) if (dev_drive < storage_device_count()) { int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash); if (storage_probe(tmp_drive) == POLL_NO_MEDIUM) { @@ -466,7 +466,7 @@ static void *read_sector(unsigned long sector) printf("Disk read error dev=%d drive=%d sector=%lu\n", dev_type, dev_drive, sector); #if defined(CONFIG_IDE_NEW_DISK) || \ - (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE)) + (defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE)) err_out: #endif flush_cache(); diff --git a/main/filo.c b/main/filo.c index ab97c6a..4f26780 100644 --- a/main/filo.c +++ b/main/filo.c @@ -77,12 +77,12 @@ static void init(void) after relocation. Therefore, run lib_get_sysinfo(), again. */ lib_get_sysinfo();
-#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE) +#if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_LP_STORAGE) /* libpayload storage drivers */ storage_initialize(); #endif #if defined(CONFIG_USB_DISK) -#if defined(CONFIG_USB) +#if defined(CONFIG_LP_USB) /* libpayload USB stack is there */ usb_initialize(); #else diff --git a/x86/linux_load.c b/x86/linux_load.c index 93f6725..e003634 100644 --- a/x86/linux_load.c +++ b/x86/linux_load.c @@ -813,7 +813,7 @@ int linux_load(const char *file, const char *cmdline) }
file_close(); -#if defined(CONFIG_USB) +#if defined(CONFIG_LP_USB) usb_exit(); #endif