From patchwork Wed Jul 17 10:06:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1133227 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="V2VVTAyZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45pY1B5D0Xz9sDB for ; Wed, 17 Jul 2019 20:10:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 21F5BC21F00; Wed, 17 Jul 2019 10:09:24 +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 82215C21E4E; Wed, 17 Jul 2019 10:06:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D78C6C21DAF; Wed, 17 Jul 2019 10:06:23 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150075.outbound.protection.outlook.com [40.107.15.75]) by lists.denx.de (Postfix) with ESMTPS id 5AB86C21E13 for ; Wed, 17 Jul 2019 10:06:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgzVJvAaoTRfMo5HiVePW0Pkn0FUzVqnVtzTVeELXq5H1WFgy3fwS00sRRpenqIPlAuIhrrRQe7zzt4WU689YX7JmzeEx9wzkPRIbmc/SkGj6rrTy8WECLicqizeD09cyMQ7xiUsFVD+aopDc7pDhTKlXL30aA/Xg6hXWB5S+JyyG8SXgQwVdzv7laX5a9iRwbEIepL8Ymigu4nqPs9JiE8rUIv9vJ2+AmZZlCb5S+0znm8qwIHSM+uZl/b2Vsz61tXJMLBZRa+DTwveIx9YQpXbz8bU+iNEUl1jls5kdN07hFVjcQFOrYytQSNMNoWQQMzhFgem9OdlEw9g9cyYng== 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=7fR9116pYixOG/PUmMUwfJM6UK/h3ob7zT01XMkWvWE=; b=CiP3UHuBobR1pMZQ+E4hncTbSmoMzSsqRwXBYwfI1WHb8KxFDG+QCMdH5cQj2zIIM4BxW4s4iAodvtpXcuDTNaGq5fCJfjkLzmQIudvfD5vrwHWVPbRHzjp9psql64OPkgdb4yRagzWUTvZpensRQqNduiAGqm81lVChCZJTlB7uML/rwT1q3UtVLt63guj1l0vnmO5RvZUliF9jPGdgg1278z3uQ45t/QKiw1So+DuOkcoJV34BWcFXbMd8JeNgAiMDuh1qpM8cPu7nEbcC0NR9DOR0OWnrmygi8uPkeUm8DcpPJpSLRGDOyuIlvKSeR9woQ6yH5UOILbir4FYMBQ== 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=7fR9116pYixOG/PUmMUwfJM6UK/h3ob7zT01XMkWvWE=; b=V2VVTAyZiWKzgnRXMPPwg/XKjGzyyDlUmBjaOryn4Fvyap40oy02Tjz8CADFgpUycwAU4y6kIqrbina7uDPfdPay6JfKexEK7cu2spntJm1xT+R8Km286RT9H8Jbz9oU4iPBpLTTIUI5K7pSLVfxVj06YmWujPp1M3+MdtHv1aI= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5777.eurprd04.prod.outlook.com (20.178.118.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11; Wed, 17 Jul 2019 10:06:05 +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.2052.026; Wed, 17 Jul 2019 10:06:05 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 5/5] imx: add i.MX6ULZ board Thread-Index: AQHVPIc+jNeX91h7qECTpk1nu9Bajw== Date: Wed, 17 Jul 2019 10:06:04 +0000 Message-ID: <20190717102059.26278-5-peng.fan@nxp.com> References: <20190717102059.26278-1-peng.fan@nxp.com> In-Reply-To: <20190717102059.26278-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: HK0P153CA0023.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::35) 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: 8cbceefc-ac95-4310-8e30-08d70a9e6125 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:AM0PR04MB5777; x-ms-traffictypediagnostic: AM0PR04MB5777: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:262; x-forefront-prvs: 01018CB5B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(136003)(346002)(376002)(39860400002)(366004)(199004)(189003)(316002)(99286004)(14454004)(8676002)(1076003)(6116002)(110136005)(3846002)(54906003)(81156014)(256004)(25786009)(2501003)(81166006)(8936002)(66066001)(305945005)(478600001)(68736007)(6436002)(2906002)(50226002)(44832011)(102836004)(64756008)(66446008)(5660300002)(486006)(6486002)(53936002)(26005)(66946007)(476003)(6512007)(2616005)(66476007)(66556008)(76176011)(71200400001)(36756003)(14444005)(7736002)(71190400001)(4326008)(86362001)(186003)(386003)(6506007)(11346002)(52116002)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5777; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: MTjKD36tIfw4lc6txk/fySqrUYJoAg34UezVAcMN3wUMGgKcc5bLT9GH5JGYVNOZiuEVoQiOUzDxh4opE8gSeJntNrc/u0Z/YhZ5QDAAdxa5IbR75tPZhU0g4dj2lbOMVI2brIMiO7rHpK8kju5jbAp4lkJ1Oc2IrmEmDGaI7az5PDjLI5hHqP/34fnOTcP9LxVzMWsnoMcA7zwPsjRGHXRxPO5V32CBoUcvtb0SZpOo8TPwwe3xWvrHsQ4K8mww6ma1A1+w5hTmOpiG1ifQCjvq22s+PWsH5yOU/ke/pho/MkxRNBrEI6Ds++6PsnGpzoE8qry+KPCIleSxMRyVXwmarhdShIOgqUZ1bMVZqtm5R5Uj5yHg27yE6pvd8FvT/YhemuehDWrAlkNEBa/77+i7e97yc8FjWQznX6FLhPo= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cbceefc-ac95-4310-8e30-08d70a9e6125 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2019 10:06:04.8965 (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: AM0PR04MB5777 Cc: "u-boot@lists.denx.de" , dl-uboot-imx , "sr@denx.de" Subject: [U-Boot] [PATCH 5/5] imx: add i.MX6ULZ board 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" Add i.MX6ULZ board support. the i.MX6ULZ is SW compatible with i.MX6ULL. so most code of i.MX6ULL can be reused by i.MX6ULZ. Signed-off-by: Peng Fan --- arch/arm/dts/imx6ulz-14x14-evk.dts | 22 ++++++++++++++++++ board/freescale/mx6ullevk/mx6ullevk.c | 10 ++++++-- configs/mx6ulz_14x14_evk_defconfig | 44 +++++++++++++++++++++++++++++++++++ include/configs/mx6ullevk.h | 13 ++++++++++- 4 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/imx6ulz-14x14-evk.dts create mode 100644 configs/mx6ulz_14x14_evk_defconfig diff --git a/arch/arm/dts/imx6ulz-14x14-evk.dts b/arch/arm/dts/imx6ulz-14x14-evk.dts new file mode 100644 index 0000000000..483d9732c0 --- /dev/null +++ b/arch/arm/dts/imx6ulz-14x14-evk.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// +// Copyright 2018 NXP. + +/dts-v1/; + +#include "imx6ulz.dtsi" +#include "imx6ul-14x14-evk.dtsi" + +/delete-node/ &fec1; +/delete-node/ &fec2; +/delete-node/ &can1; +/delete-node/ &can2; +/delete-node/ &lcdif; +/delete-node/ &tsc; + +/ { + model = "Freescale i.MX6 ULZ 14x14 EVK Board"; + compatible = "fsl,imx6ulz-14x14-evk", "fsl,imx6ull", "fsl,imx6ulz"; + + /delete-node/ panel; +}; diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 1f0f70efbd..0a35eeb95e 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -83,7 +83,10 @@ int board_late_init(void) #endif #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - env_set("board_name", "EVK"); + if (is_cpu_type(MXC_CPU_MX6ULZ)) + env_set("board_name", "ULZ-EVK"); + else + env_set("board_name", "EVK"); env_set("board_rev", "14X14"); #endif @@ -92,7 +95,10 @@ int board_late_init(void) int checkboard(void) { - puts("Board: MX6ULL 14x14 EVK\n"); + if (is_cpu_type(MXC_CPU_MX6ULZ)) + puts("Board: MX6ULZ 14x14 EVK\n"); + else + puts("Board: MX6ULL 14x14 EVK\n"); return 0; } diff --git a/configs/mx6ulz_14x14_evk_defconfig b/configs/mx6ulz_14x14_evk_defconfig new file mode 100644 index 0000000000..f647d72c6e --- /dev/null +++ b/configs/mx6ulz_14x14_evk_defconfig @@ -0,0 +1,44 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TARGET_MX6ULL_14X14_EVK=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg" +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_BOUNCE_BUFFER=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_GPIO=y +CONFIG_DM_74X164=y +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC_IMX=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_MODE=0 +CONFIG_SF_DEFAULT_SPEED=40000000 +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y +CONFIG_DM_REGULATOR=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 1fc5c24dec..f5f3de6cd4 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -55,7 +55,7 @@ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx6ull-14x14-evk.dtb\0" \ + "fdt_file=undefined\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -87,6 +87,16 @@ "else " \ "bootz; " \ "fi;\0" \ + "findfdt="\ + "if test $fdt_file = undefined; then " \ + "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \ + "setenv fdt_file imx6ulz-14x14-evk.dtb; fi; " \ + "if test $board_name = EVK && test $board_rev = 14X14; then " \ + "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \ + "if test $fdt_file = undefined; then " \ + "echo WARNING: Could not determine dtb to use; " \ + "fi; " \ + "fi;\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ @@ -113,6 +123,7 @@ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ + "run findfdt;" \ "mmc dev ${mmcdev};" \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \