From patchwork Thu Mar 30 15:36:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 96321 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp298995qgd; Thu, 30 Mar 2017 08:44:01 -0700 (PDT) X-Received: by 10.99.155.17 with SMTP id r17mr316457pgd.193.1490888640950; Thu, 30 Mar 2017 08:44:00 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [65.50.211.133]) by mx.google.com with ESMTPS id x190si2502190pfb.70.2017.03.30.08.44.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 08:44:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 65.50.211.133 as permitted sender) client-ip=65.50.211.133; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 65.50.211.133 as permitted sender) smtp.mailfrom=linux-mtd-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=lk+idUyXawfWS7YgM5ShepAufdvqM9XptrZXHobpqoY=; b=hfd 5LkiGDsOrSo6EYKATYYP8b/3NHbe7Xhhg1GQxOREOU5aPq1T4WyDlCu6ADjEZi36lXhJE/Mg8jY6o fQm1Pcw9aoDoWBwb2NMWzZ0SUie/CxN2o84R2HN1KQW7KWTYP4xHz69ruE25YPy12C3rZsAH+02GS CnQ1XHwmCs2obJAkSCla5BQ4cpXPOGqE1HFGEB6T0kswBJz7gSB/A1F6z802/e8wc7hpwypzONERW y90DXUsvG6onLTFfrPqfVtw44LdRxBKIS+JpJmuIpHbsZtmfY/mnBHc9Q/KkKotts9sR+PwboMHKI lWDggH36fQru2uGCYNc8u22w0kMqXLw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctcEw-0004fL-GO; Thu, 30 Mar 2017 15:43:58 +0000 Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ctcEt-0004dO-9E for linux-mtd@lists.infradead.org; Thu, 30 Mar 2017 15:43:57 +0000 Received: by mail-lf0-x22f.google.com with SMTP id j90so30113329lfk.2 for ; Thu, 30 Mar 2017 08:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=yH+SwSwXOPs08Erpv+lRC3rV5TWrGUwFKvt+PtlPTdA=; b=Ox6y23Hde4Ef/karTdx9xl+awXWch30+/jK94nLTLSTuACD+wumwwy66oFoj0VFo3K aRo1B80Pgw9OQPIkbDL3HSvLpksJB02NScITQbKE8gnFAPTh0OKjWn1G/ncBoMppUz+N LYGvHoY4Ee9yatq3LMwkrnZ6QfcDcs2KkK/dg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yH+SwSwXOPs08Erpv+lRC3rV5TWrGUwFKvt+PtlPTdA=; b=FCel5YMB+xa+CTdJYJ1E/FxboPkNKkZ392N8u5mGPJ+euGcb1dOflcG4F9TVHZTpGX f7m32fCdlWk2USgJ7WbOozvqa1fpDyPS9eC9m7Pu/OaJffjvlsVlcIc83Wx5CQILDgUA E6ya5n+ayEjNIEMqRQiZDthqdin14w6BSY80mHZYl5F5obfl2hpqQG/a5PiodNzWjoyj G8rpLjBzZhkl054vRN/GDWdT8vi/FveozDniYvqRXOXrG+KDpCVT5NpPIzGKKr6x5WJp 7j1EIZVlX/H3HLJWx6pKKi4V74xba9LAa6z//ifBVG7/XwMyDV4Eb3V2fmMDg3b5ULzM ODIg== X-Gm-Message-State: AFeK/H3CG+1n4RO2dCaWAX6SV0H+hMzv3fcTcq5uF/JLu7Iy/T/xBAJdYjK2HHemqjlSI+B7 X-Received: by 10.46.76.9 with SMTP id z9mr116222lja.135.1490888211708; Thu, 30 Mar 2017 08:36:51 -0700 (PDT) Received: from localhost.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id i24sm430924lfk.50.2017.03.30.08.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 08:36:50 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , linux-mtd@lists.infradead.org Subject: [PATCH v3] mtd: physmap_of: really fix the physmap add-ons Date: Thu, 30 Mar 2017 17:36:39 +0200 Message-Id: <20170330153639.26819-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170330_084355_517870_A4EEFD56 X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:22f listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org The current way of building the of_physmap add-ons result in just the add-on being in the object code, and not the actual core implementation and regress the Gemini and Versatile. Bake the physmap_of.o object by baking physmap_of_core.o and adding the Versatile and/or Gemini add-ons to the final object. Rename the source file physmap_of_core.c to get the desired build components. Suggested-by: Boris Brezillon Fixes: 4f04f68e1598 ("mtd: physmap_of: fixup gemini/versatile dependencies") Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Build and bake the final object in an elegant way suggested by Boris. --- drivers/mtd/maps/Makefile | 10 ++++------ drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} | 0 2 files changed, 4 insertions(+), 6 deletions(-) rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (100%) -- 2.9.3 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ Acked-by: Boris Brezillon diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index aef1846b4de2..5a09a72ab112 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -17,12 +17,10 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o obj-$(CONFIG_MTD_PHYSMAP) += physmap.o -ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE -physmap_of-objs += physmap_of_versatile.o -endif -ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI -physmap_of-objs += physmap_of_gemini.o -endif +physmap_of-objs-y += physmap_of_core.o +physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o +physmap_of-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o +physmap_of-objs := $(physmap_of-objs-y) obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o obj-$(CONFIG_MTD_PISMO) += pismo.o obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of_core.c similarity index 100% rename from drivers/mtd/maps/physmap_of.c rename to drivers/mtd/maps/physmap_of_core.c