From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 255EBC54EE9 for ; Sun, 25 Sep 2022 15:12:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 622ED84B0C; Sun, 25 Sep 2022 17:12:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YzOfTMMN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF6A184C46; Sun, 25 Sep 2022 17:03:35 +0200 (CEST) Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9BD4184BF3 for ; Sun, 25 Sep 2022 17:03:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id g6so2419079ild.6 for ; Sun, 25 Sep 2022 08:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=9EUepk93sRHDc7FYjDBmikWn32laQXDhhhwWdq4FCd4=; b=YzOfTMMNBN8i5kst7EVYgcvTUZ8eHxCQ8HsAUbgjXjTGsV54zEXpLsdhV1NsI6kFlA lvh3JJA1kC/uKiBQtr9wwdPagnIf8JWacj9UZCc9b8JZQAW4G9LBJYanrYjBHm07AqtV neL8NhEbm5TJeMqqpzSm/wfyDUzzGbtBT2sWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=9EUepk93sRHDc7FYjDBmikWn32laQXDhhhwWdq4FCd4=; b=N9U17bIAjkUToRBLpJEf8GqKGcNOLvaq0CPWu4fMmGOFbU56afWsX7uLeG6jwX23zl MJ2Y0eVgMDzPBCwL03TMV+AxgVfZhPnzZPEOM1NqTKXXBxXTXwO+fRgQsInqm1zO5rL7 z2grJ+JV/1us8xxM1q56mhNSJXX2fD9utTgVmgeGOpvwW4L2ImjHIPnViYlJIBq5php/ xFz8nO3Gn950naAmCsIh4AxX87UDbxWJjG3My1JkuBCAKyfcf2qXvNdVNLsprm0azxwn /LPjrpjiAg2RlxoV0d1jdMMI4jQLEk6Isro59VbRCBSyU0WNXAZGAmmlUEi20XPXf79R MbVw== X-Gm-Message-State: ACrzQf13qgzzV9QE6ny4QG4jJYDStLjRrAHkpv1fh9D4qVwNcuLFrtq5 LMLNPbQ7Lj1ff0wC5nebYh3mXOySfRpxtw== X-Google-Smtp-Source: AMsMyM7rEiXvxf3lM1iiCs+UqJjoR+DQKv1OIuoRXvvgZF0rDUivxE0VceN71ogBBTcjZxrTBdSBJg== X-Received: by 2002:a05:6e02:b29:b0:2f8:4ead:34dd with SMTP id e9-20020a056e020b2900b002f84ead34ddmr1281436ilu.298.1664118206453; Sun, 25 Sep 2022 08:03:26 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id u19-20020a926013000000b002f19d9838c6sm5360578ilb.25.2022.09.25.08.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 08:03:26 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrew Scull , Heinrich Schuchardt , Jaehoon Chung , Marek Vasut , Mark Kettenis , Pavel Herrmann , Peng Fan , Ye Li Subject: [PATCH 16/45] dm: blk: mmc: Tidy up some Makefile rules for SPL Date: Sun, 25 Sep 2022 09:02:19 -0600 Message-Id: <20220925150248.2524421-17-sjg@chromium.org> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220925150248.2524421-1-sjg@chromium.org> References: <20220925150248.2524421-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Use the correct SPL_TPL_ variable so that these features can be enabled in TPL and VPL as needed. Note that the default for TPL is y since some boards boot via MMC, so this addds 137 bytes on rockchip firefly-rk3288 for example. Other boards which enable BLK in TPL are: chromebook_coral chromebook_samus_tpl sandbox_vpl Signed-off-by: Simon Glass --- drivers/Makefile | 1 + drivers/block/Makefile | 2 +- drivers/mmc/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 9d9f69a3c9a..41cef4178dd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_$(SPL_TPL_)BLK) += block/ obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/ obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/ diff --git a/drivers/block/Makefile b/drivers/block/Makefile index f48d3e12140..19d9317c825 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o +obj-$(CONFIG_$(SPL_TPL_)BLK) += blk-uclass.o ifndef CONFIG_$(SPL_)BLK obj-$(CONFIG_SPL_LEGACY_BLOCK) += blk_legacy.o diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 5d5104bbf1d..3a664c2ebbb 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -10,7 +10,7 @@ ifdef CONFIG_$(SPL_TPL_)DM_MMC obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += mmc_bootdev.o endif -obj-$(CONFIG_$(SPL_)MMC_WRITE) += mmc_write.o +obj-$(CONFIG_$(SPL_TPL_)MMC_WRITE) += mmc_write.o obj-$(CONFIG_MMC_PWRSEQ) += mmc-pwrseq.o obj-$(CONFIG_MMC_SDHCI_ADMA_HELPERS) += sdhci-adma.o -- 2.37.3.998.g577e59143f-goog