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/freescale-mx6-sabresd | |
| 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/freescale-mx6-sabresd')
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabresd/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabresd/env/config-board | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 0b6bf69362..b02791939c 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -109,6 +109,8 @@ static int sabresd_core_init(void) { imx6_init_lowlevel(); + barebox_set_hostname("sabresd"); + return 0; } core_initcall(sabresd_core_init); diff --git a/arch/arm/boards/freescale-mx6-sabresd/env/config-board b/arch/arm/boards/freescale-mx6-sabresd/env/config-board index cf936fb949..e8e8378f53 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/env/config-board +++ b/arch/arm/boards/freescale-mx6-sabresd/env/config-board @@ -3,5 +3,4 @@ # board defaults, do not change in running system. Change /env/config # instead -global.hostname=SabreSD global.linux.bootargs.base="console=ttymxc0,115200" |