From patchwork Fri Jan 11 09:52:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10757595 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 77FED6C5 for ; Fri, 11 Jan 2019 09:52:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68F2229AFF for ; Fri, 11 Jan 2019 09:52:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66A5329AF6; Fri, 11 Jan 2019 09:52:29 +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 4A27229AF6 for ; Fri, 11 Jan 2019 09:52:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728616AbfAKJw1 (ORCPT ); Fri, 11 Jan 2019 04:52:27 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:40670 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728175AbfAKJw1 (ORCPT ); Fri, 11 Jan 2019 04:52:27 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x0B9q8sf019557; Fri, 11 Jan 2019 18:52:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x0B9q8sf019557 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1547200328; bh=hmjRxVLse3KfB65gtEHQhiYrire4aNjXDv2r+uSNxeM=; h=From:To:Cc:Subject:Date:From; b=M658JAGb6bGNWqWs0/9dCqILZx0D6Ym/RPDBzEjnuJoA5Q2EWSLwN9Yq1Am7EZjtj RYPQRc3wqk8I0GdFRvbs7GFrn01WdqDiv42FM2yYE26yxacBWRkkQORJ1HkGQrbgQw V74DXKYHIGVnhV07wGGUFetpfLb1lABcO021HPqLUm/l7di7L8VDNlaguh7Uakc2ck JzjxpSeg1pJaN81jjiriNKHbphLsQUVnjoNteMTxhYDOIdAW8FhOcHR4A81v0CYGab DzN0RMVVuDe9u6nYU8oZkTOPU7Klys7HYUpPVMhRsbaVAAzHo84C4aZ6PeypbZpPlo AfM35uxYZya/g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Luis Chamberlain Cc: Masahiro Yamada , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Marek , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH] firmware_loader: move firmware/ to drivers/base/firmware_loader/builtin/ Date: Fri, 11 Jan 2019 18:52:00 +0900 Message-Id: <1547200321-17120-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 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 Currently, the 'firmware' directory only contains a single Makefile to embed extra firmware into the kernel. Move it to the more relevant place. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- drivers/base/firmware_loader/Makefile | 2 ++ {firmware => drivers/base/firmware_loader/builtin}/.gitignore | 0 {firmware => drivers/base/firmware_loader/builtin}/Makefile | 0 4 files changed, 3 insertions(+), 1 deletion(-) rename {firmware => drivers/base/firmware_loader/builtin}/.gitignore (100%) rename {firmware => drivers/base/firmware_loader/builtin}/Makefile (100%) diff --git a/Makefile b/Makefile index 8c55b64..1625c99 100644 --- a/Makefile +++ b/Makefile @@ -583,7 +583,7 @@ export KBUILD_MODULES KBUILD_BUILTIN ifeq ($(KBUILD_EXTMOD),) # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -drivers-y := drivers/ sound/ firmware/ +drivers-y := drivers/ sound/ net-y := net/ libs-y := lib/ core-y := usr/ diff --git a/drivers/base/firmware_loader/Makefile b/drivers/base/firmware_loader/Makefile index 5c7f422..0b2dfa6 100644 --- a/drivers/base/firmware_loader/Makefile +++ b/drivers/base/firmware_loader/Makefile @@ -5,3 +5,5 @@ obj-$(CONFIG_FW_LOADER_USER_HELPER) += fallback_table.o obj-$(CONFIG_FW_LOADER) += firmware_class.o firmware_class-objs := main.o firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o + +obj-y += builtin/ diff --git a/firmware/.gitignore b/drivers/base/firmware_loader/builtin/.gitignore similarity index 100% rename from firmware/.gitignore rename to drivers/base/firmware_loader/builtin/.gitignore diff --git a/firmware/Makefile b/drivers/base/firmware_loader/builtin/Makefile similarity index 100% rename from firmware/Makefile rename to drivers/base/firmware_loader/builtin/Makefile