All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands
@ 2016-03-14  1:07 Simon Glass
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static Simon Glass
                   ` (8 more replies)
  0 siblings, 9 replies; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

A large chunk of the U-Boot code is its wide variety of commands. For some
applications this is not needed, since the boot can be controlled by a
board-specific hard-coded boot procedure.

Any attempt to use commands, such as running script, will result in an
error. U-Boot acts as if it supports commands in general, but there are no
actual commands to run.

This saves a significant amount of space.

For example on snow this saves 300KB of code space, with the code size
dropping from 505KB to 202KB. BSS drops from 238KB to 4KB. The size of
u-boot.bin (which includes the device tree) drops from 541KB to 228KB.

If LCD and USB support is disabled on this platform, code size drops to
139KB.

This makes U-Boot proper look a little more like SPL in terms of size.

The CONFIG_CMDLINE setting is enabled by default, but can be disabled by
boards as needed.

Note: I hopefully have addressed the comments on v1. I've run the series
through buildman to check for bisectability.

Changes in v2:
- Move the board_run_command() prototype into this patch
- Use panic() instead of hang()

Simon Glass (9):
  cbfs: Update a function to be static
  Add an option to enable the command line
  arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled
  sandbox: Avoid calling commands when not available
  Drop command-processing code when CONFIG_CMDLINE is disabled
  Panic when no command line processing can be performed
  Allow command code to compile to nothing
  Allow command-line files to be dropped
  Drop various features when the command line is not available

 README                     |  8 ++++++++
 arch/arm/cpu/u-boot.lds    |  3 +++
 arch/sandbox/cpu/start.c   | 10 +++++++++-
 arch/x86/cpu/u-boot.lds    |  4 ++++
 cmd/Kconfig                | 12 ++++++++++++
 cmd/cbfs.c                 | 12 ++++++++----
 cmd/help.c                 |  4 ++++
 common/Makefile            |  4 ++--
 common/cli.c               | 17 +++++++++++++++-
 common/command.c           |  6 ++++++
 common/main.c              |  1 +
 include/command.h          | 49 ++++++++++++++++++++++++++++++++++++++++++----
 include/config_fallbacks.h | 10 ++++++++++
 13 files changed, 128 insertions(+), 12 deletions(-)

-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot,v2,1/9] " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 2/9] Add an option to enable the command line Simon Glass
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

All command functions should be static. Update the CBFS functions to follow
this rule.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 cmd/cbfs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 35d8a7a..1faf78e 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -11,7 +11,8 @@
 #include <command.h>
 #include <cbfs.h>
 
-int do_cbfs_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_cbfs_init(cmd_tbl_t *cmdtp, int flag, int argc,
+			char *const argv[])
 {
 	uintptr_t end_of_rom = 0xffffffff;
 	char *ep;
@@ -44,7 +45,8 @@ U_BOOT_CMD(
 	"      CBFS is in. It defaults to 0xFFFFFFFF\n"
 );
 
-int do_cbfs_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_cbfs_fsload(cmd_tbl_t *cmdtp, int flag, int argc,
+			  char *const argv[])
 {
 	const struct cbfs_cachenode *file;
 	unsigned long offset;
@@ -90,7 +92,8 @@ U_BOOT_CMD(
 	"    - load binary file 'filename' from the cbfs to address 'addr'\n"
 );
 
-int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_cbfs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
+		      char *const argv[])
 {
 	const struct cbfs_cachenode *file = file_cbfs_get_first();
 	int files = 0;
@@ -167,7 +170,8 @@ U_BOOT_CMD(
 	"    - list the files in the cbfs\n"
 );
 
-int do_cbfs_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_cbfs_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
+			  char *const argv[])
 {
 	const struct cbfs_header *header = file_cbfs_get_header();
 
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 2/9] Add an option to enable the command line
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled Simon Glass
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Add a new Kconfig option for the command line. This is enabled by default,
but when disabled it will remove the command line.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 README      |  8 ++++++++
 cmd/Kconfig | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/README b/README
index b2eee19..1393dea 100644
--- a/README
+++ b/README
@@ -1108,6 +1108,14 @@ The following options need to be configured:
 
 		XXX - this list needs to get updated!
 
+- Removal of commands
+		If no commands are needed to boot, you can disable
+		CONFIG_CMDLINE to remove them. In this case, the command line
+		will not be available, and when U-Boot wants to execute the
+		boot command (on start-up) it will call board_run_command()
+		instead. This can reduce image size significantly for very
+		simple boot procedures.
+
 - Regular expression support:
 		CONFIG_REGEX
 		If this variable is defined, U-Boot is linked against
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 2ed0263..8ead967 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1,8 +1,20 @@
 menu "Command line interface"
 
+config CMDLINE
+	bool "Support U-Boot commands"
+	default y
+	help
+	  Enable U-Boot's command-line functions. This provides a means
+	  to enter commands into U-Boot for a wide variety of purposes. It
+	  also allows scripts (containing commands) to be executed.
+	  Various commands and command categorys can be indivdually enabled.
+	  Depending on the number of commands enabled, this can add
+	  substantially to the size of U-Boot.
+
 config HUSH_PARSER
 	bool "Use hush shell"
 	select SYS_HUSH_PARSER
+	depends on CMDLINE
 	help
 	  This option enables the "hush" shell (from Busybox) as command line
 	  interpreter, thus enabling powerful command line syntax like
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static Simon Glass
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 2/9] Add an option to enable the command line Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 4/9] sandbox: Avoid calling commands when not available Simon Glass
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Update the link script to drop this code when not needed. This is only done
for two architectures at present.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 arch/arm/cpu/u-boot.lds | 3 +++
 arch/x86/cpu/u-boot.lds | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index e148ab7..ebea070 100644
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -14,6 +14,9 @@ OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
+#ifndef CONFIG_CMDLINE
+	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+#endif
 #if defined(CONFIG_ARMV7_SECURE_BASE) && defined(CONFIG_ARMV7_NONSEC)
 	/*
 	 * If CONFIG_ARMV7_SECURE_BASE is true, secure code will not
diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
index b0d8531..36f59ea 100644
--- a/arch/x86/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
@@ -12,6 +12,10 @@ ENTRY(_start)
 
 SECTIONS
 {
+#ifndef CONFIG_CMDLINE
+	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+#endif
+
 	. = CONFIG_SYS_TEXT_BASE;	/* Location of bootcode in flash */
 	__text_start = .;
 	.text  : { *(.text*); }
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 4/9] sandbox: Avoid calling commands when not available
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (2 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled Simon Glass
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Don't try to run commands when not supported.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 arch/sandbox/cpu/start.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 0dda4fc..969618e 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -83,13 +83,14 @@ int sandbox_main_loop_init(void)
 
 		cli_init();
 
+#ifdef CONFIG_CMDLINE
 		if (state->cmd)
 			retval = run_command_list(state->cmd, -1, 0);
 
 		if (state->run_distro_boot)
 			retval = cli_simple_run_command("run distro_bootcmd",
 							0);
-
+#endif
 		if (!state->interactive)
 			os_exit(retval);
 	}
@@ -265,6 +266,13 @@ static int sandbox_cmdline_cb_verbose(struct sandbox_state *state,
 }
 SANDBOX_CMDLINE_OPT_SHORT(verbose, 'v', 0, "Show test output");
 
+int board_run_command(const char *cmdline)
+{
+	printf("## Commands are disabled. Please enable CONFIG_CMDLINE.\n");
+
+	return 1;
+}
+
 int main(int argc, char *argv[])
 {
 	struct sandbox_state *state;
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (3 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 4/9] sandbox: Avoid calling commands when not available Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-14 15:25   ` Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed Simon Glass
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Command parsing and processing code is not needed when the command line is
disabled. Remove this code in that case.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Move the board_run_command() prototype into this patch

 cmd/help.c        |  4 ++++
 common/cli.c      | 17 ++++++++++++++++-
 common/command.c  |  6 ++++++
 include/command.h | 18 ++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/cmd/help.c b/cmd/help.c
index 6ff494d..701ae7e 100644
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -10,9 +10,13 @@
 
 static int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+#ifdef CONFIG_CMDLINE
 	cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
 	const int len = ll_entry_count(cmd_tbl_t, cmd);
 	return _do_help(start, len, cmdtp, flag, argc, argv);
+#else
+	return 0;
+#endif
 }
 
 U_BOOT_CMD(
diff --git a/common/cli.c b/common/cli.c
index 119d282..9b4b3e5 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -18,6 +18,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_CMDLINE
 /*
  * Run a command using the selected parser.
  *
@@ -68,6 +69,7 @@ int run_command_repeatable(const char *cmd, int flag)
 	return 0;
 #endif
 }
+#endif /* CONFIG_CMDLINE */
 
 int run_command_list(const char *cmd, int len, int flag)
 {
@@ -102,7 +104,11 @@ int run_command_list(const char *cmd, int len, int flag)
 	 * doing a malloc() which is actually required only in a case that
 	 * is pretty rare.
 	 */
+# ifdef CONFIG_CMDLINE
 	rcode = cli_simple_run_command_list(buff, flag);
+# else
+	rcode = board_run_command(buff);
+# endif
 #endif
 	if (need_buff)
 		free(buff);
@@ -166,7 +172,9 @@ bool cli_process_fdt(const char **cmdp)
  */
 void cli_secure_boot_cmd(const char *cmd)
 {
+#ifdef CONFIG_CMDLINE
 	cmd_tbl_t *cmdtp;
+#endif
 	int rc;
 
 	if (!cmd) {
@@ -178,6 +186,7 @@ void cli_secure_boot_cmd(const char *cmd)
 	disable_ctrlc(1);
 
 	/* Find the command directly. */
+#ifdef CONFIG_CMDLINE
 	cmdtp = find_cmd(cmd);
 	if (!cmdtp) {
 		printf("## Error: \"%s\" not defined\n", cmd);
@@ -187,6 +196,10 @@ void cli_secure_boot_cmd(const char *cmd)
 	/* Run the command, forcing no flags and faking argc and argv. */
 	rc = (cmdtp->cmd)(cmdtp, 0, 1, (char **)&cmd);
 
+#else
+	rc = board_run_command(cmd);
+#endif
+
 	/* Shouldn't ever return from boot command. */
 	printf("## Error: \"%s\" returned (code %d)\n", cmd, rc);
 
@@ -205,8 +218,10 @@ void cli_loop(void)
 	parse_file_outer();
 	/* This point is never reached */
 	for (;;);
-#else
+#elif defined(CONFIG_CMDINE)
 	cli_simple_loop();
+#else
+	printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
 #endif /*CONFIG_SYS_HUSH_PARSER*/
 }
 
diff --git a/common/command.c b/common/command.c
index 858e288..e5d9b9c 100644
--- a/common/command.c
+++ b/common/command.c
@@ -85,6 +85,7 @@ int _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t *cmdtp, int flag,
 /* find command table entry for a command */
 cmd_tbl_t *find_cmd_tbl(const char *cmd, cmd_tbl_t *table, int table_len)
 {
+#ifdef CONFIG_CMDLINE
 	cmd_tbl_t *cmdtp;
 	cmd_tbl_t *cmdtp_temp = table;	/* Init value */
 	const char *p;
@@ -111,6 +112,7 @@ cmd_tbl_t *find_cmd_tbl(const char *cmd, cmd_tbl_t *table, int table_len)
 	if (n_found == 1) {			/* exactly one match */
 		return cmdtp_temp;
 	}
+#endif /* CONFIG_CMDLINE */
 
 	return NULL;	/* not found or ambiguous command */
 }
@@ -162,6 +164,7 @@ int var_complete(int argc, char * const argv[], char last_char, int maxv, char *
 
 static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv, char *cmdv[])
 {
+#ifdef CONFIG_CMDLINE
 	cmd_tbl_t *cmdtp = ll_entry_start(cmd_tbl_t, cmd);
 	const int count = ll_entry_count(cmd_tbl_t, cmd);
 	const cmd_tbl_t *cmdend = cmdtp + count;
@@ -231,6 +234,9 @@ static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv
 
 	cmdv[n_found] = NULL;
 	return n_found;
+#else
+	return 0;
+#endif
 }
 
 static int make_argv(char *s, int argvsz, char *argv[])
diff --git a/include/command.h b/include/command.h
index 0524c0b..0d2b653 100644
--- a/include/command.h
+++ b/include/command.h
@@ -144,6 +144,24 @@ int cmd_process(int flag, int argc, char * const argv[],
 			       int *repeatable, unsigned long *ticks);
 
 void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
+
+/**
+ * board_run_command() - Fallback function to execute a command
+ *
+ * When no command line features are enabled in U-Boot, this function is
+ * called to execute a command. Typically the function can look at the
+ * command and perform a few very specific tasks, such as booting the
+ * system in a particular way.
+ *
+ * This function is only used when CONFIG_CMDLINE is not enabled.
+ *
+ * In normal situations this function should not return, since U-Boot will
+ * simply hang.
+ *
+ * @cmdline:	Command line string to execute
+ * @return 0 if OK, 1 for error
+ */
+int board_run_command(const char *cmdline);
 #endif	/* __ASSEMBLY__ */
 
 /*
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (4 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-14 15:25   ` Tom Rini
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 7/9] Allow command code to compile to nothing Simon Glass
                   ` (2 subsequent siblings)
  8 siblings, 2 replies; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Normally board_run_command() will handle command processed. But if for some
reason it returns then we should panic to avoid further processing.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Use panic() instead of hang()

 common/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/main.c b/common/main.c
index 1a2ef39..42bbb50 100644
--- a/common/main.c
+++ b/common/main.c
@@ -72,4 +72,5 @@ void main_loop(void)
 	autoboot_command(s);
 
 	cli_loop();
+	panic("No CLI available");
 }
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 7/9] Allow command code to compile to nothing
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (5 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 8/9] Allow command-line files to be dropped Simon Glass
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 9/9] Drop various features when the command line is not available Simon Glass
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

When CONFIG_CMDLINE is disabled we need to remove all the command-line
code. Most can be removed by dropping the appropriate linker lists from the
images, but sub-commands must be dealt with specially.

A simple mechanism is used to avoid 'unused static function' errors.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 include/command.h | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/include/command.h b/include/command.h
index 0d2b653..08f0486 100644
--- a/include/command.h
+++ b/include/command.h
@@ -182,21 +182,44 @@ int board_run_command(const char *cmdline);
 # define _CMD_HELP(x)
 #endif
 
+#ifdef CONFIG_CMDLINE
 #define U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd,		\
 				_usage, _help, _comp)			\
 		{ #_name, _maxargs, _rep, _cmd, _usage,			\
 			_CMD_HELP(_help) _CMD_COMPLETE(_comp) }
 
-#define U_BOOT_CMD_MKENT(_name, _maxargs, _rep, _cmd, _usage, _help)	\
-	U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd,		\
-					_usage, _help, NULL)
-
 #define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, _comp) \
 	ll_entry_declare(cmd_tbl_t, _name, cmd) =			\
 		U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd,	\
 						_usage, _help, _comp);
 
+#else
+#define U_BOOT_SUBCMD_START(name)	static cmd_tbl_t name[] = {};
+#define U_BOOT_SUBCMD_END
+
+#define _CMD_REMOVE(_name, _cmd)					\
+	int __remove_ ## _name(void)					\
+	{								\
+		if (0)							\
+			_cmd(NULL, 0, 0, NULL);				\
+		return 0;						\
+	}
+#define U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, _usage,	\
+				  _help, _comp)				\
+		{ #_name, _maxargs, _rep, 0 ? _cmd : NULL, _usage,	\
+			_CMD_HELP(_help) _CMD_COMPLETE(_comp) }
+
+#define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help,	\
+			    _comp)				\
+	_CMD_REMOVE(sub_ ## _name, _cmd)
+
+#endif /* CONFIG_CMDLINE */
+
 #define U_BOOT_CMD(_name, _maxargs, _rep, _cmd, _usage, _help)		\
 	U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
 
+#define U_BOOT_CMD_MKENT(_name, _maxargs, _rep, _cmd, _usage, _help)	\
+	U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd,		\
+					_usage, _help, NULL)
+
 #endif	/* __COMMAND_H */
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 8/9] Allow command-line files to be dropped
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (6 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 7/9] Allow command code to compile to nothing Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 9/9] Drop various features when the command line is not available Simon Glass
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

These files do not need to be compiled when CONFIG_CMDLINE is disabled.
Update the Makefile to reflect this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 common/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 117178a..b15113c 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -148,10 +148,10 @@ endif
 endif
 
 # We always have this since drivers/ddr/fs/interactive.c needs it
-obj-y += cli_simple.o
+obj-$(CONFIG_CMDLINE) += cli_simple.o
 
 obj-y += cli.o
-obj-y += cli_readline.o
+obj-$(CONFIG_CMDLINE) += cli_readline.o
 obj-y += command.o
 obj-y += s_record.o
 obj-y += xyzModem.o
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 9/9] Drop various features when the command line is not available
  2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
                   ` (7 preceding siblings ...)
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 8/9] Allow command-line files to be dropped Simon Glass
@ 2016-03-14  1:07 ` Simon Glass
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  8 siblings, 1 reply; 20+ messages in thread
From: Simon Glass @ 2016-03-14  1:07 UTC (permalink / raw)
  To: u-boot

Some features are only useful or meaningful when the command line is
present. Ensure that these features are not compiled in when CONFIG_CMDLINE
is not enabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 include/config_fallbacks.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index ddfe045..6b6ec00 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -97,4 +97,14 @@
 # endif
 #endif
 
+#ifndef CONFIG_CMDLINE
+#undef CONFIG_CMDLINE_EDITING
+#undef CONFIG_SYS_LONGHELP
+#undef CONFIG_CMD_BOOTD
+#undef CONFIG_CMD_RUN
+#undef CONFIG_SYS_HUSH_PARSER
+#undef CONFIG_CMD_ASKENV
+#undef CONFIG_MENU
+#endif
+
 #endif	/* __CONFIG_FALLBACKS_H */
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled Simon Glass
@ 2016-03-14 15:25   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-14 15:25 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:31PM -0600, Simon Glass wrote:

> Command parsing and processing code is not needed when the command line is
> disabled. Remove this code in that case.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
[snip]
> @@ -102,7 +104,11 @@ int run_command_list(const char *cmd, int len, int flag)
>  	 * doing a malloc() which is actually required only in a case that
>  	 * is pretty rare.
>  	 */
> +# ifdef CONFIG_CMDLINE
>  	rcode = cli_simple_run_command_list(buff, flag);
> +# else
> +	rcode = board_run_command(buff);
> +# endif
>  #endif

nit: We don't usually space-indent preprocessor tests and don't anywhere
else in this file either.

Otherwise:

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160314/2b0c98b5/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed Simon Glass
@ 2016-03-14 15:25   ` Tom Rini
  2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
  1 sibling, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-14 15:25 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:32PM -0600, Simon Glass wrote:

> Normally board_run_command() will handle command processed. But if for some
> reason it returns then we should panic to avoid further processing.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160314/82802870/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot,v2,1/9] cbfs: Update a function to be static
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:27PM -0600, Simon Glass wrote:

> All command functions should be static. Update the CBFS functions to follow
> this rule.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/762c7d9b/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 2/9] Add an option to enable the command line
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 2/9] Add an option to enable the command line Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:28PM -0600, Simon Glass wrote:

> Add a new Kconfig option for the command line. This is enabled by default,
> but when disabled it will remove the command line.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/1bb5239f/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:29PM -0600, Simon Glass wrote:

> Update the link script to drop this code when not needed. This is only done
> for two architectures at present.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/4f301640/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 4/9] sandbox: Avoid calling commands when not available
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 4/9] sandbox: Avoid calling commands when not available Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:30PM -0600, Simon Glass wrote:

> Don't try to run commands when not supported.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/605554f6/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 6/9] Panic when no command line processing can be performed
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed Simon Glass
  2016-03-14 15:25   ` Tom Rini
@ 2016-03-23  1:58   ` Tom Rini
  1 sibling, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:32PM -0600, Simon Glass wrote:

> Normally board_run_command() will handle command processed. But if for some
> reason it returns then we should panic to avoid further processing.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/9c5f9ddb/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 7/9] Allow command code to compile to nothing
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 7/9] Allow command code to compile to nothing Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:33PM -0600, Simon Glass wrote:

> When CONFIG_CMDLINE is disabled we need to remove all the command-line
> code. Most can be removed by dropping the appropriate linker lists from the
> images, but sub-commands must be dealt with specially.
> 
> A simple mechanism is used to avoid 'unused static function' errors.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/3ab8006a/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 8/9] Allow command-line files to be dropped
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 8/9] Allow command-line files to be dropped Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:34PM -0600, Simon Glass wrote:

> These files do not need to be compiled when CONFIG_CMDLINE is disabled.
> Update the Makefile to reflect this.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/39bfecff/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [U-Boot, v2, 9/9] Drop various features when the command line is not available
  2016-03-14  1:07 ` [U-Boot] [PATCH v2 9/9] Drop various features when the command line is not available Simon Glass
@ 2016-03-23  1:58   ` Tom Rini
  0 siblings, 0 replies; 20+ messages in thread
From: Tom Rini @ 2016-03-23  1:58 UTC (permalink / raw)
  To: u-boot

On Sun, Mar 13, 2016 at 07:07:35PM -0600, Simon Glass wrote:

> Some features are only useful or meaningful when the command line is
> present. Ensure that these features are not compiled in when CONFIG_CMDLINE
> is not enabled.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160322/12733ff3/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2016-03-23  1:58 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-14  1:07 [U-Boot] [PATCH v2 0/9] Add CONFIG_CMDLINE to allow removal of all commands Simon Glass
2016-03-14  1:07 ` [U-Boot] [PATCH v2 1/9] cbfs: Update a function to be static Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot,v2,1/9] " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 2/9] Add an option to enable the command line Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 3/9] arm: x86: Drop command-line code when CONFIG_CMDLINE is disabled Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 4/9] sandbox: Avoid calling commands when not available Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 5/9] Drop command-processing code when CONFIG_CMDLINE is disabled Simon Glass
2016-03-14 15:25   ` Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 6/9] Panic when no command line processing can be performed Simon Glass
2016-03-14 15:25   ` Tom Rini
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 7/9] Allow command code to compile to nothing Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 8/9] Allow command-line files to be dropped Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-03-14  1:07 ` [U-Boot] [PATCH v2 9/9] Drop various features when the command line is not available Simon Glass
2016-03-23  1:58   ` [U-Boot] [U-Boot, v2, " Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.