summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-06-12 07:24:48 -0600
committerTom Rini <trini@ti.com>2014-06-19 11:19:00 -0400
commit07c0cd71340e21c690b4921ced6790ea49adc4b4 (patch)
treef8e341b6a41b28905f5faa5e611e12f9c9f30147
parent126cc864206e0a06635a4bf49b75de8d5a4a80d7 (diff)
downloadu-boot-imx-07c0cd71340e21c690b4921ced6790ea49adc4b4.zip
u-boot-imx-07c0cd71340e21c690b4921ced6790ea49adc4b4.tar.gz
u-boot-imx-07c0cd71340e21c690b4921ced6790ea49adc4b4.tar.bz2
bootm: Support android boot on sandbox
A small change allows this to operate on sandbox. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/bootm.c2
-rw-r--r--include/configs/sandbox.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 338f647..1e66929 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 6bb2546..a145094 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