summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-10-07 20:19:17 -0700
committerSimon Glass <sjg@chromium.org>2015-10-21 07:46:26 -0600
commit9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75 (patch)
tree144a94d87a87dae9428d228b2ef8b71665c3f4a9 /README
parenta4092dbd81ad8bcd7d405304f579b0b5b0c402ce (diff)
downloadtalos-obmc-uboot-9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75.zip
talos-obmc-uboot-9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75.tar.gz
cmd: bootvx: Always get VxWorks bootline from env
So far VxWorks bootline can be contructed from various environment variables, but when these variables do not exist we get these from corresponding config macros. This is not helpful as it requires rebuilding U-Boot, and to make sure these config macros take effect we should not have these environment variables. This is a little bit complex and confusing. Now we change the logic to always contruct the bootline from environments (the only single source), by adding two new variables "bootdev" and "othbootargs", and adding some comments about network related settings mentioning they are optional. The doc about the bootline handling is also updated. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com> Tested-by: Hannes Schmelzer <oe5hpm@oevsv.at>
Diffstat (limited to 'README')
-rw-r--r--README12
1 files changed, 2 insertions, 10 deletions
diff --git a/README b/README
index 0dc657d..d18df54 100644
--- a/README
+++ b/README
@@ -796,18 +796,10 @@ The following options need to be configured:
- vxWorks boot parameters:
bootvx constructs a valid bootline using the following
- environments variables: bootfile, ipaddr, serverip, hostname.
+ environments variables: bootdev, bootfile, ipaddr, netmask,
+ serverip, gatewayip, hostname, othbootargs.
It loads the vxWorks image pointed bootfile.
- CONFIG_SYS_VXWORKS_BOOT_DEVICE - The vxworks device name
- CONFIG_SYS_VXWORKS_MAC_PTR - Ethernet 6 byte MA -address
- CONFIG_SYS_VXWORKS_SERVERNAME - Name of the server
- CONFIG_SYS_VXWORKS_BOOT_ADDR - Address of boot parameters
-
- CONFIG_SYS_VXWORKS_ADD_PARAMS
-
- Add it at the end of the bootline. E.g "u=username pw=secret"
-
Note: If a "bootargs" environment is defined, it will overwride
the defaults discussed just above.
OpenPOWER on IntegriCloud