]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
fdt: Correct global_data condition in main
authorSimon Glass <sjg@chromium.org>
Wed, 28 Nov 2012 07:54:58 +0000 (07:54 +0000)
committerGerald Van Baren <gvb@unssw.com>
Thu, 29 Nov 2012 00:26:49 +0000 (19:26 -0500)
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>
common/main.c

index 8052d4222ec82b8ddd9d9b2b0528bfb6ff67c9bd..5362781f18700ee7e98547e07a5f673635b52666 100644 (file)
@@ -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