diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-07-05 14:17:55 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-07-05 14:17:58 +0530 |
| commit | a1876a05a3dcd33d7413956dfcf760ef79010327 (patch) | |
| tree | 1deaedfea6f8be343b8f6b9c1072b4b7f4b27fc6 | |
| parent | 6f2e09fdda80f55da32026fc756c244d51186cae (diff) | |
cmd_bootm: Follow special path for Arndale w.r.t. fake bootingtracking-arndale
arch_preboot_os() is used to migrate to HYP mode. We need to ensure that
this is called only during actual OS booting.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | common/cmd_bootm.c | 5 | ||||
| -rw-r--r-- | include/configs/arndale.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9f03dfd5c..db5924df5 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -527,7 +527,12 @@ static int boot_selected_os(int argc, char * const argv[], int state, if (images->os.os == IH_OS_LINUX) fixup_silent_linux(); #endif +#ifdef CONFIG_ARNDALE + if (state == BOOTM_STATE_OS_GO) + arch_preboot_os(); +#else arch_preboot_os(); +#endif boot_fn(state, argc, argv, images); if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ return 0; diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 22866738e..4fac0d843 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -27,6 +27,8 @@ #include <configs/exynos5250-dt.h> +#define CONFIG_ARNDALE + #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale |