:: commit 1511a8dc95a7ee766d61e17abd6299faed744eda

diff --git a/common/lib/elsewhere.c b/common/lib/elsewhere.c
index f6aead32..7f30ac1c 100644
--- a/common/lib/elsewhere.c
+++ b/common/lib/elsewhere.c
@@ -72,7 +72,7 @@ retry:
                 if (!flexible_target) {
                     return false;
                 }
-                *target += 0x1000;
+                *target = ALIGN_UP(top, 4096, return false);
                 goto retry;
             }
         }