summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/dss11/init.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:39:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:39:22 +0200
commit1729b1798e1bfd4614a9cf7cf651cee8b6923283 (patch)
tree0eab8d4a22e0bc795f15c3062500a420d801ef4c /arch/arm/boards/dss11/init.c
parent8f9d4007c53cefc513619b83b5b81b146423b11b (diff)
parent338b6e7edc054523e2cc0dec77ab3aa1716a385f (diff)
downloadbarebox-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/boards/dss11/init.c')
-rw-r--r--arch/arm/boards/dss11/init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c
index f769f4f681..8e992f446d 100644
--- a/arch/arm/boards/dss11/init.c
+++ b/arch/arm/boards/dss11/init.c
@@ -155,6 +155,9 @@ device_initcall(dss11_devices_init);
static int dss11_console_init(void)
{
+ barebox_set_model("Aizo dSS11");
+ barebox_set_hostname("dss11");
+
at91_register_uart(0, 0);
return 0;
}