From patchwork Wed Jan 4 19:59:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 134344 X-Patchwork-Delegate: graeme.russ@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CFD56B6FA8 for ; Thu, 5 Jan 2012 07:01:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AD26628438; Wed, 4 Jan 2012 21:01:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lDLts31eAmhp; Wed, 4 Jan 2012 21:01:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A83ED28428; Wed, 4 Jan 2012 21:00:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4502328414 for ; Wed, 4 Jan 2012 21:00:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YkrjfVQCu0+U for ; Wed, 4 Jan 2012 21:00:38 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vw0-f44.google.com (mail-vw0-f44.google.com [209.85.212.44]) by theia.denx.de (Postfix) with ESMTPS id 509DE2841B for ; Wed, 4 Jan 2012 21:00:21 +0100 (CET) Received: by mail-vw0-f44.google.com with SMTP id fo1so12279428vbb.3 for ; Wed, 04 Jan 2012 12:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to; bh=JxrUHZ2XnuWf/4wc8AN+zAoJ/L6Or/YRUWZowOYZFeg=; b=ioz8bLi65xrpy97CTPCzaUGEH8CR3sTk8/wtH/s+17DD5GgmcvwrvMaY+CwYk+W6Ec hbGtRMrUSPxl0FoKJb6Rfsw8EuAPg0ji3H1AtwKCXeDdg96IWZ13i7xi2puiYGn9C2yw ohKcWGp/T+TZFAmabqw7omRDbggyO5Aq594Rg= Received: by 10.52.23.2 with SMTP id i2mr27896908vdf.126.1325707221571; Wed, 04 Jan 2012 12:00:21 -0800 (PST) Received: from localhost.localdomain (d110-32-162-141.sbr801.nsw.optusnet.com.au. [110.32.162.141]) by mx.google.com with ESMTPS id eb3sm33049296vdc.5.2012.01.04.12.00.19 (version=SSLv3 cipher=OTHER); Wed, 04 Jan 2012 12:00:21 -0800 (PST) From: Graeme Russ To: u-boot@lists.denx.de Date: Thu, 5 Jan 2012 06:59:46 +1100 Message-Id: <1325707195-3218-8-git-send-email-graeme.russ@gmail.com> X-Mailer: git-send-email 1.7.5.2.317.g391b14 In-Reply-To: <1325707195-3218-1-git-send-email-graeme.russ@gmail.com> References: <1325707195-3218-1-git-send-email-graeme.russ@gmail.com> In-Reply-To: <1325477374-6417-9-git-send-email-graeme.russ@gmail.com> Subject: [U-Boot] [PATCH v2 08/17] x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Graeme Russ Acked-by: Simon Glass --- Changes for v2: - None arch/x86/lib/board.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.5.2.317.g391b14 diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index b64c2d3..3d82165 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -252,8 +252,6 @@ void board_init_f(ulong boot_flags) hang(); } - gd->flags |= GD_FLG_RELOC; - /* * SDRAM is now initialised, U-Boot has been copied into SDRAM, * the BSS has been cleared etc. The final stack can now be setup @@ -322,6 +320,8 @@ void board_init_r(gd_t *id, ulong dest_addr) /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("" : : : "memory"); + gd->flags |= GD_FLG_RELOC; + gd->bd = &bd_data; memset(gd->bd, 0, sizeof(bd_t)); show_boot_progress(0x22);