diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-12-21 14:08:27 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-09 18:02:06 +0100 |
| commit | 558605cf4fe9558dff9b8ea2241fbeb526dc353d (patch) | |
| tree | 0af0fbc0900737f5dfde2b92cd8ede8c545da79f /common | |
| parent | 52f0aa835fd6caf5f094b551e435f5c9506d61df (diff) | |
load_addr: move to common env code
Rather than keep the load_addr definition with the bootm code (which
just happens to use this), move it to the common env code. This way
we can disable bootm support completely while retaining load_addr
usage with many other commands.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 1 | ||||
| -rw-r--r-- | common/cmd_nvedit.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9873ee7de..18019d652 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -156,7 +156,6 @@ static boot_os_fn *boot_os[] = { #endif }; -ulong load_addr = CONFIG_SYS_LOAD_ADDR; /* Default Load Address */ static bootm_headers_t images; /* pointers to os/initrd/fdt images */ /* Allow for arch specific config before we boot */ diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index f8c79763b..fb69c242f 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -76,6 +76,8 @@ SPI_FLASH|MG_DISK|NVRAM|MMC|NOWHERE} */ #define MAX_ENV_SIZE (1 << 20) /* 1 MiB */ +ulong load_addr = CONFIG_SYS_LOAD_ADDR; /* Default Load Address */ + /* * Table with supported baudrates (defined in config_xyz.h) */ |