diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:19:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:19:41 +0200 |
| commit | 8da9a22b522f2b89f51f57b96295941c059e9c9d (patch) | |
| tree | c51cb4a4d67e655fb3084c93280340cb6e70efb8 /arch/arm/boards/freescale-mx51-babbage | |
| parent | ca7a800c1f713f0b01750746dd034fbb1b1321cc (diff) | |
| parent | f3127d1c1f64aa7f748ce4e30d7c8a6314ce83a4 (diff) | |
| download | barebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.gz barebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/freescale-mx51-babbage')
| -rw-r--r-- | arch/arm/boards/freescale-mx51-babbage/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx51-babbage/env/config-board | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/boards/freescale-mx51-babbage/board.c b/arch/arm/boards/freescale-mx51-babbage/board.c index 0c72c741ef..001873b01c 100644 --- a/arch/arm/boards/freescale-mx51-babbage/board.c +++ b/arch/arm/boards/freescale-mx51-babbage/board.c @@ -157,6 +157,8 @@ static int imx51_babbage_init(void) if (!of_machine_is_compatible("fsl,imx51-babbage")) return 0; + barebox_set_hostname("babbage"); + mc13xxx_register_init_callback(babbage_power_init); armlinux_set_architecture(MACH_TYPE_MX51_BABBAGE); diff --git a/arch/arm/boards/freescale-mx51-babbage/env/config-board b/arch/arm/boards/freescale-mx51-babbage/env/config-board deleted file mode 100644 index cfc483eb3d..0000000000 --- a/arch/arm/boards/freescale-mx51-babbage/env/config-board +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# board defaults, do not change in running system. Change /env/config -# instead - -global.hostname=babbage -global.linux.bootargs.base="console=ttymxc0,115200" |