PPC e500: Fix gap between u-boot and kernel
This patch moves the gap between u-boot and kernel at the correct location. Signed-off-by: David Engraf <david.engraf@sysgo.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
1ca15d85ab
commit
b4a5f24a17
|
@ -1009,6 +1009,10 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
|
|||
}
|
||||
|
||||
cur_base = loadaddr + payload_size;
|
||||
if (cur_base < (32 * 1024 * 1024)) {
|
||||
/* u-boot occupies memory up to 32MB, so load blobs above */
|
||||
cur_base = (32 * 1024 * 1024);
|
||||
}
|
||||
|
||||
/* Load bare kernel only if no bios/u-boot has been provided */
|
||||
if (machine->kernel_filename && !kernel_as_payload) {
|
||||
|
@ -1025,11 +1029,6 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
|
|||
cur_base += kernel_size;
|
||||
}
|
||||
|
||||
if (cur_base < (32 * 1024 * 1024)) {
|
||||
/* u-boot occupies memory up to 32MB, so load blobs above */
|
||||
cur_base = (32 * 1024 * 1024);
|
||||
}
|
||||
|
||||
/* Load initrd. */
|
||||
if (machine->initrd_filename) {
|
||||
initrd_base = (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK;
|
||||
|
|
Loading…
Reference in a new issue