summaryrefslogtreecommitdiff
path: root/payloads/libpayload/tests/libpayload-config.h
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-08-09 04:27:35 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-08-05 18:44:08 +0200
commit1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch)
treefabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/tests/libpayload-config.h
parentb77431336e44ba9721f18220e2a7dedafe250528 (diff)
downloadcoreboot-1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f.tar.xz
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/tests/libpayload-config.h')
-rw-r--r--payloads/libpayload/tests/libpayload-config.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/payloads/libpayload/tests/libpayload-config.h b/payloads/libpayload/tests/libpayload-config.h
index 6fe99a9a79..68995b8461 100644
--- a/payloads/libpayload/tests/libpayload-config.h
+++ b/payloads/libpayload/tests/libpayload-config.h
@@ -4,27 +4,27 @@
* Sat Mar 9 10:22:45 2013
*/
#define AUTOCONF_INCLUDED
-#define CONFIG_SPEAKER 1
-#define CONFIG_STORAGE 1
-#define CONFIG_LIBC 1
-#define CONFIG_CBFS 1
-#define CONFIG_VGA_VIDEO_CONSOLE 1
-#define CONFIG_SERIAL_CONSOLE 1
-#define CONFIG_PC_KEYBOARD 1
-#define CONFIG_ARCH_X86 1
-#define CONFIG_STORAGE_ATA 1
-#define CONFIG_ARCH_SPECIFIC_OPTIONS 1
-#define CONFIG_STORAGE_AHCI_ONLY_TESTED 1
-#define CONFIG_X86_SERIAL_CONSOLE 1
-#define CONFIG_PDCURSES 1
-#define CONFIG_NVRAM 1
-#define CONFIG_PC_KEYBOARD_LAYOUT_US 1
-#define CONFIG_STORAGE_AHCI 1
-#define CONFIG_MULTIBOOT 1
-#define CONFIG_SERIAL_IOBASE 0x3f8
-#define CONFIG_CURSES 1
-#define CONFIG_CBMEM_CONSOLE 1
-#define CONFIG_LITTLE_ENDIAN 1
-#define CONFIG_PCI 1
-#define CONFIG_STORAGE_ATAPI 1
-#define CONFIG_VIDEO_CONSOLE 1
+#define CONFIG_LP_SPEAKER 1
+#define CONFIG_LP_STORAGE 1
+#define CONFIG_LP_LIBC 1
+#define CONFIG_LP_CBFS 1
+#define CONFIG_LP_VGA_VIDEO_CONSOLE 1
+#define CONFIG_LP_SERIAL_CONSOLE 1
+#define CONFIG_LP_PC_KEYBOARD 1
+#define CONFIG_LP_ARCH_X86 1
+#define CONFIG_LP_STORAGE_ATA 1
+#define CONFIG_LP_ARCH_SPECIFIC_OPTIONS 1
+#define CONFIG_LP_STORAGE_AHCI_ONLY_TESTED 1
+#define CONFIG_LP_X86_SERIAL_CONSOLE 1
+#define CONFIG_LP_PDCURSES 1
+#define CONFIG_LP_NVRAM 1
+#define CONFIG_LP_PC_KEYBOARD_LAYOUT_US 1
+#define CONFIG_LP_STORAGE_AHCI 1
+#define CONFIG_LP_MULTIBOOT 1
+#define CONFIG_LP_SERIAL_IOBASE 0x3f8
+#define CONFIG_LP_CURSES 1
+#define CONFIG_LP_CBMEM_CONSOLE 1
+#define CONFIG_LP_LITTLE_ENDIAN 1
+#define CONFIG_LP_PCI 1
+#define CONFIG_LP_STORAGE_ATAPI 1
+#define CONFIG_LP_VIDEO_CONSOLE 1