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/imx233-olinuxino | |
| 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/imx233-olinuxino')
| -rw-r--r-- | arch/arm/boards/imx233-olinuxino/env/config | 2 | ||||
| -rw-r--r-- | arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boards/imx233-olinuxino/env/config b/arch/arm/boards/imx233-olinuxino/env/config index 0e95373b19..c84014ff58 100644 --- a/arch/arm/boards/imx233-olinuxino/env/config +++ b/arch/arm/boards/imx233-olinuxino/env/config @@ -1,7 +1,5 @@ #!/bin/sh -hostname=imx23-olinuxino - # 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/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c index dc8a099e22..a5c54fe8ad 100644 --- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c +++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c @@ -142,6 +142,9 @@ device_initcall(imx23_olinuxino_devices_init); static int imx23_olinuxino_console_init(void) { + barebox_set_model("Olimex.ltd imx233-olinuxino"); + barebox_set_hostname("imx233-olinuxino"); + add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192, IORESOURCE_MEM, NULL); |