From: Becky Bruce <becky.bruce@freescale.com>
Date: Tue, 11 Nov 2008 01:45:35 +0000 (-0600)
Subject: mpc8641: fix address-cells default in old .dts detection
X-Git-Tag: v2009.01-rc1~72^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3f510db522d160179dff3ddcce9b18f6241c2c24;p=u-boot

mpc8641: fix address-cells default in old .dts detection

address-cells defaults to 2, not 1; so in the unlikely
event that it isn't specified, this patch is required
for correct operation.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
---

diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 285d051ede..b83ed6c456 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -278,10 +278,10 @@ ft_board_setup(void *blob, bd_t *bd)
 
 	if (tmp) {
 		u64 addr;
-		if (addrcells && (*addrcells == 2))
-			addr = *tmp;
-		else
+		if (addrcells && (*addrcells == 1))
 			addr = *(u32 *)tmp;
+		else
+			addr = *tmp;
 
 		if (addr != CONFIG_SYS_CCSRBAR_PHYS)
 			printf("WARNING: The CCSRBAR address in your .dts "