diff options
| author | Roland Hieber <rhi@pengutronix.de> | 2021-01-28 22:00:22 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-01 09:39:36 +0100 |
| commit | 1026739e4056b2cad88835a828da594e5dae6c24 (patch) | |
| tree | ac84dcf989f94f59af43c4787dff50dabe921fab /common | |
| parent | 05e2458730924de0c6653df7b7b012fd4c91db57 (diff) | |
| download | barebox-1026739e4056b2cad88835a828da594e5dae6c24.tar.gz barebox-1026739e4056b2cad88835a828da594e5dae6c24.tar.xz | |
common: Kconfig: improve defaultenv help texts
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/common/Kconfig b/common/Kconfig index d1baee60e6..edadcc9f49 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -874,6 +874,13 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW select NET_CMD_IFUP if NET select CMD_IP_ROUTE_GET if NET select CMD_HOST if NET + help + With this option barebox will use the files found under + defaultenv/defaultenv-2-base/ in the source tree as a template for + the defaultenv. The directories specified in DEFAULT_ENVIRONMENT_PATH + will be added to the default environment. If a file is present in + both locations, the file from DEFAULT_ENVIRONMENT_PATH will overwrite + that from the template. config DEFAULT_ENVIRONMENT_GENERIC bool "Generic environment template (old version)" @@ -887,9 +894,12 @@ config DEFAULT_ENVIRONMENT_GENERIC select CMD_CRC_CMP select CMD_GLOBAL help - With this option barebox will use the generic default - environment found under defaultenv/ in the src tree. - The Directory given with DEFAULT_ENVIRONMENT_PATH + Note: this option is not recommended for new boards; use + DEFAULT_ENVIRONMENT_GENERIC_NEW instead. + + With this option barebox will use the old generic default environment + found under defaultenv/defaultenv-1/ in the source tree. + The directory given with DEFAULT_ENVIRONMENT_PATH will be added to the default environment. This should at least contain a /env/config file. This will be able to overwrite the files from defaultenv. @@ -899,12 +909,18 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU depends on DEFAULT_ENVIRONMENT_GENERIC_NEW depends on CMD_MENUTREE default y + help + Extend the defaultenv template with a menu that is displayed at boot. + The menu files are taken from defaultenv/defaultenv-2-menu/. config DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU bool depends on DEFAULT_ENVIRONMENT_GENERIC_NEW depends on USB_GADGET_DFU default y + help + Extend the defaultenv template with the 'dfu' boot entry, which + allows uploading the kernel and oftree over USB via the dfu protocol. config DEFAULT_ENVIRONMENT_GENERIC_NEW_REBOOT_MODE bool "Generic reboot-mode handlers in the environment" @@ -916,9 +932,9 @@ config DEFAULT_ENVIRONMENT_PATH depends on DEFAULT_ENVIRONMENT prompt "Default environment path" help - 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 as well. + Space separated list of paths from which the default environment will + be taken. Relative paths will be relative to the barebox top-level + directory, but absolute paths are fine as well. config BAREBOXENV_TARGET bool |