From patchwork Thu Jul 11 03:07:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168810 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10765597ilk; Wed, 10 Jul 2019 20:08:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+s4w1zFEeGwrEdSCmjjmVDazVirYknmWpgHkv6NhvbV414+eUxy7H3ZscXpvIYkflZ0z2 X-Received: by 2002:a17:90a:2706:: with SMTP id o6mr2108391pje.62.1562814509131; Wed, 10 Jul 2019 20:08:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562814509; cv=none; d=google.com; s=arc-20160816; b=IDyL8oo6mywKWz3vncVLOteya+jzeQsASRxgC2Vs5ckNxFpt8Nh7FlzfDqPI58jcSl vYK7J1phcGI2ju1TSy9vAUrdP8vSxopVnRLnHt/0MtVRkImKxD+bzl7P0w6TSJ9G7KTb tBvPdcUS7XdTLrT1KcIK8pn3/JcgphGi7v096cbHXM3loh1lnkVT/Y6kDYVre2QXiNpB OMvBBRbNllQVaTj0o/kotUSaFz32bK2YXllCqiJ8x5t4tmQsVBdve2Kv1wMCIOe/EAD+ +VI4mUrVmccC4yNpDKOnhgO8gGXBtuSvVaxGNhAseH5jVEt8QZ8e5N0CLowcSYDSNdeC +73A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=wDYz/yHhx6nItjKqfKQXfYFVLdaXf3nRB8CNeDF+UBU=; b=wHml7h8MCD9MyzS0N6oWhnnQzU8nD2s5UL21vcrm5HrchyCHXCucxK0yhQtxfVQT55 r5LoizmbCJ85O/+BTBaU0yIyZiSFveYwbiM2VgkxPv0pJp916lXatBQs4O7EVc2P0woo nJ3Mt/w4tYJHTkI9sE5FgFTgKYZgRChgrbmJU4TCuogbKiG+kbZeqLW7CVNElUY5EXVX r8MZyigloOX2TNZPFc1ycYNn+0p/eg31xtY/YzDU0cH9SvaKRyHc4n0gTyK9MDTh8JTR mSPLMA57M7D2JnNNgb17mKpAivEyDkjzlp3P3NHw8Ro2WILkWxbyqaTZcMGhPvXaQtuF WpTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eD7rAs8E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t19si3741624pjr.68.2019.07.10.20.08.28; Wed, 10 Jul 2019 20:08:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eD7rAs8E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727906AbfGKDIZ (ORCPT + 29 others); Wed, 10 Jul 2019 23:08:25 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:48355 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbfGKDIZ (ORCPT ); Wed, 10 Jul 2019 23:08:25 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x6B37G9W027198; Thu, 11 Jul 2019 12:07:16 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x6B37G9W027198 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562814437; bh=wDYz/yHhx6nItjKqfKQXfYFVLdaXf3nRB8CNeDF+UBU=; h=From:To:Cc:Subject:Date:From; b=eD7rAs8EKGC5P51XykS2mWVAA94CATwbNmy2EGX9wxCsfnZ2N+nX82uNV1oXLNDRJ hmE5opz4u7WIYBodpMeAswa/Tbt5fDbu1a1ohzDOay944iuA6+8yap8X90hT59kXZc Fh2HLRrFOOjtR/N5WRWq/i/YKNJ2av8OqB1bA/riW2PhZjb+VbZdwhDbQgCnIFHJmQ va6W9Uoebfkr/qqXPb9dDqk9/PPUupQhM035ktw9Bb1RJxhO8zSDYd4+/XBArLmrar 9zlpsgXZKC3NoMiOz3oKNCT/pQEX37SA1g+4IPZdJQcF6ykrijwfaDw415a1DZD4AA yzRDl1ctAij2A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, Russell King , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: fix O= building with CONFIG_FPE_FASTFPE Date: Thu, 11 Jul 2019 12:07:12 +0900 Message-Id: <20190711030713.4447-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To use Fastfpe, a user is supposed to enable CONFIG_FPE_FASTFPE and put downstream source files into arch/arm/fastfpe/. It is not working for O= build because $(wildcard arch/arm/fastfpe) checks if it exists in $(objtree), not in $(srctree). Add the $(srctree)/ prefix to fix it. While I was here, I slightly refactored the code. Signed-off-by: Masahiro Yamada --- KernelVersion: 5.2 arch/arm/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f863c6935d0e..792f7fa16a24 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -271,14 +271,9 @@ endif export TEXT_OFFSET GZFLAGS MMUEXT -# Do we have FASTFPE? -FASTFPE :=arch/arm/fastfpe -ifeq ($(FASTFPE),$(wildcard $(FASTFPE))) -FASTFPE_OBJ :=$(FASTFPE)/ -endif - core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ -core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) +# Put arch/arm/fastfpe/ to use this. +core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/)) core-$(CONFIG_VFP) += arch/arm/vfp/ core-$(CONFIG_XEN) += arch/arm/xen/ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/