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 1V9tcq-0002qh-Ir for barebox@lists.infradead.org; Thu, 15 Aug 2013 09:13:49 +0000 Date: Thu, 15 Aug 2013 11:13:26 +0200 From: Sascha Hauer Message-ID: <20130815091326.GG26614@pengutronix.de> References: <1376551741-16438-1-git-send-email-s.hauer@pengutronix.de> <1376551741-16438-8-git-send-email-s.hauer@pengutronix.de> <520C9A63.3050706@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <520C9A63.3050706@gmail.com> 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 7/8] Set model and hostname at boardlevel To: Sebastian Hesselbarth Cc: Thomas Petazzoni , barebox@lists.infradead.org On Thu, Aug 15, 2013 at 11:07:47AM +0200, Sebastian Hesselbarth wrote: > On 08/15/13 09:29, Sascha Hauer wrote: > >With multiboard support the compiletime generated BOARDINFO string > >gets more and more meaningless. This removes it from Kconfig and > >replaces it with a variable that can be set at boardlevel. > > > >Also many boards have a standard setting for the hostname in the > >environment. This patch also moves the standard to C code by calling > >barebox_set_hostname(). > > > >Signed-off-by: Sascha Hauer > [...] > >diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c > >index 24720d5..b1d148d 100644 > >--- a/arch/arm/mach-mvebu/armada-370-xp.c > >+++ b/arch/arm/mach-mvebu/armada-370-xp.c > >@@ -100,6 +100,9 @@ static int armada_370_xp_init_soc(void) > > { > > unsigned long phys_base, phys_size; > > > >+ barebox_set_model("Marvell Armada"); > > Marvell Armada SoC family comprises more than just 370 and XP. I suggest > to name it "Marvell Armada 370/XP" instead. More Armada SoCs may add to > this init, but right now it's only those two. Normally this should be a boardname, but the corresponding code where I could add it does not exist. Once the name comes from the devicetree this will be solved since the name will come from there then. So I can change it to "Marvell Armada 370/XP" for now and hope that the boards will be converted to devicetree when more SoCs are added. > > >+ barebox_set_hostname("armada"); > > No need to change this though. > > >+ > > armada_370_xp_init_clocks(); > > clkdev_add_physbase(tclk, (unsigned int)ARMADA_370_XP_TIMER_BASE, NULL); > > add_generic_device("mvebu-timer", DEVICE_ID_SINGLE, NULL, > >diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c > >index 2ec175a..d114675 100644 > >--- a/arch/arm/mach-mvebu/kirkwood.c > >+++ b/arch/arm/mach-mvebu/kirkwood.c > >@@ -85,6 +85,9 @@ static int kirkwood_init_soc(void) > > { > > unsigned long phys_base, phys_size; > > > >+ barebox_set_model("Marvell kirkwood"); > > typo s/kirk/Kirk/ Ok, will change. > > >+ barebox_set_hostname("kirkwood"); > >+ > > kirkwood_init_clocks(); > > clkdev_add_physbase(tclk, (unsigned int)KIRKWOOD_TIMER_BASE, NULL); > > add_generic_device("orion-timer", DEVICE_ID_SINGLE, NULL, > > Also, corresponding changes for Dove are missing (diff below). The one Dove board we currently have (Cubox) is converted over to devicetree, so the boardname will come from there. I could add it for now and remove it in the merge of the devicetree conversion and this series. 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