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/at91sam9260ek | |
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/at91sam9260ek')
-rw-r--r-- | arch/arm/boards/at91sam9260ek/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index d7a28ccfc4..688ed99c67 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -266,6 +266,14 @@ device_initcall(at91sam9260ek_devices_init); static int at91sam9260ek_console_init(void) { + if (machine_is_at91sam9g20ek()) { + barebox_set_model("Atmel at91sam9g20-ek"); + barebox_set_hostname("at91sam9g20-ek"); + } else { + barebox_set_model("Atmel at91sam9260-ek"); + barebox_set_hostname("at91sam9260-ek"); + } + at91_register_uart(0, 0); return 0; } |