From patchwork Sun Aug 19 13:56:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 959357 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="C3zV8cBc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41tfNY3DwXz9s3Z for ; Mon, 20 Aug 2018 00:25:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 133AFC21E5B; Sun, 19 Aug 2018 14:14:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1DC42C21DFD; Sun, 19 Aug 2018 14:07:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6613C21E42; Sun, 19 Aug 2018 13:59:34 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id B0A11C21E74 for ; Sun, 19 Aug 2018 13:59:26 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id d4-v6so5501828pfn.0 for ; Sun, 19 Aug 2018 06:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NYrit3XnY+w4HTmy6nb514pTNQsmF1ZI2Ir2k7IeEp4=; b=C3zV8cBcdlu30Oz0Swul/CzfV61+v6nD/VDmopArZyk6DdsedT6ULQHY7itswWqok8 BvA2JQgx+004+nN9Cxpgdy5aQdOrhKHlcDZewDmRlMm5RRFLS3/pwLOBUg8K9I2icKUm GV2jkwLLoI/HJbkyPwq+28hGZd8ocuOhMVM6o= 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=NYrit3XnY+w4HTmy6nb514pTNQsmF1ZI2Ir2k7IeEp4=; b=rMp9vNxwoIyUqd/YxW4+gEZVe1fE5HcwSHq9VneYnkAVzWc3tENqGC18C0H3120NKM 6+AN+T6cxdh3dTmMuCK2jtZRPvOuzEZDqQoS6HMnZITCLIg2UngpDEmFISSWNzVfTTXX FzXESGL7w0r7U4JDU74JNqIhcLtk1v4Pf4mQtNYwTuhJny1tu2RpXbIX0vtCvd6+voHB eMplWOWwAjLdS50cB/DxyPMrD6L30A9uB75Hsnhe92n4olHngFLQu51yns2FLbNvL+eM akWeqZqCtQO7pLWAIojhOIZCS1HfpHGegZHcD7mh+0Bk/yJJUeOgK4ZBhYezscSgdgmu q0Mw== X-Gm-Message-State: AOUpUlFeIlIQdjgM1oXD/QcuAaB0zaD1MEfvjPtpdKMzUJCTdVQLqZh5 NxxvKWKBkxByDfjVUmP5Np2sbQ== X-Google-Smtp-Source: AA+uWPxCW3z//rJS3huDdXdXAizKEDphcK3Z83u1n9Bfh0U+4wfSN/PYmGpJObvKRCxtw+wZvQCstg== X-Received: by 2002:a65:6645:: with SMTP id z5-v6mr2055673pgv.186.1534687165317; Sun, 19 Aug 2018 06:59:25 -0700 (PDT) Received: from localhost.localdomain ([106.208.36.229]) by smtp.gmail.com with ESMTPSA id l185-v6sm8902816pga.65.2018.08.19.06.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Aug 2018 06:59:24 -0700 (PDT) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Icenowy Zheng Date: Sun, 19 Aug 2018 19:26:44 +0530 Message-Id: <20180819135715.15799-28-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20180819135715.15799-1-jagan@amarulasolutions.com> References: <20180819135715.15799-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: Olliver Schinagl , Tom Rini , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v3 27/58] fastboot: sunxi: Update fastboot mmc default device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Usually eMMC is default mmc device for fastboot. By enabling DM_MMC, the mmc devices are probed as per DT status not with respect to MMC_SUNXI_SLOT_EXTRA in U-Boot proper. Allwinner SoC has maximum of 4 mmc controllers start from mmc0...mmc3 on which mmc2 can be used an eMMC controller eventhough mmc3 some boards used as eMMC. So, update the default fastboot device as 2 to make the standard usage irrespective of DT node status. Other corner cases like different device usage, or specific mmc node status is not enabled in order in DTS must explicitly add config on the specific defconfig file. Cc: Olliver Schinagl Cc: Chen-Yu Tsai Signed-off-by: Jagan Teki --- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 + configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/amarula_a64_relic_defconfig | 1 + configs/parrot_r16_defconfig | 1 + drivers/fastboot/Kconfig | 3 +-- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index 2851a461e8..8cedf9cf24 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -30,4 +30,5 @@ CONFIG_SCSI=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig index 3bb8c4c7e6..c96d7ada7c 100644 --- a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +++ b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig @@ -30,4 +30,5 @@ CONFIG_AXP_ALDO4_VOLT=2800 CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 7f5aaab5fb..80741b58f9 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -22,5 +22,6 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_FUNCTION_MASS_STORAGE=y diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig index b72cbfabc6..caeb3f6008 100644 --- a/configs/amarula_a64_relic_defconfig +++ b/configs/amarula_a64_relic_defconfig @@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic" # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_USB_MUSB_GADGET=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index 936f08185f..242886f78e 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -20,5 +20,6 @@ CONFIG_CONS_INDEX=5 CONFIG_USB_OHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_FUNCTION_MASS_STORAGE=y diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index bc25ea1d9c..0e4b50e1cf 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -87,8 +87,7 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC - default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 - default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 + default 2 if ARCH_SUNXI help The fastboot "flash" command requires additional information regarding the non-volatile storage device. Define this to