From patchwork Tue Nov 19 08:26:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 894 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A54253F1EA for ; Tue, 19 Nov 2019 09:26:51 +0100 (CET) Received: by mail-pg1-f199.google.com with SMTP id u197sf15134638pgc.17 for ; Tue, 19 Nov 2019 00:26:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1574152010; cv=pass; d=google.com; s=arc-20160816; b=qDzF1IRA9jma2xGSA+GMNV5xTNPTR1hWnW+ANcIkCNUQrg+iUJ4yW+xKXp36smmTrF BVpdMWIVTDjmuRSfmEDaeIpVOom9kr8OZh4c2gnsqXYlmq3Go8q71KdyoMXJm/xa+Xkv PTYkutX7k559Mg1GvocELLRdVy1zJBBz+NDergPZI1cLK3Q641lkDlHeJgqnP7sVdAwr 5E4kaKSPxC/Th9kOW5UHeL6sD4tRnE93pEUxf0ClmqvgjfZ3CggDTkDawtujft0p2TJ3 KN6l5nP5UlyVg6N7QzxCQaQd0dcL3s+pw2/vrxsVcERDZUFs6fPyq22QgEOrfj7epG58 b8ZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=6A1E6KbxT1RwdbS8Zy5zuhvmCBZ2/h+aocLBqXEevhA=; b=BjIVYOoz0WPiaPKV0s+9JKlFv07ypVDafi2M0pTCkQNFrLnhr90q3zGEUlv7r57cdc 9HlU3IM6HlzgCY95YcSARYyo74Md3ARC9InZN0Hmer2IM/zuXu5j7lPPCgOwj2BZGMbv CzrsWi0kaVsQBhCiOtevWisnEdQkcZLo6ilh0IYwnPaA0+GFNl3ZHbgBWPEYgMFygrI4 WwFg2QxMoJLNnJZEHePynfvBql4x6Mr+BdykmpLjvIYoUh5AFFN2TzBN1q5ObQbLFu1d y6XrAz8Hxv3FWmw762YyAoXzFS0bf8oRmtE+WD6K1lNWT2AYL+eiaO8Fn1Ktm5vYLYeC BM8Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="FhZk+g/t"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=6A1E6KbxT1RwdbS8Zy5zuhvmCBZ2/h+aocLBqXEevhA=; b=IxrC9Mv3gAqHszLtVhEQ6Te72vVnbI1218beMWj0tQ9HF8NZaWpdbK08YoGwJOtFdE vZVNt21nV6rD8nwXkaY2BxUEg8YGXOYfeewgcqxqW6EGfakpQi5dU1TM9TGt7VHOPckf toBl+uDnmcz4YYIh6SY/9MJYH8bAqg93x8cpI= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=6A1E6KbxT1RwdbS8Zy5zuhvmCBZ2/h+aocLBqXEevhA=; b=qdoL4q3K5i92E+q3cmfsYdUheOBtC/MPr7+pmqSS5/ZANmzAXBVItLnCAA1yuiYC21 Uo/pUoqHrcgNNtCtKqmFgsQ0tPfRHmNAw+s8vkDlf4qeUK5vrjQOiFJW3waZyHz3NoFp 0twYFvLxBTtJvZwxV1emt7XCpwb42Edb0Hk/8oBG6/dc0eZdHcNcxewAGMK7SRLT7nrB JGBG1mKeoSOvZ8NiXaYwSEQhYBe5fBGFfOkPQt/yfScH1fRYLcYthMVx4MHK4LS1r8ro zusaTeDXEsKnzdVyhJ9pC3LptJpAkULN41Xucz10rZ6rPjDpcsM2+1Jodn21Ef0tNkye C87g== X-Gm-Message-State: APjAAAV7SjQgxS+6SfY/giTdthH40l8EN/2XNFib2MrJhbs5wjtKKlhB FA6CpxeoqLLBSof/21R2Rzqfzd1V X-Google-Smtp-Source: APXvYqyluXtsICrh7OdqLw108sCJBPNPazzHUd7uVY7OnmKyl3An8bmGFMpanD9a9eVqpbJNqpNlOw== X-Received: by 2002:a17:90b:281:: with SMTP id az1mr4833227pjb.27.1574152010442; Tue, 19 Nov 2019 00:26:50 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:a10:: with SMTP id 16ls3192877pgk.1.gmail; Tue, 19 Nov 2019 00:26:49 -0800 (PST) X-Received: by 2002:a62:cd87:: with SMTP id o129mr3513613pfg.49.1574152009294; Tue, 19 Nov 2019 00:26:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574152009; cv=none; d=google.com; s=arc-20160816; b=oqst6Gw1/FYofIwaYmfxJTmX8QyaiWgerWnVRqoJw2Py8OJLLvk3VrzmT+8oUPXsTL TgNb+IDbrOOZ2qQdxuYALVY8CCzvDdsOU84osrp7hB13yz+T3wvl2tzh6IOaQ5zh64Qr qYF80RGFoid6dphP4kXiEBsjQz+8LjETtDjZThEzFEx0BL74dQ6Rd30QTB62SqiQ5EyP F7B9EzrSRsyLdi7nDHPZx9i08FcvWdqKaakI3+J1h0lXpdkm2BtR+7UcuSesr96UvvGF iIUB1pEn/YfYiLcrzPpx6c7Mim4lojDpQL3IbNmrF0YiyP0Yy/Ugbxz52TZVOz9Zem+v FTCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=EoBNFaO/xPDAoLmT03miob9ythPT8AuOgmoCwUhBZlM=; b=WXgnsZQtYcasJtKdLV8RNvU6COCxNHS+pviCK/2ruLZRPwTAMGxzCubw4o9Zgsgh3X 5meLc4Iwh9W/dkXtew2605RgLJoQh8kDVodtaHMwnSDlzcvmHbas4pHlH9W9EtXOSWjz fGcR78FdxOvc2lZZDQ3OzJKxWRQC3ZJ/+POQXK7vIdqti+X2BiVqcxmgSqE8PVLYOqNi Rk61/K+pvIX2NLqLPjveRBSljjTHuBvJitK90F+L+YO++WrGWJ708F6cpRd+WkvL+Kg9 7JH8Gsk+t+yG6fH2Nbr9pteSkXvXIoJHvytRF9CT4fClslSWFe9l8mxLdKOhnicAd351 CwYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="FhZk+g/t"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 94sor24493580plf.67.2019.11.19.00.26.49 for (Google Transport Security); Tue, 19 Nov 2019 00:26:49 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90b:d88:: with SMTP id bg8mr4803829pjb.78.1574152008919; Tue, 19 Nov 2019 00:26:48 -0800 (PST) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id u7sm2312221pjx.19.2019.11.19.00.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 00:26:48 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Levin Du , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 05/10] fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV] Date: Tue, 19 Nov 2019 13:56:18 +0530 Message-Id: <20191119082623.6165-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191119082623.6165-1-jagan@amarulasolutions.com> References: <20191119082623.6165-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="FhZk+g/t"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Select CONFIG_FASTBOOT_FLASH, CONFIG_FASTBOOT_FLASH_MMC_DEV for rockchip SoC plaforms in fastboot Kconfig file instead of defined it in board defconfig. This eventually drop the explicit configs defined in supporting board defconfig files. Tested-by: Levin Du Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- configs/evb-rk3036_defconfig | 2 -- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 2 -- configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3328_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/kylin-rk3036_defconfig | 2 -- configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/rock64-rk3328_defconfig | 2 -- configs/tinker-rk3288_defconfig | 2 -- configs/tinker-s-rk3288_defconfig | 2 -- drivers/fastboot/Kconfig | 4 +++- 14 files changed, 3 insertions(+), 27 deletions(-) diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 79e413145f..4bed28f102 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -35,8 +35,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig index cb3c5372aa..bf91c642dd 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -23,8 +23,6 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 8d7d11c3e8..cdf28154f8 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -44,8 +44,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index db7e6fa7b1..833b0b6a6d 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -43,8 +43,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 0293546b04..74b7295e62 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -46,8 +46,6 @@ CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 6efc5735f9..178029cc47 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -44,8 +44,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index c1607e52fb..6c13c4c080 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -37,8 +37,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 4590e38ad3..488cc54203 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -45,8 +45,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 51bd8adcbc..75de1d68e5 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -47,8 +47,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 8cc55bdbe0..320f34bd04 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -45,8 +45,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index 0dab5d7e54..73ca535ff8 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -48,8 +48,6 @@ CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index c350c0d8ba..56fcbb94d3 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -47,8 +47,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig index c016a264b2..458e1695a2 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -52,8 +52,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index d63ecdd27e..34864ca613 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI + default y if ARCH_SUNXI || ARCH_ROCKCHIP depends on MMC || (NAND && CMD_MTDPARTS) select IMAGE_SPARSE help @@ -89,6 +89,8 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC + default 1 if ROCKCHIP_RK3328 + default 0 if ARCH_ROCKCHIP default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help