diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
commit | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (patch) | |
tree | 0eab8d4a22e0bc795f15c3062500a420d801ef4c /arch/arm/mach-mvebu | |
parent | 8f9d4007c53cefc513619b83b5b81b146423b11b (diff) | |
parent | 338b6e7edc054523e2cc0dec77ab3aa1716a385f (diff) | |
download | barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.gz barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.xz |
Merge branch 'for-next/boardinfo'
Conflicts:
arch/mips/boards/qemu-malta/init.c
commands/bootm.c
drivers/of/base.c
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 8bb2eade22..70c49ecc6a 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, |