From patchwork Sun Jul 25 23:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifan Gu X-Patchwork-Id: 1509676 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: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 ozlabs.org (Postfix) with ESMTPS id 4GXzxQ4MXNz9sRK for ; Mon, 26 Jul 2021 09:37:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4102E832CA; Mon, 26 Jul 2021 01:36:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=yifangu.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 736CE8323A; Mon, 26 Jul 2021 01:17:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 4388E8324B for ; Mon, 26 Jul 2021 01:16:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=yifangu.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gyf304@gmail.com Received: by mail-qk1-f173.google.com with SMTP id c9so3435158qkc.13 for ; Sun, 25 Jul 2021 16:16:50 -0700 (PDT) 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=x0b7iXgcn1PGtIaYrMSE5pBVavCR1JSmqO+gmXEj598=; b=RU2wnEaeTJnZE64YixMkxrtPH/m9020ge8sdojmqKvcnY53VMwnVbW2Jw7UnsLICxx 7SXlZwfzqfcrxrY16bFUcydJmrSmlkPagr+kt9Y0zOfVPpbV9m0/G4zRvA+RPxCSzhjo DHxpzADFErDhq7ECvIBrmn0Uo8Q8NEMfDTMsAy3BxyNnNtBKWTA/Hb5hlyWQfWqllOoN hc841poXTxhh1PHystQzzWelYc4c582hOeIz8Jl6Q3Ea+JL3lfIBHIcPtlCRo1sARlVr 8NwHA912ezHvabycScqXMsoQQFm4pZGFJ/wmernhaCQBGcCR99yHLnkR0AWSrltLc8xB EDzA== X-Gm-Message-State: AOAM530X9/l1J3zkLNUAS20cx765JXg+W9OUhsPe5RRIPdGw1KSpXfQy 12I21HY1G91qj5Qy3O0T48lTB/pOk6iJTTrN X-Google-Smtp-Source: ABdhPJwQcUfy5pkhxlquMH3BU+b1uObnTRINbveAy+mQox6dUJqDS1d56bKCfZO/ZGvNMq6TM94pmg== X-Received: by 2002:a05:620a:4d0:: with SMTP id 16mr15291540qks.430.1627255008919; Sun, 25 Jul 2021 16:16:48 -0700 (PDT) Received: from yifangu-Virtual-Machine.mshome.net (pool-100-6-159-43.pitbpa.fios.verizon.net. [100.6.159.43]) by smtp.gmail.com with ESMTPSA id u184sm17754694qkd.53.2021.07.25.16.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 16:16:48 -0700 (PDT) From: Yifan Gu To: u-boot@lists.denx.de Cc: Yifan Gu , Jagan Teki , Andre Przywara , Icenowy Zheng , George Hilliard Subject: [PATCH 19/27] arm: dts: sunxi: do not renumber if mmc2 does not exist Date: Sun, 25 Jul 2021 19:16:28 -0400 Message-Id: <20210725231636.879913-20-me@yifangu.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210725231636.879913-1-me@yifangu.com> References: <20210725231636.879913-1-me@yifangu.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 26 Jul 2021 01:32:10 +0200 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 We renumber mmc2 to mmc1 for sunxi devices, but if mmc2 does not exist dts will not build. This patch prevents that by checking CONFIG_MMC_SUNXI_SLOT_EXTRA. --- arch/arm/dts/sunxi-u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 06da009fa2..53db622144 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -13,7 +13,9 @@ / { aliases { mmc0 = &mmc0; +#if CONFIG_MMC_SUNXI_SLOT_EXTRA > 1 mmc1 = &mmc2; +#endif }; binman: binman {