From patchwork Mon Mar 16 09:30:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 45822 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6A50721547 for ; Mon, 16 Mar 2015 09:31:04 +0000 (UTC) Received: by wibbs8 with SMTP id bs8sf6408992wib.3 for ; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=YGOxbAOu9dMZflGXFvU99XlLz9ZAhVPkPrpC+MgY1QY=; b=YnROQafL4z6RIUVk0CE73MUtyrAb+hwT5rZp1heY7cQrdogyK1ygZ5vme2PkPrd5+L 8WwPvsjzHYknHk1y6UaAmg2AKD8cCf+5SDquk79h5KhgilBsqMbv4z2gRdpOdR+V1zEm 3L3MaIYtw1gBAUiHhCJKa1dlVQNox/8L/8cA5ziry6hXxcnaXZwEHmIip5xMQOUlXhie ioIW65UQzf3egrP1lDJecPv72Ae6Ymvig1foBP1P4hyWr1EiqwPo7ipzeomMXindQk0q 2iWOZuTj31swjVRCfKMWSsfc9tMpkkaQ17sNwjGDzoVwfQ4EE2g3TF49CmhxCr4OycfV RGaA== X-Gm-Message-State: ALoCoQnx5RgeS00J65nlqs5sG1pS+8sfYxaC7NStADiAHx2lMi695YcwhosUoVL6sDLkSOjPazPJ X-Received: by 10.180.80.132 with SMTP id r4mr5680069wix.4.1426498263746; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.104 with SMTP id ln8ls618742lac.94.gmail; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) X-Received: by 10.152.9.98 with SMTP id y2mr53991206laa.94.1426498263218; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id z5si7603020laj.60.2015.03.16.02.31.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 02:31:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbcds1 with SMTP id ds1so27175269lbc.3 for ; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) X-Received: by 10.152.22.67 with SMTP id b3mr53244444laf.117.1426498263050; Mon, 16 Mar 2015 02:31:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2456003lbj; Mon, 16 Mar 2015 02:31:02 -0700 (PDT) X-Received: by 10.66.97.37 with SMTP id dx5mr87330060pab.69.1426498261232; Mon, 16 Mar 2015 02:31:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a8si21246722pdl.123.2015.03.16.02.30.59; Mon, 16 Mar 2015 02:31:01 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753347AbbCPJaz (ORCPT + 28 others); Mon, 16 Mar 2015 05:30:55 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:33582 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbbCPJax (ORCPT ); Mon, 16 Mar 2015 05:30:53 -0400 Received: by wgbcc7 with SMTP id cc7so34575084wgb.0 for ; Mon, 16 Mar 2015 02:30:52 -0700 (PDT) X-Received: by 10.194.95.4 with SMTP id dg4mr80649613wjb.81.1426498252076; Mon, 16 Mar 2015 02:30:52 -0700 (PDT) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id ka1sm14552491wjc.2.2015.03.16.02.30.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 02:30:51 -0700 (PDT) From: Steve Capper To: linux-kernel@vger.kernel.org Cc: will.deacon@arm.com, catalin.marinas@arm.com, ard.biesheuvel@linaro.org, Steve Capper Subject: [PATCH] arm64: Adjust EFI libstub object include logic Date: Mon, 16 Mar 2015 09:30:39 +0000 Message-Id: <1426498239-30830-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit f4f75ad5 ("efi: efistub: Convert into static library") introduced a static library for EFI stub, libstub. The EFI libstub directory is referenced by the kernel build system via a obj subdirectory rule in: drivers/firmware/efi/Makefile Unfortunately, arm64 also references the EFI libstub via: libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ If we're unlucky, the kernel build system can enter libstub via two simultaneous threads resulting in build failures such as: fixdep: error opening depfile: drivers/firmware/efi/libstub/.efi-stub-helper.o.d: No such file or directory scripts/Makefile.build:257: recipe for target 'drivers/firmware/efi/libstub/efi-stub-helper.o' failed make[1]: *** [drivers/firmware/efi/libstub/efi-stub-helper.o] Error 2 Makefile:939: recipe for target 'drivers/firmware/efi/libstub' failed make: *** [drivers/firmware/efi/libstub] Error 2 make: *** Waiting for unfinished jobs.... This patch adjusts the arm64 Makefile to reference the compiled library explicitly (as is currently done in x86), rather than the directory. Fixes: f4f75ad5 efi: efistub: Convert into static library Signed-off-by: Steve Capper --- arch/arm64/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 0666888..da226de 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -51,7 +51,7 @@ core-$(CONFIG_XEN) += arch/arm64/xen/ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) libs-y += $(LIBGCC) -libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ +core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make KBUILD_IMAGE := Image.gz