From patchwork Wed Jan 4 19:59:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 134350 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 618001007D6 for ; Thu, 5 Jan 2012 07:02:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2FCCA28436; Wed, 4 Jan 2012 21:01:37 +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 y3eIV6njMvsB; Wed, 4 Jan 2012 21:01:36 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10B062843A; Wed, 4 Jan 2012 21:01:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B8152840B for ; Wed, 4 Jan 2012 21:01:00 +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 lwlbGyvlwQ9H for ; Wed, 4 Jan 2012 21:01:00 +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 6F10D2843C for ; Wed, 4 Jan 2012 21:00:37 +0100 (CET) Received: by mail-vw0-f44.google.com with SMTP id fo1so12279428vbb.3 for ; Wed, 04 Jan 2012 12:00:37 -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=pN+wQPzxRQSSfurq5mMDDJE57ndjGgNtspAKYgZbaak=; b=iSUzuabkhieomf39EqU1OlPAjfZ0PmBZojFkCvZejoIfUYE73y51gUj9v4zCA4fBnB rGhOXJ6H1nSsUO0NIoRpPOaf2ZPLDerAMI8IJNxW/zt2TtwXUR9DTI9QLqfYHq58wZpj dq9y3fURkbEwVcXgPvzeh70VB3N58VPxl9Bmo= Received: by 10.52.92.43 with SMTP id cj11mr27956907vdb.25.1325707237163; Wed, 04 Jan 2012 12:00:37 -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.34 (version=SSLv3 cipher=OTHER); Wed, 04 Jan 2012 12:00:36 -0800 (PST) From: Graeme Russ To: u-boot@lists.denx.de Date: Thu, 5 Jan 2012 06:59:52 +1100 Message-Id: <1325707195-3218-14-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-15-git-send-email-graeme.russ@gmail.com> Subject: [U-Boot] [PATCH v2 14/17] x86: Move setup_pcat_compatibility() out of board.c 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 This function simply does not belong in board.c Signed-off-by: Graeme Russ Acked-by: Simon Glass --- Changes for v2: - Added commit message arch/x86/lib/board.c | 7 ------- arch/x86/lib/zimage.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.7.5.2.317.g391b14 diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index aaffd1b..416aa9e 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -486,10 +486,3 @@ void hang(void) for (;;) ; } - -void setup_pcat_compatibility(void) - __attribute__((weak, alias("__setup_pcat_compatibility"))); - -void __setup_pcat_compatibility(void) -{ -} diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index bb40517..2214286 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -314,6 +314,13 @@ void boot_zimage(void *setup_base, void *load_address) #endif } +void setup_pcat_compatibility(void) + __attribute__((weak, alias("__setup_pcat_compatibility"))); + +void __setup_pcat_compatibility(void) +{ +} + int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { struct boot_params *base_ptr;