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/boards/at91sam9m10ihd | |
| 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/boards/at91sam9m10ihd')
| -rw-r--r-- | arch/arm/boards/at91sam9m10ihd/env/config | 2 | ||||
| -rw-r--r-- | arch/arm/boards/at91sam9m10ihd/init.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boards/at91sam9m10ihd/env/config b/arch/arm/boards/at91sam9m10ihd/env/config index bc2119ee96..db2713c19a 100644 --- a/arch/arm/boards/at91sam9m10ihd/env/config +++ b/arch/arm/boards/at91sam9m10ihd/env/config @@ -3,8 +3,6 @@ # change network settings in /env/network/eth0 # change mtd partition settings and automountpoints in /env/init/* -#global.hostname= - # set to false if you do not want to have colors global.allow_color=true diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c index 7fa6afbdfe..b75c51de31 100644 --- a/arch/arm/boards/at91sam9m10ihd/init.c +++ b/arch/arm/boards/at91sam9m10ihd/init.c @@ -283,6 +283,9 @@ device_initcall(at91sam9m10ihd_devices_init); static int at91sam9m10ihd_console_init(void) { + barebox_set_model("Atmel at91sam9m10ihd"); + barebox_set_hostname("at91sam9m10ihd"); + at91_register_uart(0, 0); return 0; } |