Re: [PATCH 1/4] xen: Correction to module@1 (dom0 kernel) DT node.

[Ian Campbell <Ian.Campbell@citrix.com>]

On Sun, 2014-11-16 at 12:26 -0800, Christoffer Dall wrote:
> Hi Ian,
> 
> On Mon, Nov 10, 2014 at 02:09:58PM +0000, Ian Campbell wrote:
> > - Include bootargs (kernel command line) property.
> 
> Why?
> 
> The logic I was going for was to reduce duplicate code/entries in the
> DT, and if I read docs/misc/arm/device-tree/booting.txt, the fact that
> we have xen,xen-bootargs but no xen,dom0-bootargs then bootargs added
> further down in Makefile.am will be used.
> 
> Is this not correct or not preferred for some reason?

I thought it wasn't working for me, but it's possible I was tripping
over something else which I fixed by hacking around in this stuff around
the same time and misattributed the fix to this change.

Looking at it now I agree that the code looks like it should work
without this change, so why don't you drop this hunk and if I find
something not working right in the new version I'll investigate again
from scratch.

Ian.

> 
> -Christoffer
> 
> > - Update reg property to match #address-cells and #size-cells in the DTB (both
> >   2).
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > ---
> >  Makefile.am |    3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index 9b6c7e3..ed5acbb 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -69,8 +69,9 @@ XEN_OFFSET	:= 0xA00000
> >  DOM0_OFFSET	:= $(shell echo $$(($(PHYS_OFFSET) + $(KERNEL_OFFSET))))
> >  XEN_BOOTARGS	:= xen,xen-bootargs = \"$(BOOTARGS)\";			\
> >  		   module@1 {						\
> > +			bootargs = \"$(CMDLINE)\";			\
> >  			compatible = \"xen,linux-zimage\", \"xen,multiboot-module\"; \
> > -			reg = <$(DOM0_OFFSET) 0x800000>;		\
> > +			reg = <0 $(DOM0_OFFSET) 0 0x800000>;		\
> >  		   };
> >  endif
> >  
> > -- 
> > 1.7.10.4
> >