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/scb9328 | |
| 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/scb9328')
| -rw-r--r-- | arch/arm/boards/scb9328/env/config | 1 | ||||
| -rw-r--r-- | arch/arm/boards/scb9328/scb9328.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boards/scb9328/env/config b/arch/arm/boards/scb9328/env/config index ce6310b67d..c3cbce57d4 100644 --- a/arch/arm/boards/scb9328/env/config +++ b/arch/arm/boards/scb9328/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=scb9328 eth0.serverip= user= diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index 541dddfa9d..64f9a16f6b 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -91,6 +91,9 @@ static int scb9328_console_init(void) imx_gpio_mode(PC11_PF_UART1_TXD); imx_gpio_mode(PC12_PF_UART1_RXD); + barebox_set_model("Synertronixx scb9328"); + barebox_set_hostname("scb9328"); + imx1_add_uart0(); return 0; |