Eric Lee / smarc-uboot

29
Download as
Browse Code ยป

Commit f1f9d4fac5274d9b5ae1b0087fb0fcfa00687bac

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent b88d6f7614
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

hush: complete renaming CONFIG_SYS_HUSH_PARSER to CONFIG_HUSH_PARSER 

There is no more define of CONFIG_SYS_HUSH_PARSER.  Rename some
remaining references and drop the backward compatible Kconfig entry.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 6 changed files with 13 additions and 22 deletions Side-by-side Diff

board/work-microwave/work_92105/work_92105_display.c
Diff comments   View file @ f1f9d4f
... ... @@ -311,8 +311,8 @@
311 311 * only HUSH can understand them.
312 312 */
313 313  
314   -#if !defined(CONFIG_SYS_HUSH_PARSER)
315   -#error CONFIG_CMD_HD44760 requires CONFIG_SYS_HUSH_PARSER
  314 +#if !defined(CONFIG_HUSH_PARSER)
  315 +#error CONFIG_CMD_HD44760 requires CONFIG_HUSH_PARSER
316 316 #endif
317 317  
318 318 static int do_hd44780(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
... ... @@ -13,7 +13,6 @@
13 13  
14 14 config HUSH_PARSER
15 15 bool "Use hush shell"
16   - select SYS_HUSH_PARSER
17 16 depends on CMDLINE
18 17 help
19 18 This option enables the "hush" shell (from Busybox) as command line
... ... @@ -23,11 +22,6 @@
23 22  
24 23 If disabled, you get the old, much simpler behaviour with a somewhat
25 24 smaller memory footprint.
26   -
27   -config SYS_HUSH_PARSER
28   - bool
29   - help
30   - Backward compatibility.
31 25  
32 26 config SYS_PROMPT
33 27 string "Shell prompt"
... ... @@ -49,7 +49,7 @@
49 49 obj-$(CONFIG_CMD_EEPROM) += eeprom.o
50 50 obj-$(CONFIG_EFI_STUB) += efi.o
51 51 obj-$(CONFIG_CMD_ELF) += elf.o
52   -obj-$(CONFIG_SYS_HUSH_PARSER) += exit.o
  52 +obj-$(CONFIG_HUSH_PARSER) += exit.o
53 53 obj-$(CONFIG_CMD_EXT4) += ext4.o
54 54 obj-$(CONFIG_CMD_EXT2) += ext2.o
55 55 obj-$(CONFIG_CMD_FAT) += fat.o
... ... @@ -123,7 +123,7 @@
123 123 obj-$(CONFIG_CMD_TERMINAL) += terminal.o
124 124 obj-$(CONFIG_CMD_TIME) += time.o
125 125 obj-$(CONFIG_CMD_TRACE) += trace.o
126   -obj-$(CONFIG_SYS_HUSH_PARSER) += test.o
  126 +obj-$(CONFIG_HUSH_PARSER) += test.o
127 127 obj-$(CONFIG_CMD_TPM) += tpm.o
128 128 obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o
129 129 obj-$(CONFIG_CMD_TSI148) += tsi148.o
... ... @@ -11,10 +11,7 @@
11 11 obj-y += main.o
12 12 obj-y += exports.o
13 13 obj-y += hash.o
14   -ifdef CONFIG_SYS_HUSH_PARSER
15   -obj-y += cli_hush.o
16   -endif
17   -
  14 +obj-$(CONFIG_HUSH_PARSER) += cli_hush.o
18 15 obj-$(CONFIG_AUTOBOOT) += autoboot.o
19 16  
20 17 # This option is not just y/n - it can have a numeric value
... ... @@ -28,7 +28,7 @@
28 28 */
29 29 int run_command(const char *cmd, int flag)
30 30 {
31   -#ifndef CONFIG_SYS_HUSH_PARSER
  31 +#ifndef CONFIG_HUSH_PARSER
32 32 /*
33 33 * cli_run_command can return 0 or 1 for success, so clean up
34 34 * its result.
... ... @@ -55,7 +55,7 @@
55 55 */
56 56 int run_command_repeatable(const char *cmd, int flag)
57 57 {
58   -#ifndef CONFIG_SYS_HUSH_PARSER
  58 +#ifndef CONFIG_HUSH_PARSER
59 59 return cli_simple_run_command(cmd, flag);
60 60 #else
61 61 /*
... ... @@ -79,7 +79,7 @@
79 79  
80 80 if (len == -1) {
81 81 len = strlen(cmd);
82   -#ifdef CONFIG_SYS_HUSH_PARSER
  82 +#ifdef CONFIG_HUSH_PARSER
83 83 /* hush will never change our string */
84 84 need_buff = 0;
85 85 #else
... ... @@ -94,7 +94,7 @@
94 94 memcpy(buff, cmd, len);
95 95 buff[len] = '\0';
96 96 }
97   -#ifdef CONFIG_SYS_HUSH_PARSER
  97 +#ifdef CONFIG_HUSH_PARSER
98 98 rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
99 99 #else
100 100 /*
... ... @@ -214,7 +214,7 @@
214 214  
215 215 void cli_loop(void)
216 216 {
217   -#ifdef CONFIG_SYS_HUSH_PARSER
  217 +#ifdef CONFIG_HUSH_PARSER
218 218 parse_file_outer();
219 219 /* This point is never reached */
220 220 for (;;);
221 221  
... ... @@ -222,12 +222,12 @@
222 222 cli_simple_loop();
223 223 #else
224 224 printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
225   -#endif /*CONFIG_SYS_HUSH_PARSER*/
  225 +#endif /*CONFIG_HUSH_PARSER*/
226 226 }
227 227  
228 228 void cli_init(void)
229 229 {
230   -#ifdef CONFIG_SYS_HUSH_PARSER
  230 +#ifdef CONFIG_HUSH_PARSER
231 231 u_boot_hush_start();
232 232 #endif
233 233  
... ... @@ -43,7 +43,7 @@
43 43 assert(run_command_list("false", -1, 0) == 1);
44 44 assert(run_command_list("echo", -1, 0) == 0);
45 45  
46   -#ifdef CONFIG_SYS_HUSH_PARSER
  46 +#ifdef CONFIG_HUSH_PARSER
47 47 run_command("setenv foo 'setenv black 1\nsetenv adder 2'", 0);
48 48 run_command("run foo", 0);
49 49 assert(getenv("black") != NULL);