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 X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA3DEC4338F for ; Sun, 8 Aug 2021 18:23:25 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 18FDF60EBB for ; Sun, 8 Aug 2021 18:23:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 18FDF60EBB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F48582D88; Sun, 8 Aug 2021 20:21:51 +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="lpXEF9Vf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7E6A82CE8; Sun, 8 Aug 2021 20:21:29 +0200 (CEST) Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) (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 4D6C582C7F for ; Sun, 8 Aug 2021 20:20:56 +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-oi1-x236.google.com with SMTP id w6so20336376oiv.11 for ; Sun, 08 Aug 2021 11:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oKJNVirPUFd1Jfg5aUMJcNEhnnQ3skPwdmOe4AaQfdM=; b=lpXEF9VfQGjUuERsQFkjCbu0V0MdxnyrW9Y1vqxBkJtwbV5rPlhEcwqVPXhEmXzcqL MhLz7ZzZjNnxuyX11tWnSNkYV0vRkMhRMTSHS9t5WFrssK3no/XkJDimga85TJO1V/fv VvFAa6mBlNbbFR+KVZdD5cOTCxgpLdtPW2DsM= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=oKJNVirPUFd1Jfg5aUMJcNEhnnQ3skPwdmOe4AaQfdM=; b=DK2qSAoN5cFVVI7MPK6qPsZzNTgE0BzMdbHsNm5nqe5qvldagIVl2/lUsiqLQqKI+w 3opo9NuxuoLZaMJixS38hGHd3oHLowMQ1rL1QYO5lugIuhHv0am/Zz1g0zJMQOk3BnTr Ogw2VGuze++2PQcql+bZXBPZRTIh/G9pEKBtBUHVany9O/HQE3vFABu6pLiKUzFSO8yy RedV5xeCMiIqXc7KA0bc6qQ5QBSgIjjef4ju46CLbrND8NGFIrt590drJhViW1sNqE1l M6HEe3hgWJpsQJ448Aaa1BEG8VN/BBSyMiIN8zJdiJJKSKaR74Z1WhAag0ah9sUqxrH+ qmIw== X-Gm-Message-State: AOAM531s2ywk2csDlZ/WpNffNIfYG0WTYF3PAuG6FMgTTmf9W83oMLzf 3i7CtZsNRc1tkBjpG3qcyPSvVbijP0DPLDte X-Google-Smtp-Source: ABdhPJwdBpV3FWpO6IQfR+JZQfOBcP48fpRrcjvpThxFTO02Uep7hkTOaaul1xbfdptrBo6RjzREDw== X-Received: by 2002:aca:3c07:: with SMTP id j7mr2052321oia.8.1628446854712; Sun, 08 Aug 2021 11:20:54 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id bc42sm2257147oob.39.2021.08.08.11.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Aug 2021 11:20:54 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Masahiro Yamada Subject: [PATCH 14/23] Makefile: Move drivers/dma/ into drivers/Makefile Date: Sun, 8 Aug 2021 12:20:22 -0600 Message-Id: <20210808182031.3747270-15-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog In-Reply-To: <20210808182031.3747270-1-sjg@chromium.org> References: <20210808182031.3747270-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean This rule should not be in the top-level Makefile. Move it, making use of the new LEGACY_DMA Kconfig. Signed-off-by: Simon Glass --- Makefile | 1 - drivers/Makefile | 3 ++- drivers/dma/Kconfig | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7fc982158e9..f5b6b493a7f 100644 --- a/Makefile +++ b/Makefile @@ -813,7 +813,6 @@ libs-y += fs/ libs-y += net/ libs-y += disk/ libs-y += drivers/ -libs-y += drivers/dma/ libs-y += drivers/gpio/ libs-y += drivers/net/ libs-y += drivers/net/phy/ diff --git a/drivers/Makefile b/drivers/Makefile index 1bce26877bc..d63cc48f5f4 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -5,6 +5,8 @@ obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/ obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/ obj-$(CONFIG_$(SPL_TPL_)CLK) += clk/ obj-$(CONFIG_$(SPL_TPL_)DM) += core/ +obj-$(CONFIG_$(SPL_TPL_)DMA) += dma/ +obj-$(CONFIG_$(SPL_TPL_)DMA_LEGACY) += dma/ obj-$(CONFIG_$(SPL_TPL_)DFU) += dfu/ obj-$(CONFIG_$(SPL_TPL_)GPIO) += gpio/ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC) += misc/ @@ -48,7 +50,6 @@ obj-$(CONFIG_SPL_POWER) += power/ power/pmic/ obj-$(CONFIG_SPL_POWER) += power/regulator/ obj-$(CONFIG_SPL_POWER_DOMAIN) += power/domain/ obj-$(CONFIG_SPL_DM_RESET) += reset/ -obj-$(CONFIG_SPL_DMA) += dma/ obj-$(CONFIG_SPL_ETH) += net/ obj-$(CONFIG_SPL_ETH) += net/phy/ obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index ff5b834a91e..bbeec794df9 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -56,6 +56,7 @@ config TI_EDMA3 config APBH_DMA bool "Support APBH DMA" depends on MX23 || MX28 || MX6 || MX7 || IMX8 || IMX8M + select DMA_LEGACY help Enable APBH DMA driver. -- 2.32.0.605.g8dce9f2422-goog