On 20 March 2017 at 11:13, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 13 March 2017 at 14:17, Ard Biesheuvel <ard.biesheu...@linaro.org> wrote: >> The arm64 boot protocol stipulates that the kernel must be loaded >> TEXT_OFFSET bytes beyond a 2 MB aligned base address, where TEXT_OFFSET >> could be any 4 KB multiple between 0 and 2 MB, and whose value can be >> found in the header of the Image file. >> >> So after attempts to load the arm64 kernel image as an ELF file or as a >> U-Boot image have failed (both of which have their own way of specifying >> the load offset), try to determine the TEXT_OFFSET from the image after >> loading it but before mapping it as a ROM mapping into the guest address >> space. >> >> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> >> --- >> v2: split off AArch64 specific loader logic regarding gzipped/raw and >> variable >> load offset into a separate helper function, which removes the need for >> loading the image twice > > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > > Since we're due to tag rc1 tomorrow and this is kind of on the > border between bugfix and new feature, I think I'd rather > defer it to 2.10, unless you have a strong view that it should > go into 2.9.
Since we're now at rc3 and I don't expect to need to do another arm pull request before 2.9, I've put this patch into target-arm.next for 2.10. thanks -- PMM
