diff options
author | Gabe Black <gabeblack@google.com> | 2013-08-09 04:27:35 -0700 |
---|---|---|
committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-05 18:44:08 +0200 |
commit | 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch) | |
tree | fabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/drivers/storage/storage.c | |
parent | b77431336e44ba9721f18220e2a7dedafe250528 (diff) |
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>
Diffstat (limited to 'payloads/libpayload/drivers/storage/storage.c')
-rw-r--r-- | payloads/libpayload/drivers/storage/storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c index ae60309401..ccfd02cc23 100644 --- a/payloads/libpayload/drivers/storage/storage.c +++ b/payloads/libpayload/drivers/storage/storage.c @@ -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 } |