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 382ACC433FE for ; Mon, 28 Nov 2022 19:39:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7388485076; Mon, 28 Nov 2022 20:39:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1669664371; bh=lVOQrXIMQvuc+YLiSKDENzkvNxFoUhQQhjSkIgfJKFY=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=dE6rt7yGO4RspNL2YN3okvGSif3Q+o4I3puCiirQ2zAZz43C8ATVH8DGrQ3xkSXEL uw75E6uhzhF6tvAvzsgkaEEchj2l9oQBtigjSP2KixPWWN1GF0bsq1Iit7ZgKqTPVJ hBjRlJMem5tBZAwRaazh8NGwUjXVN0lDO0Q9jOd/Atr1Uk9BlH0eigjSBPXLtkX8Jp TvfAmpxh2i8tW17QqWk9uO5TO7z/Lz8KtXzywlyFeZpc2FdYTDE1LTy2RwnsfkLX2K qGE8AF61DwsK43VpeXyxWHj7v63eC7TUNLjTC6M6n7xaqhMew0jkW3K9IFR+RkLQbb msz6I6RdDPIZg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 198ED84BD8; Mon, 28 Nov 2022 20:39:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1669664369; bh=lVOQrXIMQvuc+YLiSKDENzkvNxFoUhQQhjSkIgfJKFY=; h=From:To:Cc:Subject:Date:From; b=XC69jdHuoyGvOROEzJZN76zOIWdpzX8yBk6iSYeiOK3U1wGxzNfUjgMg+SAHaaL1+ IczYFCi5vjbqLFzFxhbep4WRa3Prz0ec/fmmeeNs+bmMJJut1oOcFBvdIU8smJsUfl ZnclPVskLffou+07S6mDH+4/dcSzs1lYLBYNSTbiuLqovNyoQ05e/mFnUklvZ3l69v NfqWvOHx/VjkHIPr+QwEufa8AeCuvA960GT4Hur7hwQQmqEi808s2u3KpK7YKPETxA i2RxieA+tpN1utaW/omye8ez7p+DzFmpYtsT/mCYV0I9tuvmo40L4eDZAE+UccT2z5 BbFO1R26uniWw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Lukasz Majewski , Patrice Chotard , Patrick Delaunay Subject: [PATCH] dfu: Call backend specific dfu_fill_*() only if enabled Date: Mon, 28 Nov 2022 20:39:17 +0100 Message-Id: <20221128193917.236188-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 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 The dfu_fill_*() functions are available only if the matching backend is enabled. Add missing CONFIG_IS_ENABLED() guard for each backend to prevent build errors, in case such a backend is enabled in U-Boot and not in SPL or vice versa. Signed-off-by: Marek Vasut --- Cc: Lukasz Majewski Cc: Patrice Chotard Cc: Patrick Delaunay --- drivers/dfu/dfu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 516dda61796..f9679d5ee52 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -529,22 +529,22 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt, dfu->free_entity = NULL; /* Specific for mmc device */ - if (strcmp(interface, "mmc") == 0) { + if (CONFIG_IS_ENABLED(DFU_MMC) && !strcmp(interface, "mmc")) { if (dfu_fill_entity_mmc(dfu, devstr, argv, argc)) return -1; - } else if (strcmp(interface, "mtd") == 0) { + } else if (CONFIG_IS_ENABLED(DFU_MTD) && !strcmp(interface, "mtd")) { if (dfu_fill_entity_mtd(dfu, devstr, argv, argc)) return -1; - } else if (strcmp(interface, "nand") == 0) { + } else if (CONFIG_IS_ENABLED(DFU_NAND) && !strcmp(interface, "nand")) { if (dfu_fill_entity_nand(dfu, devstr, argv, argc)) return -1; - } else if (strcmp(interface, "ram") == 0) { + } else if (CONFIG_IS_ENABLED(DFU_RAM) && !strcmp(interface, "ram")) { if (dfu_fill_entity_ram(dfu, devstr, argv, argc)) return -1; - } else if (strcmp(interface, "sf") == 0) { + } else if (CONFIG_IS_ENABLED(DFU_SF) && !strcmp(interface, "sf")) { if (dfu_fill_entity_sf(dfu, devstr, argv, argc)) return -1; - } else if (strcmp(interface, "virt") == 0) { + } else if (CONFIG_IS_ENABLED(DFU_VIRT) && !strcmp(interface, "virt")) { if (dfu_fill_entity_virt(dfu, devstr, argv, argc)) return -1; } else { -- 2.35.1