From patchwork Fri Aug 10 06:06: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: 955992 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="LpsbYpaj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41mwQZ6lThz9s7Q for ; Fri, 10 Aug 2018 16:37:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A0BFFC21E53; Fri, 10 Aug 2018 06:28:52 +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=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 80D22C21E77; Fri, 10 Aug 2018 06:18:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 108A1C21F50; Fri, 10 Aug 2018 06:09:24 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by lists.denx.de (Postfix) with ESMTPS id DE1EAC21D8E for ; Fri, 10 Aug 2018 06:09:18 +0000 (UTC) Received: by mail-pf1-f179.google.com with SMTP id e13-v6so4008452pff.7 for ; Thu, 09 Aug 2018 23:09:18 -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=wCoE18DcW82Xem3Aszk1LPYkxHFLsad4mA8wR7MK+/g=; b=LpsbYpajCo7YYkdk740NmEFklCj10TFdod49TYTPTQn6XVF0DrbVOxag7ZmNswNXUZ TeejrlQm8pWrCmTpWOn0NDpipVAy+zgI8Vnl78ZV9eSCDocvoyDp4nKszpqmpRGW9OIO YCXX6qVt0TnSdv050Vlypzu/L7xhDPOnBQp5U= 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=wCoE18DcW82Xem3Aszk1LPYkxHFLsad4mA8wR7MK+/g=; b=QlgPxz3AKa4QgKBkWUjZVu+ilbR6khWP5a6lL4gN5PqMHhlPn9X359UY22PFwcrNaV 0MUTYaSvVF6qTGcDsXxZxGSJBR2kV18t00PHD5KbQBc7KiNKi5ismldlcWO153MzOqt5 sxiAUnVxBv/5GVPH1Z5BRiPYSosAx8izo9fzMkFDvViNcRGnHl2q+ho+tuapLaao7mUd k04n24bVXWV4rqGAi0IEe1SwfU30QrwKP7vanIMBV1Ifqqa+R22vdMUyGO4XPCzO855T IG+bOAb5ah/wXGPCSUy7odVeAj5HqNcxYbS/D5f01INmBek3pIs0EA09FANFBX7+mX5p 5PNg== X-Gm-Message-State: AOUpUlH9TyhT5mAeHGitZNzJu3kgTFBJpw5E3FhJmqzgZ0Gv56KS1qmm bCvZq3cUqIYjMM+66lvwGKi+vg== X-Google-Smtp-Source: AA+uWPyijNn4JmrOf0N3lhjDot8XUjHuEXaohaI3V5ZLBb5bS4aG30iLwK4Zcybr4ERjZx6meTacVQ== X-Received: by 2002:a62:21cc:: with SMTP id o73-v6mr5614158pfj.21.1533881357440; Thu, 09 Aug 2018 23:09:17 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 23:09:16 -0700 (PDT) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Icenowy Zheng Date: Fri, 10 Aug 2018 11:36:44 +0530 Message-Id: <20180810060711.6547-27-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: Tom Rini , u-boot@lists.denx.de, Olliver Schinagl , Stefan Mavrodiev , Marcus Cooper , Hans de Goede Subject: [U-Boot] [PATCH v2 26/53] env: sunxi: Update default env fat 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 env default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 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: Hans de Goede Cc: Marcus Cooper Cc: Stefan Mavrodiev Cc: Paul Kocialkowski Cc: Chen-Yu Tsai Signed-off-by: Jagan Teki --- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 + configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 + configs/A20-OLinuXino_MICRO_defconfig | 1 + configs/A20-Olimex-SOM-EVB_defconfig | 1 + configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 + configs/Mele_M3_defconfig | 1 + configs/Orangepi_mini_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/Yones_Toptech_BD1078_defconfig | 1 + configs/amarula_a64_relic_defconfig | 1 + env/Kconfig | 3 ++- 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index 8cedf9cf24..bc5820263c 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig index f7e7cbab0a..1552960d88 100644 --- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y CONFIG_SATAPWR="PB8" diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 8dcbdc08f9..b5f1b7efe2 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC3_CD_PIN="PH11" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y CONFIG_SATAPWR="PB8" diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig index a06499e2d0..58f6fbad91 100644 --- a/configs/A20-Olimex-SOM-EVB_defconfig +++ b/configs/A20-Olimex-SOM-EVB_defconfig @@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC3_CD_PIN="PH0" CONFIG_MMC3_PINS="PH" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_SATAPWR="PC3" diff --git a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig index 3bb8c4c7e6..ac4f841c4e 100644 --- a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +++ b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_I2C1_ENABLE=y diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 22497aaeb4..bc447a4a90 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_VIDEO_VGA=y CONFIG_VIDEO_COMPOSITE=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3" diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index 7eeae25010..cfab739552 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23" CONFIG_MMC0_CD_PIN="PH10" CONFIG_MMC3_CD_PIN="PH11" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22" CONFIG_VIDEO_COMPOSITE=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 80741b58f9..2d7b295188 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552 CONFIG_DRAM_ZQ=15291 CONFIG_MMC0_CD_PIN="PB4" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB0_ID_DET="PH8" CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0" CONFIG_VIDEO_LCD_DCLK_PHASE=0 diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig index c49cbcbc3c..cad5618d54 100644 --- a/configs/Yones_Toptech_BD1078_defconfig +++ b/configs/Yones_Toptech_BD1078_defconfig @@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC1_CD_PIN="PH2" CONFIG_MMC1_PINS="PH" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 +CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto" CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_AXP_GPIO=y diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig index caeb3f6008..bb5c0ff7b2 100644 --- a/configs/amarula_a64_relic_defconfig +++ b/configs/amarula_a64_relic_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN50I=y CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_DRAM_ODT_EN=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto" # CONFIG_VIDEO_DE2 is not set CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/env/Kconfig b/env/Kconfig index be99efb937..99577f1b2e 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -374,7 +374,8 @@ config ENV_FAT_DEVICE_AND_PART default "0:1" if TI_COMMON_CMD_OPTIONS default "0:auto" if ARCH_ZYNQMP default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 - default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 + default "1:auto" if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1 + default "2:auto" if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1 default "0" if ARCH_AT91 help Define this to a string to specify the partition of the device. It can