From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwc7r-0006q2-22 for barebox@lists.infradead.org; Tue, 09 Jul 2013 17:54:55 +0000 Date: Tue, 9 Jul 2013 19:54:33 +0200 From: Sascha Hauer Message-ID: <20130709175433.GB516@pengutronix.de> References: <1373374600-13856-1-git-send-email-shc_work@mail.ru> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1373374600-13856-1-git-send-email-shc_work@mail.ru> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] ARM: Use armlinux_bootparams address for DTB To: Alexander Shiyan Cc: barebox@lists.infradead.org On Tue, Jul 09, 2013 at 04:56:40PM +0400, Alexander Shiyan wrote: > In some cases, the address of the devicetree, which is obtained > dynamically, may be located in the kernel text area, which leads > to malfunction of the devicetree. The patch uses the address of > the devicetree, designed for the board, if it possible. > > Signed-off-by: Alexander Shiyan > --- > arch/arm/lib/armlinux.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c > index 40a63ea..12fb06d 100644 > --- a/arch/arm/lib/armlinux.c > +++ b/arch/arm/lib/armlinux.c > @@ -261,16 +261,20 @@ void start_linux(void *adr, int swap, unsigned long initrd_address, > unsigned long initrd_size, void *oftree) > { > void (*kernel)(int zero, int arch, void *params) = adr; > - void *params = NULL; > int architecture; > > if (oftree) { > - printf("booting Linux kernel with devicetree\n"); This is a useful information that gets removed here. Could you keep it? > - params = oftree; > - } else { > + if (armlinux_bootparams) { > + struct fdt_header *header = oftree; > + > + printf("Relocate DTB to 0x%p\n", armlinux_bootparams); This is more useful for verbose mode, but I think not for the normal case. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox