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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7A4DDC47089 for ; Thu, 27 May 2021 07:35:49 +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 A092B60C3D for ; Thu, 27 May 2021 07:35:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A092B60C3D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4E4808200B; Thu, 27 May 2021 09:35:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W12OHa8O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D99782AE5; Thu, 27 May 2021 09:35:43 +0200 (CEST) Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) (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 92A3581F30 for ; Thu, 27 May 2021 09:35:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pg1-x52c.google.com with SMTP id v14so3049396pgi.6 for ; Thu, 27 May 2021 00:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TD58C5S0t1JJ5TYofzXH63+0BJ1zLi6GfYF3V1auv4c=; b=W12OHa8OWyxCA25DaFnMhsjQAjPbAQuMRnXPxBWB5I+ES34HQOh8m5vQx+BVuCCxGp 61FRR4x7eZUWwj0UtTrzGOiMJlwHxAPVXuEh1IMjOkStvqeOldzTWB7BAElMu2Hgsu0G hTtPFA/xN0ZJ5LAw2q/tVSlRdcWRS5wfry4ocx8K9U5BUwX6FomU6l9QJVvNKIinMNtn AszGtRGQ6Ax8Q+gcyuuIj+KyTIPGaqcv7fyhPJpuCWWvQmn9DSBRDJALcy5G/nmGNXUs jTDh9SiWX3L91WMX3Xh16ToDwwisMP2tMj9+llxyKKzwle2p77aQqgq00SV/4lih/3B3 zgew== 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:mime-version :content-transfer-encoding; bh=TD58C5S0t1JJ5TYofzXH63+0BJ1zLi6GfYF3V1auv4c=; b=VdanKXgt9Tw1qZ7renXOczAhgvsHS0hR3m7ZqQIssZnfZoJ/48ZoZNMUJvDZiD03Ba hM7j7iDE59dTahWkuwOxxTf1T4PrwzMiYahrQ6KGaQL4+MO/B2KBC7H0wwbkyNsNR5dW KVbiF6+VyX0T++ykPKtAH4czVjq7rNzQ8P2vmBNSMuLpJvgzFOVdoDK20ORJ3yN3956r 72qvj8W4/9avWV9F3bT3E7IvV0nrNxyH61AesqyeYHOg1KBfxUQawXy3qlcv48rgEIMN PJgHuIl1tcX5WFOf7nauCo5O8fQxYxfGfv4cpdCFGbZQi+jcEcT0DI/DDV6FwUnrzbDN SmwA== X-Gm-Message-State: AOAM532sGzKBci7eGrU9Dage8DBqPFlZcasKTN2HN0rFk6WI9UrkHyEo YMJZWhfU3aEO7+1fIRuOhSk= X-Google-Smtp-Source: ABdhPJwa9MO5EIs9mIqgLUAnAGtBPOZiAPxQiz8wlsKc0h1c/SjC1eCQiQZ4N0IrcDQeh4NPTTu2ew== X-Received: by 2002:a65:6256:: with SMTP id q22mr2443486pgv.391.1622100938903; Thu, 27 May 2021 00:35:38 -0700 (PDT) Received: from localhost.localdomain (104.194.74.249.16clouds.com. [104.194.74.249]) by smtp.gmail.com with ESMTPSA id g29sm1098874pgm.11.2021.05.27.00.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 00:35:38 -0700 (PDT) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: narmstrong@baylibre.com Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, m.szyprowski@samsung.com, christianshewitt@gmail.com, jh80.chung@samsung.com, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH] VIM3: mmc_get_env_dev correct non emmc boot sources Date: Thu, 27 May 2021 15:35:28 +0800 Message-Id: <20210527073528.87293-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 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.102.4 at phobos.denx.de X-Virus-Status: Clean need return -1 if boot source is not EMMC or SD ( for example it will be useful if we have multy env sources configuration and device was booted from SPI flash and env need read from SPI not from mmc ) Signed-off-by: Artem Lapkin --- board/amlogic/vim3/vim3.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 6cd5f2e1..71aaa0d8 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -19,9 +19,15 @@ int mmc_get_env_dev(void) { - if (meson_get_boot_device() == BOOT_DEVICE_EMMC) + switch (meson_get_boot_device()) { + case BOOT_DEVICE_EMMC: return 2; - return 1; + case BOOT_DEVICE_SD: + return 1; + default: + /* boot device is not EMMC|SD */ + return -1; + } } /* -- 2.25.1