[U-Boot] [PATCH v2] fdt: Correct global_data condition in main

Simon Glass sjg at chromium.org
Wed Nov 28 18:54:58 CET 2012


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 at chromium.org>
---
Changes in v2:
- Remove the #ifdef as it is getting out of hand

 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
-- 
1.7.7.3



More information about the U-Boot mailing list