From patchwork Fri Mar 4 16:06:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 1601220 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=aosc.io header.i=@aosc.io header.a=rsa-sha256 header.s=default header.b=gAPasz+6; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K9CQc2D9yz9sFy for ; Sat, 5 Mar 2022 03:06:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CCD28365D; Fri, 4 Mar 2022 17:06:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=aosc.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=aosc.io header.i=@aosc.io header.b="gAPasz+6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45BB083689; Fri, 4 Mar 2022 17:06:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from relay2.mymailcheap.com (relay2.mymailcheap.com [217.182.66.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 79AC4811E0 for ; Fri, 4 Mar 2022 17:06:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=aosc.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=icenowy@aosc.io Received: from filter2.mymailcheap.com (filter2.mymailcheap.com [91.134.140.82]) by relay2.mymailcheap.com (Postfix) with ESMTPS id 1D3AA401F1; Fri, 4 Mar 2022 17:06:20 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filter2.mymailcheap.com (Postfix) with ESMTP id 1279E2A7E4; Fri, 4 Mar 2022 16:06:20 +0000 (UTC) Received: from filter2.mymailcheap.com ([127.0.0.1]) by localhost (filter2.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6INwB3I3FtZ8; Fri, 4 Mar 2022 16:06:18 +0000 (UTC) Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by filter2.mymailcheap.com (Postfix) with ESMTPS; Fri, 4 Mar 2022 16:06:18 +0000 (UTC) Received: from edelgard.icenowy.info (unknown [59.41.160.159]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail20.mymailcheap.com (Postfix) with ESMTPSA id 1A64F406AD; Fri, 4 Mar 2022 16:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; t=1646409978; bh=0du1H8fVcw/6Hd6Du2BMgX0TilgzWi60t+RRBoBPt48=; h=From:To:Cc:Subject:Date:From; b=gAPasz+6m1DKyXlLYDOqSPGVxEBmh67MEaLc8t/wFPMaP3cfgQAg4XDL/Bp4DskLT LDd8KRy8ua1SB743/vJNWriJDftIatqNfQqVNh99q+Da5veyrs5bcN6Il5AqCh38sS I+11URg9PDwmxRIb/U5CjLGSPw/TeJ83wvE8zIyk= From: Icenowy Zheng To: Jagan Teki , Andre Przywara , Hans de Goede Cc: u-boot@lists.denx.de, linux-sunxi@lists.linux.dev, Icenowy Zheng Subject: [PATCH] sunxi: fix build when CONFIG_UART0_PORT_F is selected Date: Sat, 5 Mar 2022 00:06:01 +0800 Message-Id: <20220304160601.181155-1-icenowy@aosc.io> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 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.5 at phobos.denx.de X-Virus-Status: Clean Currently CONFIG_UART0_PORT_F will forbid the build of sunxi-mmc driver, which leads calls to it in board/sunxi/board.c a undefined reference. Guard that code in #ifndef to fix build. Signed-off-by: Icenowy Zheng --- board/sunxi/board.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 82c52b28f8..8a003d8559 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -539,6 +539,7 @@ int board_mmc_init(struct bd_info *bis) { __maybe_unused struct mmc *mmc0, *mmc1; +#ifndef CONFIG_UART0_PORT_F mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); mmc0 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT); if (!mmc0) @@ -549,6 +550,7 @@ int board_mmc_init(struct bd_info *bis) mmc1 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA); if (!mmc1) return -1; +#endif #endif return 0;