kconfig: Move some options out of the libpayload Kconfig.
The only thing left there are the USB options. Correspondingly the only
implementation left in the libpayload directory is the USB stack.
Change-Id: If48387fbf0f5f7b59c576b020fb3b46f64a6810a
diff --git a/src/base/Kconfig b/src/base/Kconfig
index 778d71c..04ab3ba 100644
--- a/src/base/Kconfig
+++ b/src/base/Kconfig
@@ -31,3 +31,5 @@
config MAX_TIMESTAMPS
int "Max number of timestamps in the timestamp table"
default 60
+
+source src/base/libc/Kconfig
diff --git a/src/base/libc/Kconfig b/src/base/libc/Kconfig
new file mode 100644
index 0000000..e25c7e8
--- /dev/null
+++ b/src/base/libc/Kconfig
@@ -0,0 +1,31 @@
+##
+## Copyright 2016 Google Inc. All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+config DEBUG_MALLOC
+ bool "Debug memory allocator"
+ depends on USB
+ default n
+ help
+ Select this option if you want to debug the memory allocator. This
+ option logs all uses of the following functions:
+
+ void free(void *ptr);
+ void *malloc(size_t size);
+ void *calloc(size_t nmemb, size_t size);
+ void *realloc(void *ptr, size_t size);
+ void *memalign(size_t align, size_t size);
+
+ Say N here unless you are debugging memory allocator problems.
diff --git a/src/drivers/console/Kconfig b/src/drivers/console/Kconfig
index a1ca435..5f0f576 100644
--- a/src/drivers/console/Kconfig
+++ b/src/drivers/console/Kconfig
@@ -33,3 +33,14 @@
config DRIVER_CONSOLE_UEFI
bool "Provide a console which calls back into UEFI"
default n
+
+
+config SERIAL_SET_SPEED
+ bool "Override the serial console baud rate"
+ default n
+ depends on DRIVER_CONSOLE_UART
+
+config SERIAL_BAUD_RATE
+ int "Serial console baud rate (default 115200)"
+ depends on SERIAL_SET_SPEED
+ default 115200
diff --git a/src/libpayload/Kconfig b/src/libpayload/Kconfig
index 4eceb5c..bafa671 100644
--- a/src/libpayload/Kconfig
+++ b/src/libpayload/Kconfig
@@ -26,20 +26,6 @@
## SUCH DAMAGE.
##
-menu "Console Options"
-
-config SERIAL_SET_SPEED
- bool "Override the serial console baud rate"
- default n
- depends on DRIVER_CONSOLE_UART
-
-config SERIAL_BAUD_RATE
- int "Serial console baud rate (default 115200)"
- depends on SERIAL_SET_SPEED
- default 115200
-
-endmenu
-
menu "Drivers"
config USB
@@ -130,23 +116,3 @@
default n
endmenu
-
-menu "Debugging"
-
-config DEBUG_MALLOC
- bool "Debug memory allocator"
- depends on USB
- default n
- help
- Select this option if you want to debug the memory allocator. This
- option logs all uses of the following functions:
-
- void free(void *ptr);
- void *malloc(size_t size);
- void *calloc(size_t nmemb, size_t size);
- void *realloc(void *ptr, size_t size);
- void *memalign(size_t align, size_t size);
-
- Say N here unless you are debugging memory allocator problems.
-
-endmenu
