PPC e500: Fix gap between u-boot and kernel
PATCH 1/1 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 <[email protected]>
--- hw/ppc/e500.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
hw/ppc/e500.c +4 -5
@@ -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 ;
Signature · 1 line
2.14.1
David Gibson
AppliedQuoted 3 lines · David Engraf
This patch moves the gap between u-boot and kernel at the correct location.
Signed-off-by David Engraf <[email protected]>
Applied, thanks.
Quoted 31 lines
--- hw/ppc/e500.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)hw/ppc/e500.c +4
-5@@ -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 ;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson