mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately. The default location for the uboot file is 32MiB above bottom of DRAM. This matches the recommendation in Documentation/arm/Booting. Clarify the load_uimage API to state the passing of a load address when an image doesn't specify one, or when loading a ramdisk is expected. Adjust callers of load_uimage, etc. Signed-off-by: Nick Hudson <skrll@netbsd.org> Message-id: 11488a08-1fe0-a278-2210-deb64731107f@gmx.co.uk Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
619d54a8d8
commit
f831f955d4
9 changed files with 33 additions and 11 deletions
|
@ -995,6 +995,7 @@ void ppce500_init(MachineState *machine)
|
|||
* Hrm. No ELF image? Try a uImage, maybe someone is giving us an
|
||||
* ePAPR compliant kernel
|
||||
*/
|
||||
loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;
|
||||
payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL,
|
||||
NULL, NULL);
|
||||
if (payload_size < 0) {
|
||||
|
|
|
@ -179,7 +179,7 @@ static void bamboo_init(MachineState *machine)
|
|||
CPUPPCState *env;
|
||||
uint64_t elf_entry;
|
||||
uint64_t elf_lowaddr;
|
||||
hwaddr loadaddr = 0;
|
||||
hwaddr loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;
|
||||
target_long initrd_size = 0;
|
||||
DeviceState *dev;
|
||||
int success;
|
||||
|
|
|
@ -402,7 +402,7 @@ static void sam460ex_init(MachineState *machine)
|
|||
CPUPPCState *env;
|
||||
PPC4xxI2CState *i2c[2];
|
||||
hwaddr entry = UBOOT_ENTRY;
|
||||
hwaddr loadaddr = 0;
|
||||
hwaddr loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;
|
||||
target_long initrd_size = 0;
|
||||
DeviceState *dev;
|
||||
SysBusDevice *sbdev;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue