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 338f647e419b9500ca20950ff4d6ea3cf5fe0064..1e66929387e896afec2b4245d458981d8f82650c 100644 (file)
--- 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 6bb2546eda5664a82289e5879a7068e3254363a6..a14509404253fd78b0d47131e4d6888953d54dc7 100644 (file)
--- 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