From: Simon Glass <sjg@chromium.org>
Date: Thu, 12 Jun 2014 13:24:48 +0000 (-0600)
Subject: bootm: Support android boot on sandbox
X-Git-Tag: v2014.07-rc4~40
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=07c0cd71340e21c690b4921ced6790ea49adc4b4;p=karo-tx-uboot.git

bootm: Support android boot on sandbox

A small change allows this to operate on sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/bootm.c b/common/bootm.c
index 338f647e41..1e66929387 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -793,7 +793,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
 #ifdef CONFIG_ANDROID_BOOT_IMAGE
 	case IMAGE_FORMAT_ANDROID:
 		printf("## Booting Android Image at 0x%08lx ...\n", img_addr);
-		if (android_image_get_kernel((void *)img_addr, images->verify,
+		if (android_image_get_kernel(buf, images->verify,
 					     os_data, os_len))
 			return NULL;
 		break;
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 6bb2546eda..a145094042 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -41,6 +41,7 @@
 #define CONFIG_RSA
 #define CONFIG_CMD_FDT
 #define CONFIG_DEFAULT_DEVICE_TREE	sandbox
+#define CONFIG_ANDROID_BOOT_IMAGE
 
 #define CONFIG_FS_FAT
 #define CONFIG_FS_EXT4