From patchwork Mon Jul 22 01:24:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1134633 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="PYeolHgm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45sPF24QKpz9s8m for ; Mon, 22 Jul 2019 11:30:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4B723C21EB1; Mon, 22 Jul 2019 01:30:29 +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=SPF_HELO_PASS, 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 E6817C21C51; Mon, 22 Jul 2019 01:24:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0ED7EC21C2C; Mon, 22 Jul 2019 01:24:44 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10044.outbound.protection.outlook.com [40.107.1.44]) by lists.denx.de (Postfix) with ESMTPS id 10C33C21C27 for ; Mon, 22 Jul 2019 01:24:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NIurFIxHrKgO4HSAIz5yDezmnQQTpMS+t8wTAEVkyB66Qp3pqFg/ZTjLG+HEx2s5yYv0spnS60YQJfRGU23a3ZQUKorWheoWPdxrp1VjbNVrTX0Ssk8wWkGMPDV87veu8K+m1M0tNF/c09wPGKPEomRF3cV2Z+B6K8I9blqKeiiHMyC7TiXdFwNp9Q4gMUnF104lv4uxRGcCcHPzSLaRu22c3uSbiQC+F9t2J+e7kz+79JfnQV9SmapEIXuLCvIkuSDiiqYl+/SxTdmCbGKK1f7ReGoUyfp6tbEzWcFmVuw4xoLXJv/+xnj+CYlaBG1CLHPT46ebJpRbof9RWoJX0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kCR+2sTG9VCGRuGvx+Umgma/w7LKZmMr5YvPqYiRJbQ=; b=cJKISaGnXsadYzbr6H0b5DL1sP9Joh5QCJEsJNax25gGtzCemZf7a6v/JiHGNfy+DoVf1EwMeoeyPSwDAfkrQ7zc2as6VXMfQVWNFBh0l4lKL52yZhs1NYFkAGRTVBHhvcDQL7C2JSkeIPo8ozFmiMD5O3VvxPLwo4tUxTsyiPVgz2ufnzEf829u4ZtN0o2Ga2ClyZaxo6kkOJYi3IQpmY/qkXGh/7Nm7GfIYcsvUl43OwGpevOB4VuG2FWm14kjY4E7Vy6a1B47Uu2PXp4GAT0nQpWkFkAxhmZn+/7iyjRpHX63Ipti05Rd9txeFKXDrbUEPy5DdeE5/2zBjh9dqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kCR+2sTG9VCGRuGvx+Umgma/w7LKZmMr5YvPqYiRJbQ=; b=PYeolHgmpynZwVYjQEpZvfXXPX9bTuZcPRxqIg+pY4BTmg9ZtMPGh/kMQjuEgq9Wuh5iD9sXjhjPHAt8VULVzUMMBDKc5wnPWQhH7HsAa7Pk2cOBTp6b183X7Evx+C+7DkgwjpJ1PvVLZ7WBuR13FV4FAZqYl+gcYEAVQcOjtnM= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6852.eurprd04.prod.outlook.com (52.132.213.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.15; Mon, 22 Jul 2019 01:24:39 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47%5]) with mapi id 15.20.2094.011; Mon, 22 Jul 2019 01:24:39 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH RESEND 02/14] i.MX7ULP: evk: Modify FDT file to disable SD3.0 for usb boot Thread-Index: AQHVQCw7J+Ydz0PSwk6Zt64z+Z8WfA== Date: Mon, 22 Jul 2019 01:24:39 +0000 Message-ID: <20190722013941.30857-2-peng.fan@nxp.com> References: <20190722013941.30857-1-peng.fan@nxp.com> In-Reply-To: <20190722013941.30857-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:202::28) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0e62caf9-dfbf-4906-3aae-08d70e435ded x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB6852; x-ms-traffictypediagnostic: AM0PR04MB6852: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4502; x-forefront-prvs: 01068D0A20 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(189003)(199004)(2906002)(52116002)(476003)(71190400001)(71200400001)(26005)(53936002)(68736007)(102836004)(99286004)(446003)(44832011)(7736002)(2616005)(11346002)(76176011)(25786009)(6506007)(386003)(305945005)(186003)(486006)(4326008)(6512007)(54906003)(1076003)(81166006)(81156014)(3846002)(6486002)(6116002)(256004)(36756003)(478600001)(66946007)(66446008)(66476007)(66556008)(64756008)(110136005)(8936002)(6436002)(316002)(66066001)(8676002)(2501003)(86362001)(5660300002)(50226002)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6852; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: zeNY/JcinFTuXlr9+XPg0L+d4n62AwDfGNwuQrep0ORSI5cPLRtTjdEGXv5XR5nSy6O3MvjVxpiUqkYnQPuL+X49Q/jWcvn2b+EpFeNA1ld76lDPYkepldKcyJx7cNZMjCfyyUZmQLZeykX2gvRpBx3ncR3kXola6p8+2lcxSI8VX8y4wiJ1N+o8esGKUCfEKJV3Ha+CHe7fZy0jGT2zf2/Zlk9l9M6a/Dev6Z3WTu0K1yDCABv0XcoRZ9VjtB0sg3l6RX3MdT8taDkrfJ/XLXk94BgozJIkyz6AXUMeOpGei1Gr5npif8l9yzat6FprXz9GXwsrmYlp0qObw/zxLp7SvdfWtrKUQ9fGkcVzZlcKTnqd7exr60fC8mxViwJmbulBvQtgUoYe6+L0ASAV6zssEkcpCiiZ4XoeIPzZ3Kc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e62caf9-dfbf-4906-3aae-08d70e435ded X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2019 01:24:39.8899 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6852 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH RESEND 02/14] i.MX7ULP: evk: Modify FDT file to disable SD3.0 for usb boot 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" Since the SD3.0 kernel driver needs M4 image support, this causes problem for usb boot booting into kernel. To decouple the relationship, we modify the FDT file in u-boot to disable SD3.0. So the kernel won't depend on M4 image. Signed-off-by: Peng Fan --- board/freescale/mx7ulp_evk/mx7ulp_evk.c | 47 +++++++++++++++++++++++++++++++++ configs/mx7ulp_evk_defconfig | 1 + 2 files changed, 48 insertions(+) diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c index 3a12fe1551..7527263577 100644 --- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c +++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c @@ -4,10 +4,12 @@ */ #include +#include #include #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -45,3 +47,48 @@ int board_init(void) return 0; } + +#if IS_ENABLED(CONFIG_OF_BOARD_SETUP) +int ft_board_setup(void *blob, bd_t *bd) +{ + const char *path; + int rc, nodeoff; + + if (get_boot_device() == USB_BOOT) { + path = fdt_get_alias(blob, "mmc0"); + if (!path) { + puts("Not found mmc0\n"); + return 0; + } + + nodeoff = fdt_path_offset(blob, path); + if (nodeoff < 0) + return 0; + + printf("Found usdhc0 node\n"); + if (fdt_get_property(blob, nodeoff, "vqmmc-supply", + NULL) != NULL) { + rc = fdt_delprop(blob, nodeoff, "vqmmc-supply"); + if (!rc) { + puts("Removed vqmmc-supply property\n"); +add: + rc = fdt_setprop(blob, nodeoff, + "no-1-8-v", NULL, 0); + if (rc == -FDT_ERR_NOSPACE) { + rc = fdt_increase_size(blob, 32); + if (!rc) + goto add; + } else if (rc) { + printf("Failed to add no-1-8-v property, %d\n", rc); + } else { + puts("Added no-1-8-v property\n"); + } + } else { + printf("Failed to remove vqmmc-supply property, %d\n", rc); + } + } + } + + return 0; +} +#endif diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index d4eba65ac0..b5ad025ab4 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y CONFIG_HUSH_PARSER=y