projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thermal: imx_tmu: support i.MX8MP
[oweals/u-boot.git]
/
common
/
command.c
diff --git
a/common/command.c
b/common/command.c
index e192bb2a619ec5dffe46f4bb0dee7275f8faf35c..0d8bf244be220e02beccc0741847d2f45d5ca285 100644
(file)
--- a/
common/command.c
+++ b/
common/command.c
@@
-11,6
+11,7
@@
#include <common.h>
#include <command.h>
#include <console.h>
#include <common.h>
#include <command.h>
#include <console.h>
+#include <env.h>
#include <linux/ctype.h>
/*
#include <linux/ctype.h>
/*
@@
-356,8
+357,13
@@
int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
int i, j, k, len, seplen, argc;
int cnt;
char last_char;
int i, j, k, len, seplen, argc;
int cnt;
char last_char;
+#ifdef CONFIG_CMDLINE_PS_SUPPORT
+ const char *ps_prompt = env_get("PS1");
+#else
+ const char *ps_prompt = CONFIG_SYS_PROMPT;
+#endif
- if (strcmp(prompt,
CONFIG_SYS_PROMPT
) != 0)
+ if (strcmp(prompt,
ps_prompt
) != 0)
return 0; /* not in normal console */
cnt = strlen(buf);
return 0; /* not in normal console */
cnt = strlen(buf);
@@
-463,7
+469,7
@@
int cmd_get_data_size(char* arg, int default_size)
return 2;
case 'l':
return 4;
return 2;
case 'l':
return 4;
-#ifdef
CONFIG_SYS
_SUPPORT_64BIT_DATA
+#ifdef
MEM
_SUPPORT_64BIT_DATA
case 'q':
return 8;
#endif
case 'q':
return 8;
#endif
@@
-490,6
+496,11
@@
void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
for (i = 0; i < size; i++) {
ulong addr;
for (i = 0; i < size; i++) {
ulong addr;
+ addr = (ulong)(cmdtp->cmd_rep) + gd->reloc_off;
+ cmdtp->cmd_rep =
+ (int (*)(struct cmd_tbl_s *, int, int,
+ char * const [], int *))addr;
+
addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
#ifdef DEBUG_COMMANDS
printf("Command \"%s\": 0x%08lx => 0x%08lx\n",
addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
#ifdef DEBUG_COMMANDS
printf("Command \"%s\": 0x%08lx => 0x%08lx\n",