From patchwork Sat Mar 30 12:04:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10878449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB59A186D for ; Sat, 30 Mar 2019 12:05:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B237628A54 for ; Sat, 30 Mar 2019 12:05:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A183928923; Sat, 30 Mar 2019 12:05:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3846B28923 for ; Sat, 30 Mar 2019 12:05:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730535AbfC3MFC (ORCPT ); Sat, 30 Mar 2019 08:05:02 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:36854 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730384AbfC3MFB (ORCPT ); Sat, 30 Mar 2019 08:05:01 -0400 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-10.nifty.com with ESMTP id x2UC4MsS021262; Sat, 30 Mar 2019 21:04:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x2UC4MsS021262 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1553947468; bh=AlH6VdZl5Lh+GjcQTaXSUl8konDDboFGt2lJg/++ZRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=br2GMjVaNqFkHG72EDZGUYosdysgF6ehYuIhTDkZb08CBOezfLr8QVtg5MJ8wzGw6 xCZ4K0iwQK8+oUrxBEmj2HF/YFAXCbDfIQxRUk9St0+4nnEnE9f0j/eBWKytVeBQ3q zac5e08deDDUmNpnIkmWLpNcA+bjUOb4d+l8RuO7Meg/9h7LFzExpv/GwhO14JoMdP d1vFyrjaLJC6wNRPRmKjycbL1ptngSfWviAuXO+xU8nRMwXXl+L2A0QvpG3ZiQJ+cU UxQv69/zivJAVCT9lmZxhUeRhRwAT461Ba2QlkQEbYCDKTXeJhwn0WWijV4CcQW/xM Ga1NzJwt4apVg== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Naga Sureshkumar Relli , Michal Simek , Thierry Reding , Linus Walleij , linux-kernel@vger.kernel.org, Dmitry Osipenko Subject: [PATCH 6/6] memory: squash drivers/memory/Makefile.asm-offsets Date: Sat, 30 Mar 2019 21:04:18 +0900 Message-Id: <1553947458-8311-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553947458-8311-1-git-send-email-yamada.masahiro@socionext.com> References: <1553947458-8311-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP drivers/memory/Makefile.asm-offsets is small enough, and included from a single place. Squash it into drivers/memory/Makefile. Signed-off-by: Masahiro Yamada --- drivers/memory/Makefile | 5 ++++- drivers/memory/Makefile.asm-offsets | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 drivers/memory/Makefile.asm-offsets diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 90161de..aaf6771 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -28,6 +28,9 @@ ti-emif-sram-objs := ti-emif-pm.o ti-emif-sram-pm.o AFLAGS_ti-emif-sram-pm.o :=-Wa,-march=armv7-a -include drivers/memory/Makefile.asm-offsets +include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE + $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) + +targets += emif-asm-offsets.s drivers/memory/ti-emif-sram-pm.o: include/generated/ti-emif-asm-offsets.h diff --git a/drivers/memory/Makefile.asm-offsets b/drivers/memory/Makefile.asm-offsets deleted file mode 100644 index 0447e17..0000000 --- a/drivers/memory/Makefile.asm-offsets +++ /dev/null @@ -1,4 +0,0 @@ -include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE - $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) - -targets += emif-asm-offsets.s