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/usb-a926x | |
| 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/usb-a926x')
| -rw-r--r-- | arch/arm/boards/usb-a926x/init.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index edeee4ed3b..fd2603fc1c 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -424,6 +424,17 @@ static int usb_a9260_console_init(void) { struct device_d *dev; + if (machine_is_usb_a9260()) { + barebox_set_model("Calao USB-A9260"); + barebox_set_hostname("usb-a9260"); + } else if (machine_is_usb_a9g20()) { + barebox_set_model("Calao USB-A9G20"); + barebox_set_hostname("usb-a9g20"); + } else { + barebox_set_model("Calao USB-A9263"); + barebox_set_hostname("usb-a9263"); + } + at91_register_uart(0, 0); if (IS_ENABLED(CONFIG_CALAO_DAB_MMX)) { |