summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinyu Chen <xinyu.chen@freescale.com>2011-10-26 13:17:34 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2011-10-26 13:29:57 +0800
commitdb71eefab17c4f31acf822666a88a3e563f6c15f (patch)
tree2aff7065364a8af680007fdbacdeaf89b423e0a4
parentb6cc41d7c3fc22980a5a62b75e09cd7fdbb89c26 (diff)
ENGR00160804 mx53 smd: fix panic issue on uboot set DDR as 512M
Do not take care of the MEM_TAG whoes size is 0. Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
-rw-r--r--arch/arm/mach-mx5/mx53_smd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/mx53_smd.c b/arch/arm/mach-mx5/mx53_smd.c
index 37d3a9f597b5..8b78744c1077 100644
--- a/arch/arm/mach-mx5/mx53_smd.c
+++ b/arch/arm/mach-mx5/mx53_smd.c
@@ -1502,7 +1502,8 @@ static void __init fixup_android_board(struct machine_desc *desc, struct tag *ta
/* get total memory from TAGS */
for_each_tag(t, tags) {
if (t->hdr.tag == ATAG_MEM)
- if (!mem_tag || (mem_tag &&
+ if (!mem_tag ||
+ (t->u.mem.size != 0 && mem_tag &&
mem_tag->u.mem.start < t->u.mem.start))
mem_tag = t;
}