diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-02-27 14:53:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-27 20:38:48 +0100 |
| commit | 71a1a288c9f14737ee0b1eb3fc71d2807590e01e (patch) | |
| tree | ea59e80dd233c93770efcccf55587c4615b8676f /arch/arm/boards/datamodul-edm-qmx6/board.c | |
| parent | c5853fbbf53627e5ca00095a86d548e845d8828c (diff) | |
| download | barebox-71a1a288c9f14737ee0b1eb3fc71d2807590e01e.tar.gz barebox-71a1a288c9f14737ee0b1eb3fc71d2807590e01e.tar.xz | |
ARM: i.MX: edmqmx6: choose the environment at the correct time
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/datamodul-edm-qmx6/board.c')
| -rw-r--r-- | arch/arm/boards/datamodul-edm-qmx6/board.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index 8a49beee2f..3184912c47 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -111,15 +111,11 @@ static int realq7_env_init(void) } late_initcall(realq7_env_init); -static int realq7_console_init(void) +static int realq7_device_init(void) { if (!of_machine_is_compatible("dmo,imx6q-edmqmx6")) return 0; - barebox_set_hostname("eDM-QMX6"); - - imx6_init_lowlevel(); - switch (bootsource_get()) { case BOOTSOURCE_MMC: of_device_enable_path("/chosen/environment-emmc"); @@ -132,4 +128,17 @@ static int realq7_console_init(void) return 0; } -postcore_initcall(realq7_console_init); +device_initcall(realq7_device_init); + +static int realq7_postcore_init(void) +{ + if (!of_machine_is_compatible("dmo,imx6q-edmqmx6")) + return 0; + + barebox_set_hostname("eDM-QMX6"); + + imx6_init_lowlevel(); + + return 0; +} +postcore_initcall(realq7_postcore_init); |