[PATCH 15/19] bootwrapper: Add initrd information to the device tree in ft_finalize().

Scott Wood scottwood at freescale.com
Tue Feb 13 03:42:13 EST 2007


Mark A. Greer wrote:
>>diff --git a/arch/powerpc/boot/flatdevtree_misc.c b/arch/powerpc/boot/flatdevtree_misc.c
>>index 04da38f..39fa010 100644
>>--- a/arch/powerpc/boot/flatdevtree_misc.c
>>+++ b/arch/powerpc/boot/flatdevtree_misc.c
>>@@ -33,8 +33,20 @@ static int ft_setprop(const void *phandl
>> 	return ft_set_prop(&cxt, phandle, propname, buf, buflen);
>> }
>> 
>>-static unsigned long ft_finalize(void)
>>+unsigned long ft_finalize(void)
> 
> 
> This is unnecessary.  There is already global access from
> dt_ops.finalize.

cuboot has its own dt_ops.finalize, which calls ft_finalize, and 
relocates the tree to someplace that won't get overwritten by the kernel 
relocation.

>>+	unsigned long initrd_end = initrd.addr + initrd.size;
>>+	void *devp;
>>+
>>+	if (initrd.size && (devp = finddevice("/chosen"))) {
>>+		setprop(devp, "linux,initrd-start", &initrd.addr,
>>+		        sizeof(initrd.addr));
>>+		setprop(devp, "linux,initrd-end", &initrd_end,
>>+		        sizeof(initrd_end));
>>+
>>+		ft_add_rsvmap(&cxt, initrd.addr, initrd.size);
>>+	}
>>+
> 
> 
> IMHO, this is a very unnatural place to put this code.
> It really belongs in main.c.  That's where all the rest
> of the code that accesses initrd.* is.

I was trying to not change the existing semantics for the of.c platform, 
which passes the initrd information a different way.

-Scott



More information about the Linuxppc-dev mailing list