From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peng Fan Date: Wed, 10 Jan 2018 08:55:15 +0800 Subject: [U-Boot] [PATCH V3 00/31] imx: add i.MX8M support and i.MX8MQ EVK In-Reply-To: References: <20180109121151.31060-1-peng.fan@nxp.com> Message-ID: <20180110005515.GA22602@shlinux2> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Diego, On Tue, Jan 09, 2018 at 03:42:29PM -0200, Diego Dorta wrote: >Hi peng, > >2018-01-09 10:11 GMT-02:00 Peng Fan : >> This patchset is to add i.MX8M and i.MX8MQ-EVK support >> >> V3: >> This patchset based on https://patchwork.ozlabs.org/patch/855027/ >> "arm: imx: Rework i.MX specific commands to be excluded from SPL" from >> Tom to avoid this patchset fail apply after Tom's patch merged. >> >> Previously "power: pmic/regulator allow dm be omited by SPL" broke other >> boards, in V3 patchset, only touch pfuze100 related options. >> >> Sharing code about get mac from fuse between mx7/mx8m >> Sharing code about bootaux between mx6/7/mx8m >> Sharing code about cpu speed grade between mx7/mx8m >> Sharing code about get boot device between mx7/mx8m >> Sharding code about mmc env between mx7/mx8m >> >> Introduce wait_mask_set/clr_timeout to avoid deadloop in clock pll configuration >> >> Correct authorship of fix building warning on fec arm64, patch 27/31. >> >> Switch to use structure for DDR Controller. For DDR PHY registers, >> there are about more than 10 thousands registers, I could not convert >> them with detailed register name, and the script is generated from IC team, >> So I use regs[0xxxxx] arrays here fo easily converting between IC team >> released script and uboot ddr phy cod. >> >> Improve REAMME file to include where to download firmware and imx-mkimage >> and how to build >> >> Add review tags on the V2 patchset. >> >> Hope this patchset could catch up next release :) >> >> V2: >> >> patch 02/23: convert to structure, drop is_boot_from_usb and >> disconnect_from_usb >> patch 04/23: conver to use structure for the clock driver, removed the >> CCM_xxx macros. Add static for local functons. >> Add init_usdhc_clk, init_uart_clk and etc to not enable >> them all at default. >> patch 05/23: Add more commit msg for the sip part. >> patch 08/23: Merge the spl boot device with i.MX7 >> patch 12/23: Typo fix and return error fix from Heiko for the SoC related part >> patch 22/23: Use a weak function ddr_init. If patch 23/23 could not be >> accepted at current stage, to make others still be could be >> compiled. >> >> The patchset depends on >> https://patchwork.ozlabs.org/patch/841934/ >> https://patchwork.ozlabs.org/patch/841958/ >> to be tested on real hardware. >> >> V1: >> >> patch: "power: pmic.h: include dm/ofnode.h" and >> "power: pmic/regulator allow dm be omited by SPL" is previously reviewed >> in mailist to not merged. If no issue, you may pick it up. >> >> The board support is a large patch because of the ddr related code. >> If it is not good, please first review/pick-up other patches if they >> are ok. >> >> Peng Fan (30): >> imx: add i.MX8M into Kconfig >> imx: mx8m: add register definition header file >> imx: mx8m: add pin header file >> time: add wait_mask_set/clr_timeout helper functions >> imx: mx8m: add clock driver >> imx: add sip function >> imx: boot_mode: add USB_BOOT entry >> imx: cpu: update cpu file to support i.MX8M >> imx: spl: implement spl_boot_device for i.MX8M >> imx: add i.MX8MQ SoC Revision and is_mx8m helper >> imx: add pad settings bit definition for i.MX8M >> imx: cpu: move speed/temp to common cpu >> imx: cpu: add cpu speed/grade for i.MX8M >> imx: refactor imx_get_mac_from_fuse >> imx: cleanup bootaux >> imx: bootaux: support i.MX8M >> imx: mx7: move get_boot_device to cpu.c >> imx: cpu: support get_boot_device for i.MX8M >> imx: mx7: move mmc env code to mmc_env.c >> imx: mx8m: add soc related settings and files >> imx: makefile: compile files for i.MX8M >> misc: ocotp: add i.MX8M support >> mmc: fsl_esdhc: support i.MX8M >> imx: lcdif: include i.MX8M >> gpio: mxc: add i.MX8M support >> net: fec: do not access reserved register for i.MX8M >> imx: imx8mq: add dtsi file >> power: pmic/regulator allow dm be omitted by SPL >> imx: mx8m: add ddr controller memory map >> imx: add i.MX8MQ EVK support > >I've tried to apply your patches on v2018.01 and I got this error: > >u-boot$ git am imx-add-i.MX8M-support-and-i.MX8MQ-EVK.patch >Applying: imx: add i.MX8M into Kconfig >Applying: imx: mx8m: add register definition header file >Applying: imx: mx8m: add pin header file >Applying: time: add wait_mask_set/clr_timeout helper functions >Applying: imx: mx8m: add clock driver >Applying: imx: add sip function >Applying: imx: boot_mode: add USB_BOOT entry >Applying: imx: cpu: update cpu file to support i.MX8M >Applying: imx: spl: implement spl_boot_device for i.MX8M >Applying: imx: add i.MX8MQ SoC Revision and is_mx8m helper >Applying: imx: add pad settings bit definition for i.MX8M >Applying: imx: cpu: move speed/temp to common cpu >Applying: imx: cpu: add cpu speed/grade for i.MX8M >Applying: imx: refactor imx_get_mac_from_fuse >error: patch failed: arch/arm/mach-imx/Makefile:25 >error: arch/arm/mach-imx/Makefile: patch does not apply >Patch failed at 0014 imx: refactor imx_get_mac_from_fuse >The copy of the patch that failed is found in: .git/rebase-apply/patch >When you have resolved this problem, run "git am --continue". >If you prefer to skip this patch, run "git am --skip" instead. >To restore the original branch and stop patching, run "git am --abort". > >I also tried to apply manually and I got this: > >u-boot$ patch -p1 < imx-add-i.MX8M-support-and-i.MX8MQ-EVK.patch >patching file arch/arm/Kconfig >patching file arch/arm/Makefile >patching file arch/arm/mach-imx/mx8m/Kconfig >patching file arch/arm/include/asm/arch-mx8m/imx-regs.h >patching file arch/arm/include/asm/arch-mx8m/mx8mq_pins.h >patching file include/linux/delay.h >patching file lib/time.c >patching file arch/arm/include/asm/arch-mx8m/clock.h >patching file arch/arm/mach-imx/mx8m/Makefile >patching file arch/arm/mach-imx/mx8m/clock.c >patching file arch/arm/mach-imx/mx8m/clock_slice.c >patching file arch/arm/include/asm/mach-imx/sys_proto.h >patching file arch/arm/mach-imx/Makefile >Hunk #1 succeeded at 122 (offset -2 lines). >patching file arch/arm/mach-imx/sip.c >patching file include/imx_sip.h >patching file arch/arm/include/asm/mach-imx/boot_mode.h >patching file arch/arm/mach-imx/cpu.c >patching file arch/arm/mach-imx/spl.c >patching file arch/arm/include/asm/arch-imx/cpu.h >patching file arch/arm/include/asm/mach-imx/sys_proto.h >patching file arch/arm/include/asm/mach-imx/iomux-v3.h >patching file arch/arm/mach-imx/cpu.c >patching file arch/arm/mach-imx/mx7/soc.c >patching file arch/arm/mach-imx/cpu.c >patching file arch/arm/mach-imx/Makefile >Hunk #1 FAILED at 25. >1 out of 1 hunk FAILED -- saving rejects to file arch/arm/mach-imx/Makefile.rej >patching file arch/arm/mach-imx/mac.c >patching file arch/arm/mach-imx/mx6/soc.c >patching file arch/arm/mach-imx/mx7/soc.c >patching file arch/arm/include/asm/arch-mx6/imx-regs.h >patching file arch/arm/include/asm/arch-mx7/imx-regs.h >patching file arch/arm/mach-imx/imx_bootaux.c >Hunk #1 FAILED at 5. >1 out of 1 hunk FAILED -- saving rejects to file >arch/arm/mach-imx/imx_bootaux.c.rej >patching file arch/arm/mach-imx/mx6/soc.c >patching file arch/arm/mach-imx/mx7/soc.c >patching file arch/arm/mach-imx/imx_bootaux.c >Hunk #1 FAILED at 6. >Hunk #2 FAILED at 24. >Hunk #3 FAILED at 40. >3 out of 3 hunks FAILED -- saving rejects to file >arch/arm/mach-imx/imx_bootaux.c.rej >patching file arch/arm/include/asm/arch-mx7/imx-regs.h >patching file arch/arm/include/asm/mach-imx/boot_mode.h >patching file arch/arm/mach-imx/cpu.c >patching file arch/arm/mach-imx/mx7/soc.c >patching file arch/arm/mach-imx/cpu.c >patching file arch/arm/mach-imx/Makefile >patching file arch/arm/mach-imx/mmc_env.c >patching file arch/arm/mach-imx/mx7/soc.c >patching file arch/arm/include/asm/arch-mx8m/crm_regs.h >patching file arch/arm/include/asm/arch-mx8m/gpio.h >patching file arch/arm/include/asm/arch-mx8m/sys_proto.h >patching file arch/arm/mach-imx/Makefile >Hunk #1 succeeded at 129 (offset -3 lines). >patching file arch/arm/mach-imx/mx8m/Makefile >patching file arch/arm/mach-imx/mx8m/lowlevel_init.S >patching file arch/arm/mach-imx/mx8m/soc.c >patching file arch/arm/mach-imx/Makefile >patching file drivers/misc/mxc_ocotp.c >patching file drivers/mmc/fsl_esdhc.c >patching file arch/arm/include/asm/mach-imx/regs-lcdif.h >patching file drivers/gpio/mxc_gpio.c >patching file drivers/net/fec_mxc.c >patching file drivers/net/fec_mxc.c >patching file arch/arm/dts/fsl-imx8-ca53.dtsi >patching file arch/arm/dts/fsl-imx8mq.dtsi >patching file include/dt-bindings/clock/imx8mq-clock.h >patching file include/dt-bindings/pinctrl/pins-imx8mq.h >patching file drivers/power/pmic/Makefile >patching file drivers/power/regulator/Makefile >patching file arch/arm/include/asm/arch-mx8m/ddr.h >patching file arch/arm/dts/Makefile >patching file arch/arm/dts/fsl-imx8mq-evk.dts >patching file arch/arm/include/asm/arch-mx8m/ddr.h >patching file arch/arm/mach-imx/mx8m/Kconfig >patching file board/freescale/mx8mq_evk/Kconfig >patching file board/freescale/mx8mq_evk/Makefile >patching file board/freescale/mx8mq_evk/README >patching file board/freescale/mx8mq_evk/ddr/ddr_init.c >patching file board/freescale/mx8mq_evk/ddr/ddrphy_train.c >patching file board/freescale/mx8mq_evk/ddr/helper.c >patching file board/freescale/mx8mq_evk/mx8mq_evk.c >patching file board/freescale/mx8mq_evk/spl.c >patching file configs/mx8mq_evk_defconfig >patching file include/configs/mx8mq_evk.h > >Is this right? How can I avoid this error? As noted in cover-letter, This patchset based on https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom to avoid this patchset fail apply after Tom's patch merged. I use imx/master branch of Stefano's tree. Because of recent GPT_TIMER entry in arch/arm/mach-imx/Makefile, applying Tom's patch needs a small modification. After that, you could apply the whole patchset. Thanks, Peng. >> > >Thanks, >Diego >_______________________________________________ >U-Boot mailing list >U-Boot at lists.denx.de >https://lists.denx.de/listinfo/u-boot --