summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/avnet-zedboard
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-15 09:02:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-08-16 08:40:55 +0200
commit068bed22a6154aec1fe689603b8a8eaa27c0f350 (patch)
tree5cebcbbbcd486ee49552253d27d079b7f6703fd4 /arch/arm/boards/avnet-zedboard
parent774580c2bde4c8b126eed0a80d00cb22cbfb3193 (diff)
downloadbarebox-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/boards/avnet-zedboard')
-rw-r--r--arch/arm/boards/avnet-zedboard/board.c3
-rw-r--r--arch/arm/boards/avnet-zedboard/env/init/config-board1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boards/avnet-zedboard/board.c b/arch/arm/boards/avnet-zedboard/board.c
index 7b95754692..ef9a8a878c 100644
--- a/arch/arm/boards/avnet-zedboard/board.c
+++ b/arch/arm/boards/avnet-zedboard/board.c
@@ -44,6 +44,9 @@ device_initcall(zedboard_device_init);
static int zedboard_console_init(void)
{
+ barebox_set_model("Avnet ZedBoard");
+ barebox_set_hostname("zedboard");
+
zynq_add_uart1();
return 0;
diff --git a/arch/arm/boards/avnet-zedboard/env/init/config-board b/arch/arm/boards/avnet-zedboard/env/init/config-board
index 99576533c7..f3032a478a 100644
--- a/arch/arm/boards/avnet-zedboard/env/init/config-board
+++ b/arch/arm/boards/avnet-zedboard/env/init/config-board
@@ -3,5 +3,4 @@
# board defaults, do not change in running system. Change /env/config
# instead
-global.hostname=ZedBoard
global.linux.bootargs.base="console=ttyPS1,115200"