From patchwork Fri Aug 10 06:06:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 955954 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="NToUnMUC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41mvz33Wf0z9s8f for ; Fri, 10 Aug 2018 16:16:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AC34BC21C8B; Fri, 10 Aug 2018 06:16:04 +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 1707FC21E74; Fri, 10 Aug 2018 06:10:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2D71FC21DF8; Fri, 10 Aug 2018 06:09:18 +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 E556AC21D8E for ; Fri, 10 Aug 2018 06:09:13 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id j26-v6so4004512pfi.10 for ; Thu, 09 Aug 2018 23:09:13 -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=apNYimDCC5pi+6lMxE5k2dQh9P6UkEWlvkFGeiAVEww=; b=NToUnMUC9ImHf/aS8c45AMOIwR1PIjkmQMYVBCTBWdCPdXPIq7CrhzUSc1/2tNkBy9 7pcBkKqMVq/pl5zkHdSlWJoFwDtywSq3tdRSgOBXj3bO+YUQVzZbThwddris/8D0AOPP dLkIn5DKq+eB/w9AgnikFjJCwwuFwTmI4dtJg= 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=apNYimDCC5pi+6lMxE5k2dQh9P6UkEWlvkFGeiAVEww=; b=es0oimoLax73B0m5kdY7ABKQbclA43gdSKaOje1I9k0cQTUcmtU8Dvj3P79JK+1AUp kAtb1mpCPzO56+iR5KRJr2nA7is+UvBCAK1s4ntbj9mshIvsGLYJa1lzsQj0n90/Kzst 7qBD9NPG8BXzaWksxwiXJrfWm+rZ6AXDAhMFYaTmP74ix9XcWhuhhlBG365BuBUW5JM7 UF4i5kpJ6Lu81tr9ayhf5d+IeRWHMDnCoJD0l7MteA1s/7Nz5YTik172ZybBrSV0ElPt Sj5g17P5u7dUQgJPde3eTwLAV1ZRwP1i41vj2A9K5lsgvauwj8V/fvq4hSMB18nJYg4o Er9A== X-Gm-Message-State: AOUpUlH0dppoyOpbB+KXBt1B5JywvtWxiWFaf07ygzSB1ThO3Qc2pubO G0A/ZNJdenV0qI5mWjCL0tpAwg== X-Google-Smtp-Source: AA+uWPx2eKctsOTvjCvcZwYXe4iO/AKA+fkBRwEHjWBMPJaGNhkmagAnT4Gr5dylRIWazVhweZWsyQ== X-Received: by 2002:a63:2dc1:: with SMTP id t184-v6mr5038874pgt.62.1533881352538; Thu, 09 Aug 2018 23:09:12 -0700 (PDT) Received: from localhost.localdomain ([183.82.228.250]) by smtp.gmail.com with ESMTPSA id r23-v6sm16880975pfj.5.2018.08.09.23.09.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 23:09:12 -0700 (PDT) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Icenowy Zheng Date: Fri, 10 Aug 2018 11:36:43 +0530 Message-Id: <20180810060711.6547-26-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20180810060711.6547-1-jagan@amarulasolutions.com> References: <20180810060711.6547-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: Olliver Schinagl , Tom Rini , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 25/53] 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 env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2. So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig. Cc: Olliver Schinagl Cc: Chen-Yu Tsai Signed-off-by: Jagan Teki --- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/amarula_a64_relic_defconfig | 1 + drivers/fastboot/Kconfig | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) 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/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/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index bc25ea1d9c..4a1bfd119c 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -88,7 +88,8 @@ 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 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1 + default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1 help The fastboot "flash" command requires additional information regarding the non-volatile storage device. Define this to