Message ID | 20180308115036.23461-1-david.engraf@sysgo.com |
---|---|
State | New |
Headers | show |
Series | PPC e500: Fix gap between u-boot and kernel | expand |
On Thu, Mar 08, 2018 at 12:50:36PM +0100, David Engraf wrote: > This patch moves the gap between u-boot and kernel at the correct location. > > Signed-off-by: David Engraf <david.engraf@sysgo.com> Applied, thanks. > --- > hw/ppc/e500.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index 43c15d18c4..bdef2bddc6 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -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;
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 43c15d18c4..bdef2bddc6 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -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;
This patch moves the gap between u-boot and kernel at the correct location. Signed-off-by: David Engraf <david.engraf@sysgo.com> --- hw/ppc/e500.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)