From patchwork Tue Oct 22 17:54:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 867 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 472B23F047 for ; Tue, 22 Oct 2019 19:55:39 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id q13sf2537328plr.18 for ; Tue, 22 Oct 2019 10:55:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571766938; cv=pass; d=google.com; s=arc-20160816; b=XJjVbc+u0qDRw8NBQtGFn7+xRNFOUHGVjh9M87apq6BDRnA8jXhL/9PotstF2Dj6LD 8KJ6BuSEUg+HRYNtu3Kri9mm+kuVbquDBNDYzYBq3G0kve+Epj2S1VCIEoJLciO3c18k EzUt5lhPynYZbUfzUQcmVCt4Q7A+qAExUSNdPe6bTVMH62Y3se9HgB48zkLdXLvwRpVI Xu8E2mBdvfFDdCynBD8iJSVVhKCdjq7ybdu9eW5Oe0iiaDvWGZ0U6N+e6+RBNM0YHcl5 DooWzMtZr5OC+Mb/zP/n0mSZOp1TgWmHDoy1wlJtdrkw1eMlcCbD8ern9zU0PYCdiJiJ ypAw== 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=eyZMN7QYhaYrYNkWFERwQkF9Lu158Bh+B5mUTPziwqU=; b=KaNGGGW8B9vzGuVONtlwPzvOvH8dLLnpYyWPlVWQoD11RWfkHX7TIZqXxyVdKZuhp9 w0lG3b1w/yZ+TXJb1WZyQeQhl/CRz1UpUaG+eZosklpQ+jodYN30KVP4es3nUt1v9fQo LL/1nane6q2+IOwiP7lhbnYF3ZbyspwzpJGFHE/zd5uWMQPQ4KZXVH8TJ4rNBqxgHfX9 DEtCabwese3zk3bCybZSE6AGPvXefLoGXb33OJnMBeXWaBUZPgiBb2H9G4PKl29UEn7t U70/hC8ceFqCX2aviyXnB1FL/UF8yshwRL7arwFITAhZZezTXKDClEuDWo9jWRQqYURk vXGA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TCTDvvGe; 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=eyZMN7QYhaYrYNkWFERwQkF9Lu158Bh+B5mUTPziwqU=; b=VLnWMVx7z72IuEGg8thbPtIWrfoa2mX8yGCDt25xmWMXM1oubVcmjY8S4aspZvWq/2 OEXE6j61e9l9+1Nr9VF2sWqb0/s8fRnv3T+w2UQT4JU1a1rLhplkgHLvJ+zl0IUG4POY o6oS3QYIZH/DJtJy3E+nZpGNHl4KZ3v4d9Hjo= 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=eyZMN7QYhaYrYNkWFERwQkF9Lu158Bh+B5mUTPziwqU=; b=rvriTY+WocKMiC/65HoyiDQUN0Gd6oS77l7KIxRBbHNTPBBk19+9TrL5dLc5qocz9B AvRmubvlhTZuhGP4r5rhWQzFAPAi7BF6ihufSwQl6JmZ1QJwEFW0J4p5Uuycss6sfmyI Q8P9j8Hv5BDdA6ikfZ51xSeu4j1CqmI3xHaNGv/w1D99N7xdArnsLk2yQ+YL8Y9u/F/d bxeZSXiMH7jcAHSakvwlY34Zl0BJtNT2sVjXrrikyTKHF5MDA1gFZIZi7oHK71tkpxCh 801QCfM8Kce5rdERvVYwgXGqBJ8EvZd54ZQE2ZRBLrvSVxRW3lPhzY8v+aUQNQsj8kde mzgg== X-Gm-Message-State: APjAAAWwFJYP2uqB37HJC0n9AIs2S+PjjQi87v+M/959OI1wXwhic2Kb j2m8m1uwnDxzZzK1iVvP8v0n2oNe X-Google-Smtp-Source: APXvYqwtiz6n90ttkGJ+w6SV6TKLIDTs4+ub0JN2yK94XIUZu+S6rbbE1RnMNpB3Oe80B80KqRRLFA== X-Received: by 2002:aa7:87ca:: with SMTP id i10mr5758071pfo.62.1571766938051; Tue, 22 Oct 2019 10:55:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:4b87:: with SMTP id t7ls4655950pgq.5.gmail; Tue, 22 Oct 2019 10:55:37 -0700 (PDT) X-Received: by 2002:a63:ef10:: with SMTP id u16mr5125114pgh.20.1571766937315; Tue, 22 Oct 2019 10:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571766937; cv=none; d=google.com; s=arc-20160816; b=moIJ+DqPX8pSAls0gkcJvDiSl02tdG9tF05tnxy3kebnPWMhy3+/GiFzrlNves28wJ 4Bh4UZgjCU8q7i/DGlM9RBddKzCaGsxIDQHRDQtCGPVjDIC21Pi3+tDaWiFRiqv3+Pp2 5Y4xaPRZtTqMxkiJ3jqt4GrPf0TJ2w2cs3kj8ZgZjKap6mrhNPQWVpbDsR9ETz+v5brv bvUPMTgGqD+sQlNTqFJKqMjR4xHqatHuDPFkOxwgPbh5/bdPNJ880CWOOIjITuLw1tIn UuDN2jsCaS829Gcr9UWPDp8jcCSmkByxnNJiN2gvf+hfg2lP2qp5B/21yMwpSrH+cbLw qpEw== 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=zWRJz6rW2RQ3KTi2LD0pRPiuHfQYA+WsBHlu/vU4wOs=; b=1Errpk5dE/V88qsx0Y3ny+l3irWjxIj1qQzLesRnt3m2JqTtcCLUvJwAlr4PcBXUVi 68uwZTLb0bUeJ94LtNsb7RMBXQhQ+SBRUa5Q4N4cVaz9ULR33xJJqkImHbuPi61RQh91 Z3F+RBsxlt/tf2CsRcrUXXlp0VKu4d9+YUdvc8TFYjjbR/cvvoYlMurHxUZGlc2QMUsF ZGSsWrzkjm01IjggpC9sLOmNJu3iknGmV0PZwx++PfOKEKjgHFEq9W8Op26KTyRXJ+PE WG61jSsmp78C5DWmxFsak/QqAc/wObfiLAylSr2L9Zsl9WFqDONfuuOUgk+n3lFOLoMa vUvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TCTDvvGe; 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 s29sor17436535pgo.82.2019.10.22.10.55.37 for (Google Transport Security); Tue, 22 Oct 2019 10:55:37 -0700 (PDT) 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:a63:eb08:: with SMTP id t8mr5302110pgh.49.1571766936789; Tue, 22 Oct 2019 10:55:36 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id b3sm20454775pfd.125.2019.10.22.10.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 10:55:36 -0700 (PDT) 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 5/9] fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV] Date: Tue, 22 Oct 2019 23:24:54 +0530 Message-Id: <20191022175458.22604-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191022175458.22604-1-jagan@amarulasolutions.com> References: <20191022175458.22604-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=TCTDvvGe; 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. Signed-off-by: Jagan Teki --- 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 -- drivers/fastboot/Kconfig | 4 +++- 13 files changed, 3 insertions(+), 25 deletions(-) diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index c02ef6af4e..ca2ba9d0d8 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -36,8 +36,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 a3189638a1..9d81d96e68 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -22,8 +22,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 e7b813d627..a365931e47 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 a6c57dfaa6..a88f391b96 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -44,8 +44,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 c9d056b4b9..d133477e62 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -48,8 +48,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_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 2de166ae90..4bd81048e9 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -46,8 +46,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 ff20dea0fc..79188c16b7 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -38,8 +38,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 fbafbb857a..1b55008a96 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -46,8 +46,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 70e3bdc621..f44974b191 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -48,8 +48,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 611aff5e1d..af70684045 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -46,8 +46,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 5e64003dd3..fc9079eb4e 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -51,8 +51,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_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 467065e3ad..a624270aff 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -48,8 +48,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