On 23.08.2012, at 02:55, Scott Wood wrote: > While investigating dtb pad issues, I noticed that initrd_base wasn't taking > loadaddr into account the way dt_base was. This seems wrong. > > Signed-off-by: Scott Wood <scottw...@freescale.com>
Ah, all the images I tested start off from address 0. But yes, we should add the kernel load offset as well. Thanks, applied to ppc-next. Alex > --- > hw/ppc/e500.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index 1ccfd7c..60ddd85 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -553,7 +553,8 @@ void ppce500_init(PPCE500Params *params) > > /* Load initrd. */ > if (params->initrd_filename) { > - initrd_base = (kernel_size + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; > + initrd_base = (loadaddr + kernel_size + INITRD_LOAD_PAD) & > + ~INITRD_PAD_MASK; > initrd_size = load_image_targphys(params->initrd_filename, > initrd_base, > ram_size - initrd_base); > > -- > 1.7.9.5 > >