summaryrefslogtreecommitdiff
path: root/boot/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-01-12 08:34:50 -0500
committerTom Rini <trini@konsulko.com>2024-01-12 08:34:50 -0500
commit547d3dd28a46a18d59e00a153c8becca8d4e8cf9 (patch)
tree79a09ba118b2b4d3001bfd478206734d2727f4f7 /boot/bootm.c
parent2ee7a8ec6f1711abe9619fd8765edc16742be9de (diff)
parent2027e99e61aab6fd8b06e2d752e0e538cff26eb6 (diff)
Merge branch '2024-01-12-assorted-fixes'
- Allow defconfigs to #include files (so we can construct a defconfig from fragments), update phy-mtk-tphy binding, assorted test fixes, allow building host tools without cryptographic libraries again, android_ab bugfix, and make some SPL debugging cases easier.
Diffstat (limited to 'boot/bootm.c')
-rw-r--r--boot/bootm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/boot/bootm.c b/boot/bootm.c
index 7a050ed41a7..d071537d692 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -644,6 +644,7 @@ static int bootm_load_os(struct bootm_headers *images, int boot_progress)
if (!load)
return 1;
os.load = load;
+ images->ep = load;
debug("Allocated %lx bytes at %lx for kernel (size %lx) decompression\n",
req_size, load, image_len);
}