From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eugeniu Rosca <erosca@de.adit-jv.com>
Date: Mon, 1 Apr 2019 12:52:52 +0200
Subject: [U-Boot] [PATCH v2 5/5] fdt: boot_get_fdt: android: use ENV
	'fdtaddr' as fallback
In-Reply-To: <20190401104537.29801-1-erosca@de.adit-jv.com>
References: <20190401104537.29801-1-erosca@de.adit-jv.com>
Message-ID: <20190401105252.30002-1-erosca@de.adit-jv.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Our platform doesn't store the DTB into the Android image second area,
but rather copies the DTB to RAM from a dedicated dtb.img partition [0],
prior to booting the Android image by calling bootm.

Similar to [1], we find it useful to just call 'bootm' and have the
right DTB being passed to OS (assuming its address has been previously
stored in 'fdtaddr' by calling `fdt addr <dtb-addr>`).

Booting Android with DTB from 'fdtaddr' will only occur if:
 - No DTB is embedded in the second area of Android image
 - 'fdtaddr' points to a valid DTB in RAM

[0] https://source.android.com/devices/architecture/dto/partitions
[1] https://patchwork.ozlabs.org/patch/1046652/
    ("Support boot Android image without address on bootm command")

Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
---
Changes in v2:
 - Removed fdt_totalsize() computation, since FDT size verification is
   only relevant for blobs embedded in U-Boot-supported images
 - Link v1: https://patchwork.ozlabs.org/patch/1071591/
---
 common/image-fdt.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/image-fdt.c b/common/image-fdt.c
index a5d8b41d0209..3aa5ffff0f69 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -469,7 +469,15 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 
 			debug("## Using FDT in Android image second area\n");
 		} else {
-			goto no_fdt;
+			fdt_addr = env_get_hex("fdtaddr", 0);
+			if (!fdt_addr)
+				goto no_fdt;
+
+			fdt_blob = map_sysmem(fdt_addr, 0);
+			if (fdt_check_header(fdt_blob))
+				goto no_fdt;
+
+			debug("## Using FDT at ${fdtaddr}=Ox%lx\n", fdt_addr);
 		}
 #endif
 	} else {
-- 
2.21.0