diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 6 | ||||
| -rw-r--r-- | common/console.c | 2 | ||||
| -rw-r--r-- | common/hush.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/Kconfig b/common/Kconfig index 00e4f36d62..d4373431aa 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -674,9 +674,9 @@ config DEFAULT_ENVIRONMENT_PATH depends on DEFAULT_ENVIRONMENT prompt "Default environment path" help - Space separated list of pathes the default environment will be taken from. - Relative pathes will be relative to the barebox Toplevel dir, but absolute - pathes are fine aswell. + Space separated list of paths the default environment will be taken from. + Relative paths will be relative to the barebox Toplevel dir, but absolute + paths are fine aswell. config BAREBOXENV_TARGET bool diff --git a/common/console.c b/common/console.c index c092621aa1..0c32f06b93 100644 --- a/common/console.c +++ b/common/console.c @@ -194,7 +194,7 @@ int console_register(struct console_device *newcdev) console_init_early(); if (newcdev->devname) { - dev->id = DEVICE_ID_SINGLE; + dev->id = newcdev->devid; strcpy(dev->name, newcdev->devname); } else { dev->id = DEVICE_ID_DYNAMIC; diff --git a/common/hush.c b/common/hush.c index b23b3f6633..ffd251339e 100644 --- a/common/hush.c +++ b/common/hush.c @@ -2020,7 +2020,7 @@ BAREBOX_CMD_START(getopt) BAREBOX_CMD_END #endif -BAREBOX_MAGICVAR(PATH, "colon separated list of pathes to search for executables"); +BAREBOX_MAGICVAR(PATH, "colon separated list of paths to search for executables"); #ifdef CONFIG_HUSH_FANCY_PROMPT BAREBOX_MAGICVAR(PS1, "hush prompt"); #endif |