From: Joris Offouga Date: Mon, 16 Sep 2019 12:55:43 +0200 Subject: [U-Boot] [GIT PULL] Pull request: u-boot-imx u-boot-imx-20190916 In-Reply-To: References: Message-ID: <57b7750a-238e-ae5a-1513-3c141e94f9dc@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de I build with success dwarf board and nymph board and i update my patch with your master branch : https://github.com/jorisoffouga/u-boot/commits/pico-imx7/dmvideo also I noticed that dwarf cards and nymph cards do not have dm_usb, this is done for pi and hobbit Best regards, Joris Offouga Le 16/09/2019 à 10:48, Stefano Babic a écrit : > On 16/09/19 10:43, Joris OFFOUGA wrote: >> Hi Stefano, >> >> Thanks, > I have a separate branch for my "next" master and your patches break the > dwarf /nymph boards: > > arm: + pico-nymph-imx7d > +drivers/built-in.o: In function `cfg_video_init': > +drivers/video/cfb_console.c:2024: undefined reference to `video_hw_init' > +arm-poky-linux-gnueabi-ld.bfd: BFD (GNU Binutils) 2.28.0.20170307 > assertion fail ../../bfd/elf32-arm.c:9512 > +make[1]: *** [u-boot] Error 1 > +make: *** [sub-make] Error 2 > arm: + pico-dwarf-imx7d > +drivers/built-in.o: In function `cfg_video_init': > +drivers/video/cfb_console.c:2024: undefined reference to `video_hw_init' > +arm-poky-linux-gnueabi-ld.bfd: BFD (GNU Binutils) 2.28.0.20170307 > assertion fail ../../bfd/elf32-arm.c:9512 > +make[1]: *** [u-boot] Error 1 > +make: *** [sub-make] Error 2 > > Can you take a lookt at it ? > > Regards, > Stefano > > >> Regards, >> Joris Offouga >> >> Le lun. 16 sept. 2019 à 10:39, Stefano Babic > > a écrit : >> >> On 16/09/19 10:16, Joris OFFOUGA wrote: >> > Hi Stefano, >> > >> > You don't apply my series in your PR? >> > >> >> No, I am applying them on top of it and then I send a new PR. >> >> Regards, >> Stefano >> >> > Best Regards, >> > Joris Offouga >> > >> > Le lun. 16 sept. 2019 à 10:13, Stefano Babic > >> > >> a écrit : >> > >> >     Hi Tom, >> > >> >     please pull from u-boot-imx, thanks. >> > >> >     There is still a broken board (imx6dl_mamoj) - it will be >> fixed later. >> > >> >     The following changes since commit >> >     5ba8b1254311d00e2bdd9e227b78bdb7e89e69dd: >> > >> >       Merge tag 'u-boot-rockchip-20190912' of >> >     https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip >> (2019-09-11 >> >     23:08:34 -0400) >> > >> >     are available in the Git repository at: >> > >> >       https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git >> >     tags/u-boot-imx-20190916 >> > >> >     for you to fetch changes up to >> a49022353fb9a1a9705b0d6b9a31e13b20824ef6: >> > >> >       imx: fix missing MAINTAINERS pico boards (2019-09-16 >> 09:39:57 +0200) >> > >> >     ---------------------------------------------------------------- >> >     u-boot-imx-20190916 >> >     ------------------- >> > >> >     - Technexion boards >> >     - fix in HABv4 >> >     - MX8 container file >> >     - Fix for Toradex boards >> >     - i.MX7ULP fixes >> > >> >     ---------------------------------------------------------------- >> >     Anatolij Gustschin (1): >> >           imx: sksimx6_defconfig: remove SPL misc option to fix >> build error >> > >> >     Bai Ping (2): >> >           i.MX7ULP: Fix system reset after a7 rtc alarm expired. >> >           i.MX7ULP: Correct the clock index >> > >> >     Breno Matheus Lima (4): >> >           Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig >> >           imx6: spl: Reduce SPL limit size in case >> CONFIG_SECURE_BOOT is >> >     enabled >> >           imx: configs: Cleanup CONFIG_SECURE_BOOT comments >> >           habv4: tools: Avoid hardcoded CSF size for SPL targets >> > >> >     Fabio Berton (1): >> >           pico-imx7d: Sync pico-hobbit-imx7d_defconfig >> > >> >     Fabio Estevam (9): >> >           mx6sabresd: Reduce overall SPL size >> >           pico-imx6ul: Increase the CONFIG_ENV_OFFSET size >> >           pico-imx6ul: Add LCD support >> >           pico-imx6ul: Update the Falcon mode instructions >> >           pico-imx6ul: Provide a way to escape the Falcon mode >> >           pico-imx7d: Add instructions for booting in Falcon mode >> >           pico-imx7d: Provide a way to escape the Falcon mode >> >           logos: Add the TechNexion's logo >> >           pico: Convert to CONFIG_FSL_USDHC >> > >> >     Heinrich Schuchardt (8): >> >           efi_loader: EFI_FILE_PROTOCOL.Write() check args >> >           efi_loader: eliminate inline function ascii2unicode() >> >           efi_loader: correct reading of directories >> >           efi_loader: file size checks >> >           efi_loader: EFI_FILE_PROTOCOL rev 2 stub >> >           efi_loader: volume name in EFI_FILE_PROTOCOL.GetInfo() >> >           efi_loader: check parameters EFI_FILE_PROTOCOL.GetInfo() >> >           efi_loader: parameter checks EFI_FILE_PROTOCOL.SetInfo() >> > >> >     Otavio Salvador (3): >> >           pico-imx6ul: Add DWARF baseboard support >> >           pico-imx7d: Add DWARF baseboard support >> >           pico-imx7d: Add NYMPH baseboard support >> > >> >     Peng Fan (39): >> >           arm: dts: sync dts for i.MX6UL >> >           arm: dts: sync dts for i.MX6ULL >> >           arm: dts: import dts for i.MX6ULZ >> >           imx: add i.MX6ULZ cpu type >> >           imx: add i.MX6ULZ board >> >           imx: mx6ul_14x14_evk: Fix SPL boot >> >           imx: mx6ul_14x14_evk: convert to DM_VIDEO >> >           imx: mx6slevk: enable DM_SPI and DM_SPI_FLASH >> >           pinctrl: imx: use devfdt_get_addr_size_index >> >           tools: imx8mimage: fix HDMI/FIT parsing >> >           serial: Kconfig: make MXC_UART usable for MX7 and IMX8M >> >           spl: pass args to board_return_to_bootrom >> >           arm: dts: imx: fsl-imx8qm.dtsi: add gpio aliases to fix gpio >> >     command >> >           imx: i.MX7ULP: add get_boot_device >> >           i.MX7ULP: evk: Modify FDT file to disable SD3.0 for usb boot >> >           misc: Kconfig: make i.MX7ULP could use MXC_OCOTP >> >           i.MX7ULP: evk: Enable fuse comamnd >> >           i.MX7ULP: Add CPU revision check for B0 >> >           imx: mx6sabresd: fix usb start when DM enabled >> >           imx: imx6qdl: dtsi: move U-Boot specific change to >> u-boot.dtsi >> >           imx: imx8qxp_mek: fix >> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR >> >           imx8: support parsing i.MX8 Container file >> >           spl: mmc: support loading i.MX container format file >> >           imx: add container target >> >           imx8qxp_mek: switch to use container image >> >           imx8qm_mek: switch to use container image >> >           doc: imx: mkimage: introduce i.MX8 image format >> >           imx: sys_proto: add is_imx8qm helper >> >           imx8qm: power up SMMU >> >           imx8qm: correct fdt_file >> >           imx8: disable node when the resource is not owned >> >           configs: imx8qm/qxp_mek: enable CONFIG_OF_SYSTEM_SETUP >> >           imx: scu_api: add sc_rm_set_master_sid >> >           imx8: fdt: configure sid for masters >> >           imx8: save args passed from ATF >> >           imx8: fdt: add optee node >> >           imx: scu_api: add sc_pm_is_partition_started >> >           imx8: move i.MX8 cpu desc code to drivers/cpu/imx8_cpu.c >> >           imx8: cpu: fix mac fuse word for i.MX8QM >> > >> >     Priyanka Jain (1): >> >           MAINTAINERS: Change fsl-qoriq, mpc86xx, mpc85xx maintainers >> > >> >     Ricardo Salveti (4): >> >           apalis_imx6: add board_fit_config_name_match to support >> FIT in SPL >> >           apalis_imx6: fix broken fsl_esdhc_imx conversion >> >           imx: apalis_imx6: select MX6Q via Kconfig >> >           spl: imx: only use HAB if spl fit signature is not enabled >> > >> >     Robert Hancock (1): >> >           ARM: imx: Support larger SPL size on IMX6DQ >> > >> >     Stefano Babic (3): >> >           Merge branch 'nxp-imx-8-13' of >> https://github.com/MrVan/u-boot >> >     into master-next >> >           Revert "habv4: tools: Avoid hardcoded CSF size for SPL >> targets" >> >           imx: fix missing MAINTAINERS pico boards >> > >> >     Tom Rini (1): >> >           Merge tag 'efi-2019-10-rc4-4' of >> >     https://gitlab.denx.de/u-boot/custodians/u-boot-efi >> > >> >     Troy Kisky (5): >> >           nitrogen6x: migrate to using device tree >> >           configs: nitrogen6x: Add DM_MMC/DM_USB/AHCI support >> >           nitrogen6x: reserve used gpios >> >           configs: nitrogen6x: Add DM_GPIO support >> >           configs: nitrogen6x: Add DM_SPI/DM_SPI_FLASH support >> > >> >     Ye Li (8): >> >           i.MX7ULP: Fix PCC register bits mask and offset issue >> >           i.MX7ULP: Add CONFIG_MX7ULP to kconfig >> >           i.MX7ULP: Fix wrong i2c configuration name >> >           i.MX7ULP: Fix SPLL/APLL clock rate calculation issue >> >           i.MX7ULP: Workaround APLL PFD2 to 345.6Mhz >> >           i.MX7ULP: Set A7 core frequency to 500Mhz for B0 chip >> >           i.MX7ULP: Change clock rate calculation for NIC1 BUS and EXT >> >           imx8: Probe the SCU driver by using uclass function >> > >> >      MAINTAINERS                                       |    6 +- >> >      Makefile                                          |    8 + >> >      arch/arm/cpu/arm926ejs/spear/spl.c                |    5 +- >> >      arch/arm/dts/Makefile                             |   30 ++- >> >      arch/arm/dts/fsl-imx8qm.dtsi                      |    7 + >> >      arch/arm/dts/imx6dl-nitrogen6x.dts                |   15 ++ >> >      arch/arm/dts/imx6q-nitrogen6x.dts                 |   19 ++ >> >      arch/arm/dts/imx6q-sabrelite.dts                  |   19 ++ >> >      arch/arm/dts/imx6qdl-nitrogen6x.dtsi              |   69 ++++++ >> >      arch/arm/dts/imx6qdl-sabrelite.dtsi               |  384 >> >     ++++++++++++++++++++++++++++++++ >> >      arch/arm/dts/imx6qdl-u-boot.dtsi                  |    6 + >> >      arch/arm/dts/imx6qdl.dtsi                         |    3 - >> >      arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi         |   49 +++- >> >      arch/arm/dts/imx6ul-14x14-evk.dts                 |  422 >> >     +---------------------------------- >> >      arch/arm/dts/imx6ul-14x14-evk.dtsi                |  531 >> >     ++++++++++++++++++++++++++++++++++++++++++++ >> >      arch/arm/dts/imx6ul-pinfunc.h                     |  175 >> >     ++++++++------- >> >      arch/arm/dts/imx6ul.dtsi                          |  301 >> >     ++++++++++++++++--------- >> >      arch/arm/dts/imx6ull-14x14-evk.dts                |  523 >> >     +------------------------------------------ >> >      arch/arm/dts/imx6ull-pinfunc-snvs.h               |    7 +- >> >      arch/arm/dts/imx6ull-pinfunc.h                    |  116 >> ++++++---- >> >      arch/arm/dts/imx6ull.dtsi                         | 1184 >> > >>  ++++--------------------------------------------------------------------------------------------- >> >      arch/arm/dts/imx6ulz-14x14-evk.dts                |   22 ++ >> >      arch/arm/dts/imx6ulz.dtsi                         |   37 ++++ >> >      arch/arm/include/asm/arch-imx/cpu.h               |    1 + >> >      arch/arm/include/asm/arch-imx8/image.h            |   56 +++++ >> >      arch/arm/include/asm/arch-imx8/sci/rpc.h          |    5 +- >> >      arch/arm/include/asm/arch-imx8/sci/sci.h          |    2 + >> >      arch/arm/include/asm/arch-imx8/sys_proto.h        |    1 + >> >      arch/arm/include/asm/arch-mx7ulp/clock.h          |    2 +- >> >      arch/arm/include/asm/arch-mx7ulp/imx-regs.h       |   20 ++ >> >      arch/arm/include/asm/arch-mx7ulp/pcc.h            |    4 +- >> >      arch/arm/include/asm/arch-mx7ulp/scg.h            |    1 + >> >      arch/arm/include/asm/arch-mx7ulp/sys_proto.h      |    1 + >> >      arch/arm/include/asm/mach-imx/sys_proto.h         |    2 + >> >      arch/arm/mach-imx/Kconfig                         |    7 + >> >      arch/arm/mach-imx/Makefile                        |   14 +- >> >      arch/arm/mach-imx/cpu.c                           |    2 + >> >      arch/arm/mach-imx/imx8/Kconfig                    |   13 ++ >> >      arch/arm/mach-imx/imx8/Makefile                   |    7 +- >> >      arch/arm/mach-imx/imx8/cpu.c                      |  189 >> >     ++-------------- >> >      arch/arm/mach-imx/imx8/fdt.c                      |  292 >> >     ++++++++++++++++++++++++ >> >      arch/arm/mach-imx/imx8/lowlevel_init.S            |   36 +++ >> >      arch/arm/mach-imx/imx8/parse-container.c          |  120 >> ++++++++++ >> >      arch/arm/mach-imx/mx6/Kconfig                     |   10 + >> >      arch/arm/mach-imx/mx6/soc.c                       |    4 + >> >      arch/arm/mach-imx/mx7ulp/Kconfig                  |    6 +- >> >      arch/arm/mach-imx/mx7ulp/clock.c                  |    8 +- >> >      arch/arm/mach-imx/mx7ulp/scg.c                    |   63 +++++- >> >      arch/arm/mach-imx/mx7ulp/soc.c                    |   38 +++- >> >      arch/arm/mach-imx/spl.c                           |    2 + >> >      arch/arm/mach-rockchip/spl.c                      |    5 +- >> >      arch/arm/mach-rockchip/tpl.c                      |    5 +- >> >      board/boundary/nitrogen6x/MAINTAINERS             |    5 + >> >      board/boundary/nitrogen6x/nitrogen6x.c            |   30 ++- >> >      board/freescale/imx8qm_mek/README                 |    4 +- >> >      board/freescale/imx8qm_mek/uboot-container.cfg    |   13 ++ >> >      board/freescale/imx8qxp_mek/README                |    4 +- >> >      board/freescale/imx8qxp_mek/uboot-container.cfg   |   13 ++ >> >      board/freescale/mpc8536ds/MAINTAINERS             |    2 +- >> >      board/freescale/mpc8541cds/MAINTAINERS            |    2 +- >> >      board/freescale/mpc8544ds/MAINTAINERS             |    2 +- >> >      board/freescale/mpc8548cds/MAINTAINERS            |    2 +- >> >      board/freescale/mpc8555cds/MAINTAINERS            |    2 +- >> >      board/freescale/mpc8568mds/MAINTAINERS            |    2 +- >> >      board/freescale/mpc8569mds/MAINTAINERS            |    2 +- >> >      board/freescale/mpc8572ds/MAINTAINERS             |    2 +- >> >      board/freescale/mpc8610hpcd/MAINTAINERS           |    2 +- >> >      board/freescale/mpc8641hpcn/MAINTAINERS           |    2 +- >> >      board/freescale/mx6slevk/mx6slevk.c               |   28 --- >> >      board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c |   73 ++---- >> >      board/freescale/mx6ullevk/MAINTAINERS             |    1 + >> >      board/freescale/mx6ullevk/mx6ullevk.c             |   10 +- >> >      board/freescale/mx7ulp_evk/mx7ulp_evk.c           |   47 ++++ >> >      board/technexion/pico-imx6ul/README               |    8 +- >> >      board/technexion/pico-imx6ul/pico-imx6ul.c        |   55 ++++- >> >      board/technexion/pico-imx6ul/spl.c                |    4 + >> >      board/technexion/pico-imx7d/MAINTAINERS           |    2 + >> >      board/technexion/pico-imx7d/README                |   91 ++++++++ >> >      board/technexion/pico-imx7d/spl.c                 |    4 + >> >      board/toradex/apalis_imx6/apalis_imx6.c           |   14 +- >> >      common/spl/Kconfig                                |    3 +- >> >      common/spl/spl_bootrom.c                          |    7 +- >> >      common/spl/spl_mmc.c                              |   10 + >> >      configs/imx8mq_evk_defconfig                      |    1 + >> >      configs/imx8qm_mek_defconfig                      |    9 +- >> >      configs/imx8qxp_mek_defconfig                     |    6 +- >> >      configs/mx6qsabrelite_defconfig                   |   10 +- >> >      configs/mx6sabresd_defconfig                      |    4 +- >> >      configs/mx6slevk_defconfig                        |    2 + >> >      configs/mx6slevk_spinor_defconfig                 |    2 + >> >      configs/mx6slevk_spl_defconfig                    |    2 + >> >      configs/mx6ul_14x14_evk_defconfig                 |    2 +- >> >      configs/mx6ul_9x9_evk_defconfig                   |    2 +- >> >      configs/mx6ulz_14x14_evk_defconfig                |   44 ++++ >> >      configs/mx7ulp_evk_defconfig                      |    3 + >> >      configs/mx7ulp_evk_plugin_defconfig               |    2 + >> >      configs/nitrogen6dl2g_defconfig                   |   11 +- >> >      configs/nitrogen6dl_defconfig                     |   11 +- >> >      configs/nitrogen6q2g_defconfig                    |   11 +- >> >      configs/nitrogen6q_defconfig                      |   11 +- >> >      configs/nitrogen6s1g_defconfig                    |   11 +- >> >      configs/nitrogen6s_defconfig                      |   11 +- >> >      configs/pico-dwarf-imx6ul_defconfig               |   65 ++++++ >> >      configs/pico-dwarf-imx7d_defconfig                |   68 ++++++ >> >      configs/pico-hobbit-imx6ul_defconfig              |    1 + >> >      configs/pico-hobbit-imx7d_defconfig               |    2 +- >> >      configs/pico-imx6ul_defconfig                     |    1 + >> >      configs/pico-nymph-imx7d_defconfig                |   68 ++++++ >> >      configs/pico-pi-imx6ul_defconfig                  |    1 + >> >      configs/sksimx6_defconfig                         |    1 - >> >      doc/git-mailrc                                    |    8 +- >> >      doc/imx/mkimage/imx8image.txt                     |   45 ++++ >> >      drivers/cpu/Makefile                              |    1 + >> >      drivers/cpu/imx8_cpu.c                            |  182 >> >     +++++++++++++++ >> >      drivers/misc/Kconfig                              |    2 +- >> >      drivers/misc/imx8/scu_api.c                       |   49 ++++ >> >      drivers/pinctrl/nxp/pinctrl-imx.c                 |    4 +- >> >      drivers/serial/Kconfig                            |    2 +- >> >      include/configs/cl-som-imx7.h                     |    4 - >> >      include/configs/imx6_spl.h                        |   28 ++- >> >      include/configs/imx8mq_evk.h                      |    4 - >> >      include/configs/imx8qm_mek.h                      |    2 +- >> >      include/configs/imx8qxp_mek.h                     |    2 +- >> >      include/configs/mx6_common.h                      |    4 - >> >      include/configs/mx6sllevk.h                       |    6 - >> >      include/configs/mx6ul_14x14_evk.h                 |    2 +- >> >      include/configs/mx6ullevk.h                       |   19 +- >> >      include/configs/mx7_common.h                      |    4 - >> >      include/configs/mx7ulp_evk.h                      |    9 - >> >      include/configs/pico-imx6ul.h                     |   33 ++- >> >      include/configs/pico-imx7d.h                      |    6 +- >> >      include/dt-bindings/clock/imx6ul-clock.h          |   50 +++-- >> >      include/efi_api.h                                 |   24 +- >> >      include/efi_loader.h                              |   16 -- >> >      include/spl.h                                     |   15 +- >> >      lib/efi_loader/efi_device_path_to_text.c          |   10 +- >> >      lib/efi_loader/efi_file.c                         |  226 >> >     ++++++++++++------- >> >      scripts/config_whitelist.txt                      |    1 - >> >      tools/imx8mimage.c                                |    7 +- >> >      tools/logos/technexion.bmp                        |  Bin 0 -> >> 22390 >> >     bytes >> >      tools/spl_size_limit.c                            |    3 + >> >      141 files changed, 3606 insertions(+), 2824 deletions(-) >> >      create mode 100644 arch/arm/dts/imx6dl-nitrogen6x.dts >> >      create mode 100644 arch/arm/dts/imx6q-nitrogen6x.dts >> >      create mode 100644 arch/arm/dts/imx6q-sabrelite.dts >> >      create mode 100644 arch/arm/dts/imx6qdl-nitrogen6x.dtsi >> >      create mode 100644 arch/arm/dts/imx6qdl-sabrelite.dtsi >> >      create mode 100644 arch/arm/dts/imx6ul-14x14-evk.dtsi >> >      create mode 100644 arch/arm/dts/imx6ulz-14x14-evk.dts >> >      create mode 100644 arch/arm/dts/imx6ulz.dtsi >> >      create mode 100644 arch/arm/include/asm/arch-imx8/image.h >> >      create mode 100644 arch/arm/mach-imx/imx8/fdt.c >> >      create mode 100644 arch/arm/mach-imx/imx8/lowlevel_init.S >> >      create mode 100644 arch/arm/mach-imx/imx8/parse-container.c >> >      create mode 100644 board/freescale/imx8qm_mek/uboot-container.cfg >> >      create mode 100644 >> board/freescale/imx8qxp_mek/uboot-container.cfg >> >      create mode 100644 configs/mx6ulz_14x14_evk_defconfig >> >      create mode 100644 configs/pico-dwarf-imx6ul_defconfig >> >      create mode 100644 configs/pico-dwarf-imx7d_defconfig >> >      create mode 100644 configs/pico-nymph-imx7d_defconfig >> >      create mode 100644 doc/imx/mkimage/imx8image.txt >> >      create mode 100644 drivers/cpu/imx8_cpu.c >> >      create mode 100644 tools/logos/technexion.bmp >> > >> >     Best regards, >> >     Stefano >> > >> >     -- >> > >>  ===================================================================== >> >     DENX Software Engineering GmbH,      Managing Director: >> Wolfgang Denk >> >     HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, >> Germany >> >     Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: >> >     sbabic at denx.de > > >> > >>  ===================================================================== >> >     _______________________________________________ >> >     U-Boot mailing list >> >     U-Boot at lists.denx.de >> > >> >     https://lists.denx.de/listinfo/u-boot >> > >> >> >> -- >> ===================================================================== >> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk >> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany >> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: >> sbabic at denx.de >> ===================================================================== >> >