From patchwork Fri Oct 20 14:17:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 828691 X-Patchwork-Delegate: sbabic@denx.de 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yJSSz3Msqz9t32 for ; Sat, 21 Oct 2017 01:13:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1DCABC21FC0; Fri, 20 Oct 2017 14:13:36 +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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 6EF4EC21ECA; Fri, 20 Oct 2017 14:13:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B06AC21ECA; Fri, 20 Oct 2017 14:13:30 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0043.outbound.protection.outlook.com [104.47.36.43]) by lists.denx.de (Postfix) with ESMTPS id CE502C21C58 for ; Fri, 20 Oct 2017 14:13:28 +0000 (UTC) Received: from BN6PR03CA0080.namprd03.prod.outlook.com (10.164.122.146) by CY1PR0301MB0729.namprd03.prod.outlook.com (10.160.159.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 20 Oct 2017 14:13:26 +0000 Received: from BY2FFO11FD005.protection.gbl (2a01:111:f400:7c0c::129) by BN6PR03CA0080.outlook.office365.com (2603:10b6:405:6f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Fri, 20 Oct 2017 14:13:25 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD005.mail.protection.outlook.com (10.1.14.126) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Fri, 20 Oct 2017 14:13:25 +0000 Received: from fabio-OptiPlex-7010.am.freescale.net (fabio-OptiPlex-7010.am.freescale.net [10.29.244.187]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v9KEDLE3012814; Fri, 20 Oct 2017 07:13:22 -0700 From: Fabio Estevam To: Date: Fri, 20 Oct 2017 12:17:03 -0200 Message-ID: <1508509023-9192-1-git-send-email-fabio.estevam@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131529824055975333; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(39380400002)(39860400002)(376002)(346002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(105606002)(5660300001)(54906003)(77096006)(6916009)(97736004)(106466001)(50986999)(6666003)(2351001)(104016004)(2870700001)(23676002)(36756003)(498600001)(189998001)(50466002)(8676002)(5820100001)(68736007)(305945005)(8936002)(53936002)(33646002)(81156014)(39060400002)(50226002)(4326008)(85426001)(81166006)(86362001)(356003)(575784001)(316002)(8656005)(47776003)(8656005)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0729; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD005; 1:Ns1d6z+8RhQCMOwuUsz1wgKWlt5V3w0cyK7nXavQqh4YLaak9wx3eLFFU1xmBD1yl8CQbTu0U/Tw9h5kGWmjAm9THfL7h3KrD2H4F27rcKgTDcYuHhyPKfv8sKCDC4Bm X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07e1b9cd-accb-4029-d375-08d517c4ba9d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199); SRVR:CY1PR0301MB0729; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0729; 3:M/8LhINIK289Vu3QILYVapdmgOkuwB00Jl8ChxLXq9VVWuX/lCf1V/TLK9ZJbvW8VfbJkKTQkMar/saKIMdTriZjp9QscOtcnGysMoXWW5CzB3McdQBwOcbSxXT24nAqayDa9VEPZmEDZarBZYMsaCbKufsfzbLKQHvctQPP8r6o4SSrOBUs4x1z5n6fN8ykflH3Db15E5MrBg8IxMMw4YA0bXDzY1FFdHIPADx2FV/w2XY4QTN/kd+0QVrFJT9PUaymSnBjDTvMYeC6PIuICiYO4znkgUft/xX1kLJtmWXzVLnirHylM41D92lGU0eUYmclQ/KzC5g6b+th3wHJHJKmJ2v1+EN8zvMSEeZyPEI=; 25:PgPeFmNd4Tv8mSLT9iIL8DJ+yuYxX5Sc4itknQVDiw2NSz0bScPwMBAhYR32qiGgsuBTogmyPhRsG70mRsZw/5ULBPgEWQ9HJYduC69dn5sNLWLXujERKqE43xgsB5Db5DxWbLMReix7rD+YbEZi5Rqj91xld5eePtSvXXddHfrbPAbmGU2Hm0LDOwSPm1FKP2mFq72mYq40lAhbKpiwzlVJYhDgz5O1Z7C6NrnKGRbTLOOyHPe+us5CAsdSE/6JMsJ7w35z9w5SL//kJwGL5STb48DRQZ2eBlcDl0NyCjtLbb26b1+GTakpQAE5HOWDU8SeURrw97Dv3Dj5RL8Pmg== X-MS-TrafficTypeDiagnostic: CY1PR0301MB0729: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0729; 31:AF8E0+kqZ0NrYE3AIOBDAEdsM7XZ5UDPcN7Arie68BHWucHtOc17tv/0XXpvg157aRBRnQy2ONdDqb1ShHp/1lYrzZeLg6kAnODo/Q8cDbUj38rOt+BcJSPchzHA0cELUnmcZRZrXbz5D0dZC3g+2pyRENuVO5hYcG+T33asCnifBIHiPJquDSAaFum0T6Y6A8TPVyhOTiKD/YxEAcBNq0Dnif4X+82wlTi+FeMX1L0=; 4:YOIkSytTgZUUh7kNxhYrJcddtIWJOniAdu+VbqIuH1ZM5Zk2py+JiLatD98XYlffn8+0uzWgtAXXZjVeiKPeMW4VVtXFOA2DRonV0/rpw0DAIACakhyDYSqhG/52DVAUzBkdxeq6SCqUlZg7/t/s29Sm1LLlk1sYlCaaNKBLbQXFgpyl8dI0Lz3S3SfHw3sNbVrXbXClM8woPsSHULaOnSEStXOYOb+tGFHePDAUitvV0xPmkn/pH0GoAioNB9c/ajFRuQ/YY3gt+6yFxbBWkqnAMwkMlrn4EUu8KfI/uS18jWfF1VJQQLqitP349ascvMTYLc6qc9AC2QzNcm0kMA== X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(7411616537696); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(20161123223025)(100000703101)(100105400095)(3231020)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123565025)(20161123561025)(20161123563025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0301MB0729; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0301MB0729; X-Forefront-PRVS: 0466CA5A45 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY1PR0301MB0729=3B23=3AVL?= =?utf-8?q?AoCpJD5NSbGF07dSVw4BBk0sM/fmPnfh7pomaW6U1ZD63iGKjvcK0Zac?= =?utf-8?q?V2zpJcZxd/+kNwpDgm2ZNzAW60Bqqm2eSakOQureJ/EMLzDfB4uT1i2T?= =?utf-8?q?d0FJvszRIUAx5lRiYMyeNwwKLJ3WqhemwzdMquxrtI7FgzY+00ofDC29?= =?utf-8?q?ydeb3RIVZUiqUy/CiiNAOm5j1h+6BwDp71XXEFo0+ZpbYI4bbvneUdCO?= =?utf-8?q?ijmVQVXVFMx5RPgNHkpo88jdt45Dcd6gqD31zO+FeJrPH46BqcyIVIWI?= =?utf-8?q?WsL7XENJRhgk28urqm1iSxR2fxM47fHNWUCVg5p3DZDS0wCD7e+RiuFh?= =?utf-8?q?HKuRFqO9lapu8cp2lJGxqkhxxjjndmXAjMEWLqsws8MJGu1/C0WRC7qy?= =?utf-8?q?+/oXyRJK6L5gewq1pO1ucE6EfwvqLhYExTvHbk7VMFCRmzN17vM8U+nL?= =?utf-8?q?z0/f/CBjis/EMagWvpLTXtMWZak92otyQ7mvM3bc2nTvLNCkbae8EkKb?= =?utf-8?q?zwVYxVA3yVxOzhIAILY9vh/BehmG4z022zEaeB3qU9vZtFDEBOwqR5Eu?= =?utf-8?q?N1or5x8xbJYInZx37AIBZqme1LeHvG88DGdGHVJzT4TLM7Pbget6VIv2?= =?utf-8?q?7VsyMVVpabrXKLdyEmglT8UGc0AZiaJFAdGVLAb5ASYP4WwdUin/3dOL?= =?utf-8?q?r0nImVCz8/kkhCnDdxhaYW4/dw+eCvUX71iOy9de3cZP4F1BLOnumxab?= =?utf-8?q?TrDrq+d6uNL8+1Wtchlxv3pDBut5V79u1X+fVNBjhWRU9vHcR/b12TyG?= =?utf-8?q?qyK5y+wN1kp1jfFy4OYMgQHOcdNpNdNZOKaY3bbtlcLlYhv4auMDc8wG?= =?utf-8?q?P8q5RAmiIE6M+vp4lhKqJnU1EHPd4OpUHC5FtrjsiasegGFv24eTt6kq?= =?utf-8?q?9/YqtbhRfT9nibgKKVnfoNTxMMefAF93h/B/Rpe1kykyIdUrOycH+tLV?= =?utf-8?q?knNjbfAqzL6baTVKZHlM/ANvFrWbHmPIu+BFJCm7eG8GoeMRXo1AaCWM?= =?utf-8?q?OGBm8ZSTSjP6k+uKsV7MPGnpKx465VtL9WLvJhH/S1FM6vMfQZvA9yqk?= =?utf-8?q?4Ny8BRpUiQNJ2gNTUyKx0X9wLzTPfV686towPxRpHKHw+CEaoJRs9XEt?= =?utf-8?q?FZRR2So4YiM0Dlcqzd9qbEmadPzz0KkXtZCWOA5P7euDZr21yg59MNZL?= =?utf-8?q?x30h6MFKkXRNBFhW3iv8o89xEzf1wYzsvHqAKH?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0729; 6:/KwW0z1dZZj/0RCjzX4Ge4R1EPBmbUg6WghFSunWHiRjwTIzjowB9hFvc+07LxElxWuSxsWhd011p/cbbz6GQN/gL0y8RcAmz+ICWihb76xiH/NVtiN/1YNBOu4gVpX67bi0QsU8wKBPPLr+hwkj+KQFuywRqxygpQbPBngsUqkWIZaTt4RW74YKWOqnN5/nCzvJtfEANWNOWKxziLpQ50y8YJxMv1UMy+DWCJl+cdfwnKqab+KN60ZOca1TGVLKrqUtwSFbRwjsigoclt7SM49ODOCCelgf+m5dM7EoI7x+lEPgS3LFK0qCJsVkNRIiInRNbCqiAP+xglVuqxMDLg==; 5:SEHWONpA6Hr/qsHJuI7e6cf6v0ExERyeTOryc28eT+C66Ly/6VvX5YJN/YQatqPk1/HC/qAazpPVW28oPGCi31WXt1ONa7NYBDuhR6WwhNS/yB9nS8TLQkPyGyG7VCGoZSuDzqXLvESYguUjMtvraw==; 24:SBE0WyHkAQz4C/4Z7JzCRegozvNFVXBkcUTeb/H0iYK13JU+SEn/F/xGkxIr757up0y5BNEUsfDgldfOuYJW1rGMYEIH5Oi1R5HcPGk7eS4=; 7:KWiCyDFUudGOZySz8rpcsBcCkuh189Tum87xp3/F9WCRTns3XPZJPPzVhMj3LMAytn5G2KpDjqN+JbYsMXXyzZxUMUoU8X5M4x7wNj+jJyMBvMJy1iF5xAgpW/tDs5clp+o5cTFT/2oLgzdgaIY4ODZitHhgSeQ64oYcLq8IxgUCjsC9PCh9rq3+1xeclnpHL20i7ZMtf7pqBJR7Lezuxc+ffiGLi1/jwEUUqmCW1xc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 14:13:25.2855 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0729 Cc: jagan@openedev.com, u-boot@lists.denx.de, Fabio Estevam Subject: [U-Boot] [PATCH v3] imx: Fix regression with CONFIG_DM_MMC=y 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" When CONFIG_DM_MMC=y, CONFIG_BLK should be selected, otherwise the SD/eMMC card cannot be used. Also, select CONFIG_DM_USB=y when CONFIG_USB=y to avoid build failure. Tested on mx6slevk, mx7dsabresd and mx6ullevk. Signed-off-by: Fabio Estevam Reviewed-by: Jaehoon Chung Tested-by: Adam Ford Tested-by: Sébastien Szymanski Tested-by: Jagan Teki Reviewed-by: Jagan Teki --- Changes since v2: - Fix build failure on opos6uldev (Sébastien) configs/imx6q_logic_defconfig | 1 - configs/imx6qdl_icore_nand_defconfig | 1 - configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_geam_nand_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - configs/imx6ul_isiot_mmc_defconfig | 1 - configs/imx6ul_isiot_nand_defconfig | 1 - configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6sllevk_defconfig | 1 - configs/mx6sllevk_plugin_defconfig | 1 - configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6ull_14x14_evk_defconfig | 1 - configs/mx6ull_14x14_evk_plugin_defconfig | 1 - configs/mx7dsabresd_defconfig | 1 - configs/mx7dsabresd_secure_defconfig | 1 - configs/mx7ulp_evk_defconfig | 1 - configs/mx7ulp_evk_plugin_defconfig | 1 - configs/opos6uldev_defconfig | 1 - include/configs/opos6uldev.h | 1 + 20 files changed, 4 insertions(+), 19 deletions(-) diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 8018198..c7d3046 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_NAND=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index c341b17..80a8679 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_OF_LIST="imx6q-icore imx6dl-icore" CONFIG_ENV_IS_IN_NAND=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index 7c79873..ce7c288 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index d6038c1..8d7eb0d 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index 67fa9a0..94af53e 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig index c673d93..0a990d7 100644 --- a/configs/imx6ul_isiot_mmc_defconfig +++ b/configs/imx6ul_isiot_mmc_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index e481151..e806127 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_NAND=y CONFIG_NAND_MXS=y diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 16e2cca..7b1ddac 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y @@ -45,6 +44,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 020d19f..4b9c04e 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y @@ -45,6 +44,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_THERMAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/mx6sllevk_defconfig b/configs/mx6sllevk_defconfig index a7daafc..30b9ad7 100644 --- a/configs/mx6sllevk_defconfig +++ b/configs/mx6sllevk_defconfig @@ -24,7 +24,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y diff --git a/configs/mx6sllevk_plugin_defconfig b/configs/mx6sllevk_plugin_defconfig index b8948d8..b5301c3 100644 --- a/configs/mx6sllevk_plugin_defconfig +++ b/configs/mx6sllevk_plugin_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index ca8453b..5ef95d1 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -47,6 +46,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_FSL_QSPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index 115c926..c9147fc 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index d6511ff..f0cc85f 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -22,7 +22,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 1917f4b..9a4857d 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -37,7 +37,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y -# CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig index 416ddcf..b33c2b6 100644 --- a/configs/mx7dsabresd_secure_defconfig +++ b/configs/mx7dsabresd_secure_defconfig @@ -39,7 +39,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y -# CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 0470fbd..e344dd9 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -12,7 +12,6 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_IMX_RGPIO2P=y CONFIG_DM_I2C=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index d630113..cb66bca 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -11,7 +11,6 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_IMX_RGPIO2P=y CONFIG_DM_I2C=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 6b1aa7b..b6687fa 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -57,7 +57,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y -# CONFIG_BLK is not set CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_PWRSEQ=y diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index d018984..04fc602 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -17,6 +17,7 @@ #ifdef CONFIG_SPL_BUILD #undef CONFIG_DM_GPIO #undef CONFIG_DM_MMC +#undef CONFIG_BLK #define CONFIG_MXC_UART_BASE UART1_BASE #endif