From patchwork Mon Feb 27 14:28:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=A9bastien_Szymanski?= X-Patchwork-Id: 732857 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vX3px2tJfz9s8x for ; Tue, 28 Feb 2017 01:23:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2227BC21C29; Mon, 27 Feb 2017 14:23:33 +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.7 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_SBL, URIBL_SBL_A autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D49EFC21C29; Mon, 27 Feb 2017 14:23:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AD1A9C21C1F; Mon, 27 Feb 2017 14:23:29 +0000 (UTC) Received: from 3.mo2.mail-out.ovh.net (3.mo2.mail-out.ovh.net [46.105.58.226]) by lists.denx.de (Postfix) with ESMTPS id 583A3C21C1F for ; Mon, 27 Feb 2017 14:23:29 +0000 (UTC) Received: from player157.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id 307B056B91 for ; Mon, 27 Feb 2017 15:23:28 +0100 (CET) Received: from [192.168.0.230] (199.11.140.77.rev.sfr.net [77.140.11.199]) (Authenticated sender: sebastien.szymanski@armadeus.com) by player157.ha.ovh.net (Postfix) with ESMTPSA id C88CA5000B0; Mon, 27 Feb 2017 15:23:23 +0100 (CET) To: Stefano Babic , Jagan Teki References: <1487931326-10199-1-git-send-email-jagan@openedev.com> <6208f10e-8159-1a59-671b-dbf456776e07@denx.de> From: =?UTF-8?Q?S=c3=a9bastien_Szymanski?= Message-ID: <6788b18e-bb55-ac2c-9547-f1f734a014f0@armadeus.com> Date: Mon, 27 Feb 2017 15:28:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <6208f10e-8159-1a59-671b-dbf456776e07@denx.de> X-Ovh-Tracer-Id: 3918131679323313322 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvdeigdeifecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Cc: u-boot@lists.denx.de, Matteo Lisi Subject: Re: [U-Boot] [PATCH v4 00/15] i.MX6: Engicam i.CoreM6/Is.IoT eMMC boot support 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" Hello, On 02/26/2017 12:54 PM, Stefano Babic wrote: > On 24/02/2017 11:15, Jagan Teki wrote: >> From: Jagan Teki >> >> Changes for v3: >> - Rebase on master >> - Fix checkpatch.pl Warnings >> - Add IMX6_BMODE_UART macro for uart bootmode >> - Remove value assignment in enum, since all enum list is order >> >> Changes for v3: >> - Update IMX6_BMODE_* shift macros with real number instead of bitops >> - %s/IMX6_BMODE_SERIAL/IMX6_BMODE_SERIAL_ROM >> - Assign enums with numbers so-that it can easy to see same in RM >> - Update board MAINTAINERS file with imx6ul-isiot-emmc.dts file >> >> Changes for v2: >> - Rebase on master >> - Add Is.IoT eMMC boot patches >> - Add few mmc env patches on board >> >> Jagan Teki (15): >> imx6: Add imx6_src_get_boot_mode >> imx: spl: Update NAND bootmode detection bit >> imx: Use IMX6_BMODE_* macros instead of numericals >> imx6: Add src_base structure define macro >> imx6: isiotmx6ul: Update SPL board boot order for eMMC >> i.MX6UL: isiot: Add eMMC boot support >> i.MX6UL: isiot: Add modeboot env via board_late_init >> i.MX6UL: isiot: Add mmc_late_init >> i.MX6UL: isiot: Switch the mmc env based on devno >> arm: dts: imx6qdl-icore-rqs: Add eMMC node >> imx6: icorem6_rqs: Update SPL board boot order for eMMC >> imx6: icorem6_rqs: Add eMMC boot support >> i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init >> i.MX6Q: icorem6_rqs: Add mmc_late_init >> i.MX6Q: isiot: Switch the mmc env based on devno >> >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/imx6qdl-icore-rqs.dtsi | 22 ++++++ >> arch/arm/dts/imx6ul-isiot-emmc.dts | 77 +++++++++++++++++++++ >> arch/arm/imx-common/init.c | 10 +++ >> arch/arm/imx-common/spl.c | 49 ++++++++------ >> arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + >> arch/arm/include/asm/imx-common/sys_proto.h | 47 +++++++++++++ >> board/engicam/icorem6_rqs/icorem6_rqs.c | 96 +++++++++++++++++++++++++- >> board/engicam/isiotmx6ul/MAINTAINERS | 2 + >> board/engicam/isiotmx6ul/isiotmx6ul.c | 101 +++++++++++++++++++++++++++- >> configs/imx6dl_icore_rqs_mmc_defconfig | 1 + >> configs/imx6q_icore_rqs_mmc_defconfig | 1 + >> configs/imx6ul_isiot_emmc_defconfig | 40 +++++++++++ >> configs/imx6ul_isiot_mmc_defconfig | 1 + >> configs/imx6ul_isiot_nand_defconfig | 1 + >> include/configs/imx6qdl_icore_rqs.h | 36 +++++----- >> include/configs/imx6ul_isiot.h | 40 +++++------ >> 17 files changed, 462 insertions(+), 65 deletions(-) >> create mode 100644 arch/arm/dts/imx6ul-isiot-emmc.dts >> create mode 100644 configs/imx6ul_isiot_emmc_defconfig >> > > Applied to u-boot-imx, thanks ! The dts files fail to build: Error: ./arch/arm/dts/imx6ul-isiot.dtsi:43.1-9 syntax error FATAL ERROR: Unable to parse input tree scripts/Makefile.lib:322: recipe for target 'arch/arm/dts/imx6ul-isiot-mmc.dtb' failed make[2]: *** [arch/arm/dts/imx6ul-isiot-mmc.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... Error: ./arch/arm/dts/imx6ul-isiot.dtsi:43.1-9 syntax error FATAL ERROR: Unable to parse input tree scripts/Makefile.lib:322: recipe for target 'arch/arm/dts/imx6ul-isiot-emmc.dtb' failed make[2]: *** [arch/arm/dts/imx6ul-isiot-emmc.dtb] Error 1 Error: ./arch/arm/dts/imx6ul-isiot.dtsi:43.1-9 syntax error FATAL ERROR: Unable to parse input tree scripts/Makefile.lib:322: recipe for target 'arch/arm/dts/imx6ul-isiot-nand.dtb' failed make[2]: *** [arch/arm/dts/imx6ul-isiot-nand.dtb] Error 1 dts/Makefile:36: recipe for target 'arch-dtbs' failed make[1]: *** [arch-dtbs] Error 2 Makefile:860: recipe for target 'dts/dt.dtb' failed make: *** [dts/dt.dtb] Error 2 I think that's because there is '/dts-v1/;' in the imx6ul-isiot.dtsi file and in imx6ul-isiot-*.dts files. With this change: The compilation passes. Best regards, > > Best regards, > Stefano > diff --git a/arch/arm/dts/imx6ul-isiot.dtsi b/arch/arm/dts/imx6ul-isiot.dtsi index 346079a..9a3c35c 100644 --- a/arch/arm/dts/imx6ul-isiot.dtsi +++ b/arch/arm/dts/imx6ul-isiot.dtsi @@ -40,8 +40,6 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -/dts-v1/; - #include #include #include "imx6ul.dtsi"