diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-03 11:44:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-03 11:44:12 -0400 |
| commit | 49c8c91cc69546f7a2017bc0943ef1225a01c72c (patch) | |
| tree | f91b7127c7f7c9798f511e786d0b6a3116d79f53 /common | |
| parent | ecd4d99f654f3f7bfb96001891d69c3125e70b69 (diff) | |
| parent | 9f8aa0fbee40b66ceeaab06d3a0ce9a7a7d692a7 (diff) | |
Merge branch '2020-06-03-misc-bugfixes'
- Update various docs to not have 'ARCH=' in them as that's not part of
how U-Boot builds.
- Add macOS tools-only build to Azure to help catch problems on BSD
hosts with tools.
- Bugfixes from the latest header cleanup around ARCH_DMA_MINALIGN
- Assorted small Kconfig logic/typo corrections
- Add a default hash to FIT images that have their its auto generated.
- Other assorted fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-android.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/image-android.c b/common/image-android.c index 6af9baa121..18f7c8db03 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -33,6 +33,13 @@ static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr) if (hdr->kernel_addr == ANDROID_IMAGE_DEFAULT_KERNEL_ADDR) return (ulong)hdr + hdr->page_size; + /* + * abootimg creates images where all load addresses are 0 + * and we need to fix them. + */ + if (hdr->kernel_addr == 0 && hdr->ramdisk_addr == 0) + return env_get_ulong("kernel_addr_r", 16, 0); + return hdr->kernel_addr; } |