diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-15 09:02:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-16 08:40:55 +0200 |
| commit | 068bed22a6154aec1fe689603b8a8eaa27c0f350 (patch) | |
| tree | 5cebcbbbcd486ee49552253d27d079b7f6703fd4 /arch/arm/mach-mvebu | |
| parent | 774580c2bde4c8b126eed0a80d00cb22cbfb3193 (diff) | |
| download | barebox-068bed22a6154aec1fe689603b8a8eaa27c0f350.tar.gz barebox-068bed22a6154aec1fe689603b8a8eaa27c0f350.tar.xz | |
Set model and hostname at boardlevel
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@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 3c38642ec2..a9e5aa9056 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -9,14 +9,6 @@ config ARCH_TEXT_BASE default 0x2000000 if MACH_MARVELL_ARMADA_XP_GP default 0x2000000 if MACH_SOLIDRUN_CUBOX -config BOARDINFO - default "PlatHome OpenBlocks AX3" if MACH_PLATHOME_OPENBLOCKS_AX3 - default "Globalscale Mirabox" if MACH_GLOBALSCALE_MIRABOX - default "Globalscale Guruplug" if MACH_GLOBALSCALE_GURUPLUG - default "Marvell Armada XP GP" if MACH_MARVELL_ARMADA_XP_GP - default "SolidRun CuBox" if MACH_SOLIDRUN_CUBOX - default "USI Topkick" if MACH_USI_TOPKICK - choice prompt "Marvell EBU Processor" diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 24720d595b..776b4c09b8 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 370/XP"); + barebox_set_hostname("armada"); + 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 2ec175a5be..1284220dcf 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"); + 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, |