summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2014-03-13 09:08:48 (GMT)
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-04-22 20:19:40 (GMT)
commit8315fc84e0e0b40d4f6b2980bae4d6a13cafa3d0 (patch)
tree45d8c72d38639c7e160060be58fd0b9bfc42fec3
parent74edafd92073f420afa426b7dbe63b284738aa60 (diff)
downloaddepthcharge-stabilize-5791.0.B.tar.gz
depthcharge-stabilize-5791.0.B.tar.xz
cli: Rename the CONFIG_CONSOLE option to CONFIG_CLIstabilize-5791.0.B
The option controls the availability of the CLI, not the console which is separate and always available. CQ-DEPEND=CL:189800 BUG=None BRANCH=None TEST=Built for rambi as follows: USE='fwserial fwconsole' emerge-rambi coreboot depthcharge chromeos-bootimage started it on a Rambi, observed it fall into the CLI on startup Change-Id: I4cdbdf08161a61f1d6a111a6a17b764c88df9749 Signed-off-by: Gabe Black <gabeblack@google.com> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/189810 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@gmail.com> Tested-by: Vadim Bendebury <vbendeb@gmail.com>
-rw-r--r--src/debug/Makefile.inc2
-rw-r--r--src/debug/cli/Kconfig6
-rw-r--r--src/debug/cli/Makefile.inc8
-rw-r--r--src/vboot/main.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/debug/Makefile.inc b/src/debug/Makefile.inc
index bd13bff..bd23462 100644
--- a/src/debug/Makefile.inc
+++ b/src/debug/Makefile.inc
@@ -15,4 +15,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-subdirs-y += cli
+subdirs-$(CONFIG_CLI) += cli
diff --git a/src/debug/cli/Kconfig b/src/debug/cli/Kconfig
index 08bb44f..51452ce 100644
--- a/src/debug/cli/Kconfig
+++ b/src/debug/cli/Kconfig
@@ -14,8 +14,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-config CONSOLE
- bool "Serial debug console"
+config CLI
+ bool "Command line interface"
default n
help
Enable this to have depthcharge stop at the command line prompt
@@ -24,4 +24,4 @@ config CONSOLE
config SYS_PROMPT
string "Console prompt"
default "dpch: "
- depends on CONSOLE
+ depends on CLI
diff --git a/src/debug/cli/Makefile.inc b/src/debug/cli/Makefile.inc
index 31900f3..42d990b 100644
--- a/src/debug/cli/Makefile.inc
+++ b/src/debug/cli/Makefile.inc
@@ -15,7 +15,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-depthcharge-$(CONFIG_CONSOLE) += command.c
-depthcharge-$(CONFIG_CONSOLE) += console_main.c
-depthcharge-$(CONFIG_CONSOLE) += memory.c
-depthcharge-$(CONFIG_CONSOLE) += storage.c
+depthcharge-y += command.c
+depthcharge-y += console_main.c
+depthcharge-y += memory.c
+depthcharge-y += storage.c
diff --git a/src/vboot/main.c b/src/vboot/main.c
index 9d69089..7c63c94 100644
--- a/src/vboot/main.c
+++ b/src/vboot/main.c
@@ -77,7 +77,7 @@ int main(void)
timestamp_add_now(TS_RO_VB_INIT);
- if (CONFIG_CONSOLE)
+ if (CONFIG_CLI)
console_loop();
// Set up the common param structure, not clearing shared data.