From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerry Van Baren <gvb.uboot@gmail.com>
Date: Wed, 28 Nov 2012 20:08:39 -0500
Subject: [U-Boot] [PATCH v2] fdt: Correct global_data condition in main
In-Reply-To: <1354125298-13048-1-git-send-email-sjg@chromium.org>
References: <1354116325-2567-1-git-send-email-sjg@chromium.org>
	<1354125298-13048-1-git-send-email-sjg@chromium.org>
Message-ID: <50B6B597.1070907@gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Simon,

On 11/28/2012 12:54 PM, Simon Glass wrote:
> 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>
> ---
> 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
> 

Applied to u-boot-fdt, pull request coming.

Thanks,
gvb