summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/chumby_falconwing
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/chumby_falconwing
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/chumby_falconwing')
-rw-r--r--arch/arm/boards/chumby_falconwing/env/config2
-rw-r--r--arch/arm/boards/chumby_falconwing/falconwing.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boards/chumby_falconwing/env/config b/arch/arm/boards/chumby_falconwing/env/config
index 3839b40584..e160027524 100644
--- a/arch/arm/boards/chumby_falconwing/env/config
+++ b/arch/arm/boards/chumby_falconwing/env/config
@@ -1,7 +1,5 @@
#!/bin/sh
-global.hostname=falconwing
-
# use 'dhcp' to do dhcp in barebox and in kernel
# use 'none' if you want to skip kernel ip autoconfiguration
ip=none
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c
index 3b97551cba..198a35be70 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -312,6 +312,9 @@ device_initcall(falconwing_devices_init);
static int falconwing_console_init(void)
{
+ barebox_set_model("Chumby Falconwing");
+ barebox_set_hostname("falconwing");
+
add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
IORESOURCE_MEM, NULL);