diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-10-07 20:19:17 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-10-21 07:46:26 -0600 |
| commit | 9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75 (patch) | |
| tree | 144a94d87a87dae9428d228b2ef8b71665c3f4a9 /include | |
| parent | a4092dbd81ad8bcd7d405304f579b0b5b0c402ce (diff) | |
| download | talos-obmc-uboot-9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75.tar.gz talos-obmc-uboot-9e98b7e3c5010e918d0fdfae75ab7d6995c1fa75.zip | |
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 'include')
| -rw-r--r-- | include/vxworks.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/vxworks.h b/include/vxworks.h index 122043c941..297a70f519 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -13,26 +13,4 @@ void boot_prep_vxworks(bootm_headers_t *images); void boot_jump_vxworks(bootm_headers_t *images); void do_bootvx_fdt(bootm_headers_t *images); -/* - * Use bootaddr to find the location in memory that VxWorks - * will look for the bootline string. The default value for - * PowerPC is LOCAL_MEM_LOCAL_ADRS + BOOT_LINE_OFFSET which - * defaults to 0x4200 - */ -#ifndef CONFIG_SYS_VXWORKS_BOOT_ADDR -#define CONFIG_SYS_VXWORKS_BOOT_ADDR 0x4200 -#endif - -#ifndef CONFIG_SYS_VXWORKS_BOOT_DEVICE -#if defined(CONFIG_4xx) -#define CONFIG_SYS_VXWORKS_BOOT_DEVICE "emac(0,0)" -#else -#define CONFIG_SYS_VXWORKS_BOOT_DEVICE "eth(0,0)" -#endif -#endif - -#ifndef CONFIG_SYS_VXWORKS_SERVERNAME -#define CONFIG_SYS_VXWORKS_SERVERNAME "srv" -#endif - #endif |
