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/ccxmx51 | |
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/ccxmx51')
-rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51.c | 3 | ||||
-rw-r--r-- | arch/arm/boards/ccxmx51/env/config-board | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 89d8f6c857..6b5acb2973 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -474,6 +474,9 @@ static int ccxmx51_console_init(void) { mxc_iomux_v3_setup_multiple_pads(ccxmx51_pads, ARRAY_SIZE(ccxmx51_pads)); + barebox_set_model("Digi ConnectCore i.MX51"); + barebox_set_hostname("ccmx51"); + imx51_add_uart0(); return 0; diff --git a/arch/arm/boards/ccxmx51/env/config-board b/arch/arm/boards/ccxmx51/env/config-board index 26acb4b927..1405344903 100644 --- a/arch/arm/boards/ccxmx51/env/config-board +++ b/arch/arm/boards/ccxmx51/env/config-board @@ -1,7 +1,5 @@ #!/bin/sh -global.hostname=ccmx51 - # Timeout in seconds before the default boot entry is started global.autoboot_timeout=2 |