diff options
| author | Simon Glass <sjg@chromium.org> | 2012-11-28 07:54:58 +0000 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2012-11-28 19:26:49 -0500 |
| commit | f39612d360c02ce97e7ca7a872693f348f7ec8fd (patch) | |
| tree | 7d73a83809e7ad4216d9be42931b552c3f23e5f4 /common/main.c | |
| parent | d41b3cc16fd97da23900f79e8fefdeedeebde8f6 (diff) | |
| download | u-boot-imx-f39612d360c02ce97e7ca7a872693f348f7ec8fd.zip u-boot-imx-f39612d360c02ce97e7ca7a872693f348f7ec8fd.tar.gz u-boot-imx-f39612d360c02ce97e7ca7a872693f348f7ec8fd.tar.bz2 | |
fdt: Correct global_data condition in main
We need an extra condition here in case we want to use fdt without the
silent console/cmdline editing/post options. It is easier to just remove
the #ifdef.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 8052d42..5362781 100644 --- a/common/main.c +++ b/common/main.c @@ -53,9 +53,7 @@ #include <linux/ctype.h> #include <menu.h> -#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING) DECLARE_GLOBAL_DATA_PTR; -#endif /* * Board-specific Platform code can reimplement show_boot_progress () if needed |