| Message ID | 1291532093.2280378.1344620715615.JavaMail.root@advansee.com |
|---|---|
| State | Accepted |
| Commit | 8ae51ae172b89e198e33779403338fb41926950b |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Aug 10, 2012 at 07:45:15AM -0000, Beno?t Th?baudeau wrote: > Commit 5e724ca did the same thing for env_common and env_embedded, but forgot > fw_env. > > Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com> > Cc: Wolfgang Denk <wd@denx.de> Applied to u-boot/master, thanks!
diff --git u-boot-4d3c95f.orig/tools/env/fw_env.c u-boot-4d3c95f/tools/env/fw_env.c index e292d2b..1a2c227 100644 --- u-boot-4d3c95f.orig/tools/env/fw_env.c +++ u-boot-4d3c95f/tools/env/fw_env.c @@ -203,6 +203,17 @@ static char default_environment[] = { #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" MK_STR (CONFIG_PCI_BOOTDELAY) "\0" #endif +#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG + "arch=" CONFIG_SYS_ARCH "\0" + "cpu=" CONFIG_SYS_CPU "\0" + "board=" CONFIG_SYS_BOARD "\0" +#ifdef CONFIG_SYS_VENDOR + "vendor=" CONFIG_SYS_VENDOR "\0" +#endif +#ifdef CONFIG_SYS_SOC + "soc=" CONFIG_SYS_SOC "\0" +#endif +#endif #ifdef CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS #endif
Commit 5e724ca did the same thing for env_common and env_embedded, but forgot fw_env. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Wolfgang Denk <wd@denx.de> --- .../tools/env/fw_env.c | 11 +++++++++++ 1 file changed, 11 insertions(+)