summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/bootm.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2011-03-28 09:58:34 +0000
committerGerald Van Baren <gvb@unssw.com>2011-04-25 21:11:19 -0400
commit590d3cacb98cb377b127869b58507d2afe9c904a (patch)
treecf9affb045d88ab6c1c9a00fa44744d6fb25e2a1 /arch/arm/lib/bootm.c
parenta01ebd9679f07421ec5abfda5dc0ab76c7202d3b (diff)
downloadblackbird-obmc-uboot-590d3cacb98cb377b127869b58507d2afe9c904a.tar.gz
blackbird-obmc-uboot-590d3cacb98cb377b127869b58507d2afe9c904a.zip
Stop passing around bootmem_base value.
For the calls to boot_relocate_fdt(), boot_get_cmdline(), and boot_get_kbd(), the value of bootmem_base is always obtained by calling getenv_bootm_low(). Since the value always comes from the same source, the calling signature for those functions can be simplified by making them call getenv_bootm_low() directly. Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch/arm/lib/bootm.c')
-rw-r--r--arch/arm/lib/bootm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 77349530f0..aba13f4e86 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -178,7 +178,6 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images)
{
ulong rd_len;
void (*kernel_entry)(int zero, int dt_machid, void *dtblob);
- ulong bootmap_base = getenv_bootm_low();
ulong of_size = images->ft_len;
char **of_flat_tree = &images->ft_addr;
ulong *initrd_start = &images->initrd_start;
@@ -194,7 +193,7 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images)
if (ret)
return ret;
- ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size);
+ ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size);
if (ret)
return ret;
OpenPOWER on IntegriCloud