From patchwork Mon Apr 8 07:54:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161930 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3391652jan; Mon, 8 Apr 2019 00:55:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyNTiamkjf+3C6DYWZqFcsxXtrW6vbInltHALreze48tSvB7lTtMq7RFOF/HFkjSA6ZA6RG X-Received: by 2002:a05:6a00:c1:: with SMTP id e1mr22121285pfj.143.1554710153457; Mon, 08 Apr 2019 00:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554710153; cv=none; d=google.com; s=arc-20160816; b=SZSgQEPFU5G4b9+268JWqFo91TwHGEORpwmOt73kA8tCoE9iBY8kNP+C/uy01Dd8xc HuSGKk9eszIsO0K3pEtfyrdCc6834jFgKvl2TR/2AEVo7jeVlQrIP5g2Yyxa7vQ7U8TM pPErCZe60MCZi17FxbKxek1lF8zxfwt5D6lhg1qnF0zkKLAjGt3DFrf9zS7SwuUxe+zI LWahn3xsr8XdMig3YcJ9KWOSa+Xp/ELnQZ+0gHIaluVB4TbBmAooEd5eaN8xKydpbEIW 5yxFYm98YQiq+2VlQjvFHqBcD3pkEYwWtJrfJPPacldnylL7DusVtRQLJHEnTAT8VFmr E6Bw== 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=2mZMfdiHyWUddajl/MAR4lGHyfV3TtjPDk5s5iFxLc8=; b=n7DO1CUvfEC+1zdPQ7AUeuzfoENQFXTZK6352G0iRWSrNKIeJh66EJAYvVALofXPii iSMymYLiiLgxjXm7m4+A0vShHUQee4FnYZqFyhFteu/rTgaZ5J0Hbb+J8Z7Lavj1fbRS SQy65HmcRJlg2x58XRH2Bqqf+zfCUH7IcK0ttxpNpXHodabyxZapdFgJQyeA0D+btZNF wc4i66YRzHL2wCaV5waBbQu6B0htr2lhLCv7Lp19wLZmp8JJQnO6eg0IFqNi9yI2FUTD a3kABxBZEX59cPlcQ4a+iZyn87Cxosyb++oFbmOvwAzDYWZ0bC1pur2m3nyyMTeBNdIJ 25kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=2ioMrvxv; 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 k72si25899715pgc.362.2019.04.08.00.55.53; Mon, 08 Apr 2019 00:55:53 -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=2ioMrvxv; 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 S1726446AbfDHHzv (ORCPT + 31 others); Mon, 8 Apr 2019 03:55:51 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:33135 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfDHHzv (ORCPT ); Mon, 8 Apr 2019 03:55:51 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x387sSoo029620; Mon, 8 Apr 2019 16:54:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x387sSoo029620 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1554710069; bh=2mZMfdiHyWUddajl/MAR4lGHyfV3TtjPDk5s5iFxLc8=; h=From:To:Cc:Subject:Date:From; b=2ioMrvxv0qwfshvxv0VMy0EZAkgMjxTfThy3Vkn1Ur6+x6P1fRPccAtkTu0EiCS5J t5bIGY7TTgRwVMrKWuBlgzOxX9/N1fX07s84CSS83iAbwv8L9dR8cINdLZFO/TgZB3 +xkTgUanG6PoT5UixHA7fwLCxvc3qvXLvUj5SlGE6IFBPHQaINAlh+pU55h3CrSIUI 8/bco5Pk0/Sz1ULADeeqdcGYIdbYvuNSHliT6ZTjgYBK5VrcKFKzQmHDyMyAecaAET dVJTpD+Z5JgYVB6HqFogSIaw4nDJbC0T203w1kTOmYbmtmD7qP5B/KzBD2tAHLF66D JDbSA1ZwelG/g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ARM: visit mach-* and plat-* directories when cleaning Date: Mon, 8 Apr 2019 16:54:25 +0900 Message-Id: <20190408075427.6052-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 When you run "make clean" for arm, it never visits mach-* or plat-* directories because machine-y and plat-y are just empty. When cleaning, all machine, plat directories are accumulated to machine-, plat-, respectively. So, let's pass them to core- to clean up those directories. Signed-off-by: Masahiro Yamada --- arch/arm/Makefile | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 807a7d06c2a0..b6693a3ddcca 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -293,6 +293,10 @@ core-y += arch/arm/crypto/ core-y += arch/arm/firmware/ core-y += $(machdirs) $(platdirs) +# For cleaning +core- += $(patsubst %,arch/arm/mach-%/, $(machine-)) +core- += $(patsubst %,arch/arm/plat-%/, $(plat-)) + drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ libs-y := arch/arm/lib/ $(libs-y) From patchwork Mon Apr 8 07:54:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161932 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3391730jan; Mon, 8 Apr 2019 00:56:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqx6FzqiPjKzZwjrKqvGOBDrP8WyO0BKgkGbnn6NkFKtF5nkm6TmJobVppSbj65bB37Jo4Qa X-Received: by 2002:a63:8848:: with SMTP id l69mr22620538pgd.137.1554710162588; Mon, 08 Apr 2019 00:56:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554710162; cv=none; d=google.com; s=arc-20160816; b=NGXaQ9OGcWqTP0IbaH6d95PxjChPmgTVlvH2U+I69T3zLDo+pEaqmJe/gBjjYad+wC Abyo4sUp9sM3DUERoLU9JeBYla+zwlFFEEciy7MarodI8Balv4DunhBl9qKQB+hcqwad 6hw/g5pCU1jvIQuzq2tVXkptwYNIlJxLCHazh0nOF63LwujV4hXIuXNOjqIpvgLzlktb 61LzgasTs0YW2A8vmK1CVu0rxTyEGHQJxI8LPihkSup4gAfSOEX4r+Si7pkILMf7wMJP OIscVXUff9HUmK5hNv12tx6UyHSbq90xfLOYnBPObrTn7RbFwY61pReh94+K7l0J0x1U 0OSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=J+Os6G/U5M9lW5V8kWbPPhrXmHnKe19y0jvJ6jloN00=; b=RRGZXB77t9rctGPetB3sKSx4g2K7OnA1jRiS0mzuqtd3laDP9FcmZKpS1Cfd3jMARQ 1F7d6qLMcW2iFwiHxnYjDcRjlqM70OLcYXKd/Jb2jYZE8X7GJdnc9FAIR6uY4nxFWsfC A7IJFR//7yEtAD38wSvDqzcCgnlTP3oJNG6V4y+jP5b3gEUfskViqgP5CLbgEeWp2Mce l+MxQGnrbneXa5mRNQOIU+RyYDQph++ARFlvp/KcFqelRn2EkTbYpmgj1S7oPhMzyxKX 6bZVKWNuV4C+zImBVFS4CNDenU6jGTSf/9KtFvmWpPuxBcBPzyZXAx+RXMPMLWK53iA7 2HlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rT06vdNy; 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 b10si25527923plr.131.2019.04.08.00.56.02; Mon, 08 Apr 2019 00:56:02 -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=rT06vdNy; 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 S1726532AbfDHH4A (ORCPT + 31 others); Mon, 8 Apr 2019 03:56:00 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:33396 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfDHH4A (ORCPT ); Mon, 8 Apr 2019 03:56:00 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x387sSop029620; Mon, 8 Apr 2019 16:54:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x387sSop029620 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1554710070; bh=J+Os6G/U5M9lW5V8kWbPPhrXmHnKe19y0jvJ6jloN00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rT06vdNyrdn7znL3cXw6x0XFCnUgkyNZWQ06k0sstLrLVDWWL3BGFb3r/MpMpO/z2 VUer1uE0G1UwVanCyjainepmkd0jA3VGVx6NDjVmO2965ywWxxnS+N+t+VkHMF59nx PK5c5hlcnIzqHIosyP+utGyf21hJe769h6OGI4g/Nw6J2fQUzEajiDPuT4ksGSp63Q uoeAIOXi/mlsnbe6at4sMAGjE4sK+CvWJGuYk8HHUhh0fMWfMVs74YgFptwOUuVLg5 MQb8d23o27qtGmIFc+t3aLC2DaMHIH92uOAHCErNx9RBBNwwYUawsJbS7qtAQGFUn8 BupfC2daeXg+w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Ludovic Desroches , Alexandre Belloni , Nicolas Ferre , Russell King Subject: [PATCH 2/3] ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Date: Mon, 8 Apr 2019 16:54:26 +0900 Message-Id: <20190408075427.6052-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408075427.6052-1-yamada.masahiro@socionext.com> References: <20190408075427.6052-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org is only generated and included by arch/arm/mach-at91/, so it does not need to reside in the globally visible include/generated/. I moved and renamed it to arch/arm/mach-at91/pm_data-offsets.h since the prefix 'at91_' is just redundant in mach-at91/. Signed-off-by: Masahiro Yamada --- Can this be applied to ARM-SOC tree in a series? (with Ack from the platform sub-maintainer.) at91_pm_data-offsets.h header does not need to reside in include/generated/, but you may ask "Why must it get out of include/generated/?" My main motivation is to avoid a race condition in the currently proposed patch: https://lore.kernel.org/patchwork/patch/1052763/ This patch tries to embed some build artifacts into the kernel. If arch/arm/mach-at91/ and kernel/ are built at the same time, it may embed a truncated file. arch/arm/mach-at91/.gitignore | 1 + arch/arm/mach-at91/Makefile | 5 +++-- arch/arm/mach-at91/pm_suspend.S | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-at91/.gitignore -- 2.17.1 Acked-by: Alexandre Belloni diff --git a/arch/arm/mach-at91/.gitignore b/arch/arm/mach-at91/.gitignore new file mode 100644 index 000000000000..2ecd6f51c8a9 --- /dev/null +++ b/arch/arm/mach-at91/.gitignore @@ -0,0 +1 @@ +pm_data-offsets.h diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 31b61f0e1c07..de64301dcff2 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -19,9 +19,10 @@ ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif -include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE +$(obj)/pm_data-offsets.h: $(obj)/pm_data-offsets.s FORCE $(call filechk,offsets,__PM_DATA_OFFSETS_H__) -arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h +$(obj)/pm_suspend.o: $(obj)/pm_data-offsets.h targets += pm_data-offsets.s +clean-files += pm_data-offsets.h diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index bfe1c4d06901..a31c1b20f3fa 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -14,7 +14,7 @@ #include #include #include "pm.h" -#include "generated/at91_pm_data-offsets.h" +#include "pm_data-offsets.h" #define SRAMC_SELF_FRESH_ACTIVE 0x01 #define SRAMC_SELF_FRESH_EXIT 0x00 From patchwork Mon Apr 8 07:54:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161931 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3391686jan; Mon, 8 Apr 2019 00:55:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTGKCIdd5u/T4MtPZpwEV8uNgAeg+Hkdk5OP4sMcTb6yziNREL1fhiKuNt0a5Ardnm7bSM X-Received: by 2002:a17:902:7b93:: with SMTP id w19mr28878333pll.137.1554710157940; Mon, 08 Apr 2019 00:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554710157; cv=none; d=google.com; s=arc-20160816; b=WY0mzy68sGuHwb+Q1AknWk5mNAgxgjeBa7oj7saQfElq99od1xh80QvgXbbjUj2Avr iZLEmgb9tplu37VC1S/RVDBcR1EKvEfMUsf/bzgW7MXk1j/9yz4us49c8LkqYWV1uPUl hbYXS1D5YXxaXZY/OAFED8+BQ8u0NPJryVU0yfQ0kIpcI7Gy3/gJsl1+AYmFFl9y5nfg UhpJhUaWZITvVlz728P+80u+rjBpZgqpO7SFaq9YnJgWlBNIRGb1GacJlJu/qDqrT6V3 cdvgA/mh+RssxPeaYk+0Pm4Oxl3s63BQrHS/oDZwfxvOMvTR0irNw/jd3aT2yjXDTtdS eDDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=21BpN95DMwJTYOiDMBwmLoA8rj/R3QI1Ndwk58+low8=; b=VnakJUXVWaxKIzHjqTsKYTdyUE2NJ2Oyl1TEn1uotLEN8V/0yCqplxp2xaSO6ynWFi npchWRf8R9cb0/LT5QNudRjgzQzpFkOGsivhnt04aaHVIIvYxXIKLHnP6qo3XbaFVRqe i9kEU6HYo8OnL/C5Qrg+7DkucWAA9KrqhYHucsW/Sf/TJsJPdDZseP+NWqRSE+ZeyAkT lqG9mlzmjRLzrnhB4tvaRde7vSNwwguXevrFYFWRb37Cb8dWIPONhxO492tsJlzBRl8r 9S0KSGo7woLnOCwKHB2BLzSC49CnCR4N9vQPZ5JeeaCoFfbCynebNlxKDDzKLNW2wyx3 jSTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=iP1qjJVT; 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 k72si25899715pgc.362.2019.04.08.00.55.57; Mon, 08 Apr 2019 00:55:57 -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=iP1qjJVT; 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 S1726504AbfDHHz4 (ORCPT + 31 others); Mon, 8 Apr 2019 03:55:56 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:33256 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfDHHzz (ORCPT ); Mon, 8 Apr 2019 03:55:55 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x387sSoq029620; Mon, 8 Apr 2019 16:54:30 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x387sSoq029620 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1554710071; bh=21BpN95DMwJTYOiDMBwmLoA8rj/R3QI1Ndwk58+low8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iP1qjJVTbhp99sVhWetMewoMVd5Wf/JSh4CPKsNRA6MzjgJydWXchsXVlIOq/rgth 5Vb8UPC9wMlcHDADTD1qkR4BtJrqZW6Mvy5PeU3bwteZogrzHkmPlrL85sLhkzu2Yk rEEpDMnZFFbUVxW8DRxiyd5EL+E368lve/lPXNea0QVEqLY49lX0DIwEN+ZvHGmzYt fCMPmxErFUTA+ZgmduGYJiMEibNudAl/kHVcEA0fmiXgi9hExb3ibQJEYk7PG7XcWE ZwLW0h8lueYNwsN/D1DYDL4GEnr1SZHpJTuqa0CWntnuTQJ/py3RldXarOyfCxYDd5 RlxPfnY4BWYDA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , Tony Lindgren , linux-omap@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: omap2: move platform-specific asm-offset.h to arch/arm/mach-omap2 Date: Mon, 8 Apr 2019 16:54:27 +0900 Message-Id: <20190408075427.6052-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408075427.6052-1-yamada.masahiro@socionext.com> References: <20190408075427.6052-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org is only generated and included by arch/arm/mach-omap2/, so it does not need to reside in the globally visible include/generated/. I moved and renamed it to arch/arm/mach-omap2/pm-asm-offsets.h since the prefix 'omap2-' is just redundant in mach-omap2/. Signed-off-by: Masahiro Yamada --- Can this be applied to ARM-SOC tree in a series? (with Ack from the platform sub-maintainer.) ti-pm-asm-offsets.h does not need to reside in include/generated/, but you may ask "Why must it get out of include/generated/?" My main motivation is to avoid a race condition in the currently proposed patch: https://lore.kernel.org/patchwork/patch/1052763/ This patch tries to embed some build artifacts into the kernel. If arch/arm/mach-omap2/ and kernel/ are built at the same time, it may embed a truncated file. arch/arm/mach-omap2/.gitignore | 1 + arch/arm/mach-omap2/Makefile | 5 +++-- arch/arm/mach-omap2/sleep33xx.S | 2 +- arch/arm/mach-omap2/sleep43xx.S | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-omap2/.gitignore -- 2.17.1 diff --git a/arch/arm/mach-omap2/.gitignore b/arch/arm/mach-omap2/.gitignore new file mode 100644 index 000000000000..79a8d6ea7152 --- /dev/null +++ b/arch/arm/mach-omap2/.gitignore @@ -0,0 +1 @@ +pm-asm-offsets.h diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 85d1b13c9215..26baeb6477af 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -236,9 +236,10 @@ obj-y += omap_phy_internal.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o -include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE +$(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__) -$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h +$(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h targets += pm-asm-offsets.s +clean-files += pm-asm-offsets.h diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S index 47a816468cdb..a003769121aa 100644 --- a/arch/arm/mach-omap2/sleep33xx.S +++ b/arch/arm/mach-omap2/sleep33xx.S @@ -6,7 +6,6 @@ * Dave Gerlach, Vaibhav Bedia */ -#include #include #include #include @@ -15,6 +14,7 @@ #include "iomap.h" #include "cm33xx.h" +#include "pm-asm-offsets.h" #define AM33XX_CM_CLKCTRL_MODULESTATE_DISABLED 0x00030000 #define AM33XX_CM_CLKCTRL_MODULEMODE_DISABLE 0x0003 diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S index 5b9343b58fc7..aa288f361c5e 100644 --- a/arch/arm/mach-omap2/sleep43xx.S +++ b/arch/arm/mach-omap2/sleep43xx.S @@ -6,7 +6,6 @@ * Dave Gerlach, Vaibhav Bedia */ -#include #include #include #include @@ -19,6 +18,7 @@ #include "iomap.h" #include "omap-secure.h" #include "omap44xx.h" +#include "pm-asm-offsets.h" #include "prm33xx.h" #include "prcm43xx.h"