From: Matt Porter <mporter@konsulko.com>
Date: Tue, 5 May 2015 19:00:22 +0000 (-0400)
Subject: image: fix build when CONFIG_NR_DRAM_BANKS is disabled on ARM
X-Git-Tag: v2015.07-rc2~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c777efe3a1c3ea62123437a30468fa0b17a689b2;p=oweals%2Fu-boot.git

image: fix build when CONFIG_NR_DRAM_BANKS is disabled on ARM

common/image.c currently implicitly depends on CONFIG_NR_DRAM_BANKS
when CONFIG_ARM is enabled. Make this requirement explicit.

Signed-off-by: Matt Porter <mporter@konsulko.com>
---

diff --git a/common/image.c b/common/image.c
index 0f5274f1be..f0f01351fe 100644
--- a/common/image.c
+++ b/common/image.c
@@ -462,7 +462,7 @@ phys_size_t getenv_bootm_size(void)
 		tmp = 0;
 
 
-#if defined(CONFIG_ARM)
+#if defined(CONFIG_ARM) && defined(CONFIG_NR_DRAM_BANKS)
 	return gd->bd->bi_dram[0].size - tmp;
 #else
 	return gd->bd->bi_memsize - tmp;