diff options
| author | Simon Glass <sjg@chromium.org> | 2011-06-30 18:56:53 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:58:41 -0700 |
| commit | 2547049a5ab685e3f67dc81e58365cc55205fe1a (patch) | |
| tree | 4e2f5fe2774033d7a81975e0ea9d45151a2e44ed /arch | |
| parent | 712fefa947cc9f2c96ef37fdbd360805ab11a6cc (diff) | |
Add CONFIG_DELAY_ENVIRONMENT to delay environment loading
This option delays loading of the environment until later, so that only the
default environment will be available to U-Boot.
BUG=chromium-os:17055
TEST=build U-Boot with option enabled, see that environment is not available
Change-Id: I99a25b468fb5d14310b00eb3fd4c3e6a0c5cbe2b
Reviewed-on: http://gerrit.chromium.org/gerrit/3534
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/board.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c3dcbba1ee9..a043648b261 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -569,8 +569,12 @@ void board_init_r (gd_t *id, ulong dest_addr) dataflash_print_info(); #endif +#ifdef CONFIG_DELAY_ENVIRONMENT + env_set_default(); +#else /* initialize environment */ env_relocate (); +#endif #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI) arm_pci_init(); |