From patchwork Sat Nov 19 20:25:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 696947 X-Patchwork-Delegate: bmeng.cn@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 3tLmr40Nlnz9sfH for ; Sun, 20 Nov 2016 07:37:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="I3gMnaPF"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65CA9A770E; Sat, 19 Nov 2016 21:32:23 +0100 (CET) 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 a-n-NKutFbKp; Sat, 19 Nov 2016 21:32:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5316B397C; Sat, 19 Nov 2016 21:30:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CAD0AB387A for ; Sat, 19 Nov 2016 21:29:14 +0100 (CET) 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 dNU1jFffBrtR for ; Sat, 19 Nov 2016 21:29:14 +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-oi0-f46.google.com (mail-oi0-f46.google.com [209.85.218.46]) by theia.denx.de (Postfix) with ESMTPS id 858B2B38B4 for ; Sat, 19 Nov 2016 21:27:47 +0100 (CET) Received: by mail-oi0-f46.google.com with SMTP id 128so123532808oih.0 for ; Sat, 19 Nov 2016 12:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GzFoWvcs25CDNMU+UfMPUOCh5PK+pMZW0k8WDuwKbNY=; b=I3gMnaPF+aZTL7ckHw7auMRFRkZH4uINbzWBKKRgrRn9Q+7CzRnUqkBssUVqePEV8U H8X2NrG+q1XNa44ntUr8s3wt0Ro3iTbh0THqiuub8bHFH7VGoj4JO/ACZCuWHLegb4cj R+JiBSyjD93MRnOEN86SoP24XgRDa19MI1lbdXuP2joRt/+xRRrRHxgGkIi/qqKlwwJc 8RcpNszcWLg8h02jK16jmm+1ooepUW6eAa7Gob0KNvJXmPWVvbRVlqf+Sf8wRZ//HTnC hSuG+PaIsK17FoBi9kGxcdvc9VPhISNVcEFXwrSJ2sB3Cq/UEy+aTWtlH6fOUY+t8LqP qqGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GzFoWvcs25CDNMU+UfMPUOCh5PK+pMZW0k8WDuwKbNY=; b=WhFlmwQ5d6KcNgVu6EGX3xjI89X7+Mrh8U3prxgV0/k+nTrRk/WFOJLl4UcLTj65PJ NCeBoNIxzWvXTH4O+5QFkBCD73dZfBlvqbMdw3e9knE35cBRfRsnkPhpI91TbgZxb0lu 8RbCFymaDi4IKoahLO7td99It3+SxhScw7WMP95Z1K7qVDBdKeXxk1/g3ujtdomGbPjQ c4WmRpkMmoZ59Lr8t9ajkSItRf7sPrt4fAt6uZiIeMEpXwqk/K6uNtr1jB/80u6t9uer 9S4AIHGJRl8Vj99MDqZZu9Iyuj/1HujmMgTgl4UKDBposWVipXewWp9NIBGmLRnnwoTB 4FXw== X-Gm-Message-State: AKaTC01sFIJ7bedkYdWmn5zURQs2gY3lU3AUkZp3GqqsBmQwzLT74X6BBDY3dv7IfrfhpFMU X-Received: by 10.202.206.74 with SMTP id e71mr3915247oig.80.1479587266241; Sat, 19 Nov 2016 12:27:46 -0800 (PST) Received: from kaki.bld.corp.google.com ([100.100.197.48]) by smtp.gmail.com with ESMTPSA id e184sm4687921oig.7.2016.11.19.12.27.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Nov 2016 12:27:45 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E713E403A3; Sat, 19 Nov 2016 13:27:44 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 19 Nov 2016 13:25:44 -0700 Message-Id: <1479587152-25065-56-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1479587152-25065-1-git-send-email-sjg@chromium.org> References: <1479587152-25065-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 55/63] x86: Move call64 to the i386 directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This code is only used in 32-bit mode. Move it so that it does not get built with 64-bit U-Boot. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: None arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/i386/Makefile | 1 + arch/x86/cpu/{ => i386}/call64.S | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/x86/cpu/{ => i386}/call64.S (100%) diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 6889df3..2fda32d 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -15,7 +15,7 @@ extra-y = start.o endif extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o ifndef CONFIG_$(SPL_)X86_64 -obj-y += call64.o setjmp.o +obj-y += setjmp.o endif obj-y += cpu.o cpu_x86.o diff --git a/arch/x86/cpu/i386/Makefile b/arch/x86/cpu/i386/Makefile index d336495..2547bba 100644 --- a/arch/x86/cpu/i386/Makefile +++ b/arch/x86/cpu/i386/Makefile @@ -3,5 +3,6 @@ # Written by Simon Glass # +obj-y += call64.o obj-y += cpu.o obj-y += interrupt.o diff --git a/arch/x86/cpu/call64.S b/arch/x86/cpu/i386/call64.S similarity index 100% rename from arch/x86/cpu/call64.S rename to arch/x86/cpu/i386/call64.S