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 <s.hauer@xxxxxxxxxxxxxx>
[...]
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.
+ 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/
+ 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). Sebastian
diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index 16ee116..bb69e64 100644 --- a/arch/arm/mach-mvebu/dove.c +++ b/arch/arm/mach-mvebu/dove.c @@ -121,6 +121,9 @@ static int dove_init_soc(void) { unsigned long phys_base, phys_size; + barebox_set_model("Marvell Dove"); + barebox_set_hostname("dove"); + dove_remap_mc_regs(); dove_init_clocks(); clkdev_add_physbase(tclk, (unsigned int)DOVE_TIMER_BASE, NULL);
_______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox