Pull request: u-boot-imx u-boot-imx-20190923
Hi Tom,
please pull from u-boot-imx, thanks !
The following changes since commit 87d5b225585f341ea8e926a2c26fb72585fc9d0c:
MAINTAINERS: Change fsl-qoriq, mpc86xx, mpc85xx maintainers
(2019-09-13 10:14:45 -0400)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git
tags/u-boot-imx-20190923
for you to fetch changes up to 322a967cdf470640cb8cb6b68b6721e63b8c3104:
Merge branch 'for-imx' of https://github.com/OSSystems/u-boot
(2019-09-22 15:19:49 +0200)
----------------------------------------------------------------
u-boot-imx-20190923
-------------------
- Fixes i.MX7ULP
- No default CSF size in case of SECURE_BOOT
- Technexion boards
- Nitrogen boards ported to DM
- fix for mx53loco
- Sync DTS for i.MX6UL(L)
- Fuses for i.MX7ULP
- i.mx8 : container image, fixes
- Fixes for Toradex (apalis)
- SPL: allow bigger size for i.MX6Q/D
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/588095906
----------------------------------------------------------------
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 (15):
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
mx53loco: Fix U-Boot corruption after saving the environment
mx6: clock: Allow enable_ipu_clock() to be built for SPL code
pico-imx6: Add initial support
pico-imx6: Add Ethernet support
pico-imx6: Add splashscreen support
pico-imx6: Add Falcon mode
Joris Offouga (3):
ARM: dts: pico-imx7d: Add u-boot.dtsi for uboot specific dts change
ARM: dts: pico-imx7d: sync device tree with v5.3-rc6
configs: pico-imx7d: Convert to DM_VIDEO
Otavio Salvador (5):
pico-imx6ul: Add DWARF baseboard support
pico-imx7d: Add DWARF baseboard support
pico-imx7d: Add NYMPH baseboard support
configs: Sync all baseboard specific pico-imx7d
pico-imx6: Fix bootmenu handling
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
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 (5):
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
board: imx6dl_mamoj: set the value for CSF size Merge branch 'for-imx' of https://github.com/OSSystems/u-boot
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
Makefile | 8 +++ arch/arm/cpu/arm926ejs/spear/spl.c | 5 +- arch/arm/dts/Makefile | 32 ++++++--- arch/arm/dts/fsl-imx8qm.dtsi | 7 ++ arch/arm/dts/imx6dl-nitrogen6x.dts | 15 +++++ arch/arm/dts/imx6dl-pico.dts | 17 +++++ arch/arm/dts/imx6q-nitrogen6x.dts | 19 ++++++ arch/arm/dts/imx6q-pico.dts | 17 +++++ arch/arm/dts/imx6q-sabrelite.dts | 19 ++++++ arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 69 +++++++++++++++++++ arch/arm/dts/imx6qdl-pico.dtsi | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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/dts/imx7d-pico-u-boot.dtsi | 124 ++++++++++++++++++++++++++++++++++ arch/arm/dts/imx7d-pico.dtsi | 10 +-- 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 | 21 ++++++ arch/arm/mach-imx/mx6/clock.c | 32 ++++----- 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/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-imx6/Kconfig | 15 +++++ board/technexion/pico-imx6/MAINTAINERS | 9 +++ board/technexion/pico-imx6/Makefile | 5 ++ board/technexion/pico-imx6/README | 73 ++++++++++++++++++++ board/technexion/pico-imx6/pico-imx6.c | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/technexion/pico-imx6/spl.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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/pico-imx7d.c | 48 +++++-------- 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/imx6dl_mamoj_defconfig | 3 +- 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 | 69 +++++++++++++++++++ configs/pico-hobbit-imx6ul_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 6 +- configs/pico-imx6_defconfig | 73 ++++++++++++++++++++ configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-nymph-imx7d_defconfig | 69 +++++++++++++++++++ configs/pico-pi-imx6ul_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 4 +- configs/sksimx6_defconfig | 1 - 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/mx53loco.h | 14 +++- 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-imx6.h | 164 +++++++++++++++++++++++++++++++++++++++++++++ include/configs/pico-imx6ul.h | 33 ++++++++- include/configs/pico-imx7d.h | 8 ++- include/dt-bindings/clock/imx6ul-clock.h | 50 ++++++++------ include/spl.h | 15 ++++- scripts/config_whitelist.txt | 1 - tools/imx8mimage.c | 7 +- tools/logos/technexion.bmp | Bin 0 -> 22390 bytes tools/spl_size_limit.c | 3 + 145 files changed, 5083 insertions(+), 2770 deletions(-) create mode 100644 arch/arm/dts/imx6dl-nitrogen6x.dts create mode 100644 arch/arm/dts/imx6dl-pico.dts create mode 100644 arch/arm/dts/imx6q-nitrogen6x.dts create mode 100644 arch/arm/dts/imx6q-pico.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-pico.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/dts/imx7d-pico-u-boot.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 board/technexion/pico-imx6/Kconfig create mode 100644 board/technexion/pico-imx6/MAINTAINERS create mode 100644 board/technexion/pico-imx6/Makefile create mode 100644 board/technexion/pico-imx6/README create mode 100644 board/technexion/pico-imx6/pico-imx6.c create mode 100644 board/technexion/pico-imx6/spl.c 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-imx6_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 include/configs/pico-imx6.h create mode 100644 tools/logos/technexion.bmp
Signature · 5 lines
===================================================================== 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 =====================================================================
Quoted 11 lines · Stefano Babic
Hi Tom,
please pull from u-boot-imx, thanks !
The following changes since commit
87d5b225585f341ea8e926a2c26fb72585fc9d0c:
MAINTAINERS: Change fsl-qoriq, mpc86xx, mpc85xx maintainers
(2019-09-13 10:14:45 -0400)are available in the Git repository at:
Quoted 8 lines
https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git
tags/u-boot-imx-20190923for you to fetch changes up to
322a967cdf470640cb8cb6b68b6721e63b8c3104:Merge branch 'for-imx' of https://github.com/OSSystems/u-boot
(2019-09-22 15:19:49 +0200)
Sorry, with the video PR from last night now pico-imx7d_bl33 pico-hobbit-imx7d pico-nymph-imx7d mx6ul_9x9_evk pico-imx7d mx6ul_14x14_evk pico-dwarf-imx7d pico-pi-imx7d fail to link.
Also, at this point in the release cycle are all of these changes still things we really want to bring in? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190923/51838136/attachment.sig>
Hi Tom and Stefano
I send patch series for fix build for pico-imx7d
Best regards,
Joris Offouga
Le 23/09/2019 à 14:51, Tom Rini a écrit :
Quoted 33 lines · Stefano Babic
Quoted 12 lines
Hi Tom,
please pull from u-boot-imx, thanks !
The following changes since commit
87d5b225585f341ea8e926a2c26fb72585fc9d0c:
MAINTAINERS: Change fsl-qoriq, mpc86xx, mpc85xx maintainers
(2019-09-13 10:14:45 -0400)are available in the Git repository at:
Quoted 8 lines
https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git
tags/u-boot-imx-20190923for you to fetch changes up to
322a967cdf470640cb8cb6b68b6721e63b8c3104:Merge branch 'for-imx' of https://github.com/OSSystems/u-boot
(2019-09-22 15:19:49 +0200)Sorry, with the video PR from last night now pico-imx7d_bl33 pico-hobbit-imx7d pico-nymph-imx7d
mx6ul_9x9_evkpico-imx7dmx6ul_14x14_evkpico-dwarf-imx7d pico-pi-imx7d fail to link.Also, at this point in the release cycle are all of these changes still things we really want to bring in? Thanks!
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Quoted 3 lines · Joris Offouga
Hi Tom and Stefano
I send patch series for fix build for pico-imx7d
Those changes are indeed important. Most were sent before and we polished them more lately.
Joris also been promptly on fixing issues, so I'd love to see it all merged.
We are now getting to move more things to DM model and we hope to do more changes for next release.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Quoted 5 lines · Otavio Salvador
Quoted 3 lines · Joris Offouga
Hi Tom and Stefano
I send patch series for fix build for pico-imx7d
Quoted 7 lines
Those changes are indeed important. Most were sent before and we polished them more lately.
Joris also been promptly on fixing issues, so I'd love to see it all merged.
We are now getting to move more things to DM model and we hope to do more changes for next release.
OK. But we're 2 weeks from v2019.10 release. Will these platforms be better or worse off holding most (all?) of these changes for the next release so they can if not get more "polish" at least more testing before a release and be included once the release happens and merge window opens? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190923/ec4f3798/attachment.sig>
Quoted 11 lines · Tom Rini
Quoted 10 lines · Otavio Salvador
Quoted 3 lines · Joris Offouga
Hi Tom and Stefano
I send patch series for fix build for pico-imx7d
Those changes are indeed important. Most were sent before and we polished them more lately.
Joris also been promptly on fixing issues, so I'd love to see it all merged.
Quoted 8 lines
Quoted 2 lines
We are now getting to move more things to DM model and we hope to do more changes for next release.
OK. But we're 2 weeks from v2019.10 release. Will these platforms be better or worse off holding most (all?) of these changes for the next release so they can if not get more "polish" at least more testing before a release and be included once the release happens and merge window opens? Thanks!
PICO 7D changes are fixes. The PICO i.MX6 can wait.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Hello Tom,
Quoted 11 lines · Otavio Salvador
Quoted 8 lines · Tom Rini
Quoted 2 lines
We are now getting to move more things to DM model and we hope to do more changes for next release.
OK. But we're 2 weeks from v2019.10 release. Will these platforms be better or worse off holding most (all?) of these changes for the next release so they can if not get more "polish" at least more testing before a release and be included once the release happens and merge window opens? Thanks!
PICO 7D changes are fixes. The PICO i.MX6 can wait.
I ended redoing the branch and removing Joris patches for this release. Those were breaking the builds and prepared a branch which builds fine.
The following changes since commit 31e086e460fb5de6dd42559babdc1e027ed2fe96:
Prepare v2019.10-rc4 (2019-09-23 12:24:39 -0400)
are available in the Git repository at:
https://github.com/OSSystems/u-boot imx-fixes-2019.10
for you to fetch changes up to b0902ed95d2a0fa6de15c3adacdcc2965ae6ddc3:
Merge remote-tracking branch 'origin/master' into imx-fixes-2019.10
(2019-09-23 22:39:05 -0300)
----------------------------------------------------------------
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 (15):
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
mx53loco: Fix U-Boot corruption after saving the environment
mx6: clock: Allow enable_ipu_clock() to be built for SPL code
pico-imx6: Add initial support
pico-imx6: Add Ethernet support
pico-imx6: Add splashscreen support
pico-imx6: Add Falcon mode
Otavio Salvador (6):
pico-imx6ul: Add DWARF baseboard support
pico-imx7d: Add DWARF baseboard support
pico-imx7d: Add NYMPH baseboard support
configs: Sync all baseboard specific pico-imx7d
pico-imx6: Fix bootmenu handling
Merge remote-tracking branch 'origin/master' into imx-fixes-2019.10
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
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 (4):
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
board: imx6dl_mamoj: set the value for CSF size
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
Makefile | 8 + arch/arm/cpu/arm926ejs/spear/spl.c | 5 +- arch/arm/dts/Makefile | 32 +- arch/arm/dts/fsl-imx8qm.dtsi | 7 + arch/arm/dts/imx6dl-nitrogen6x.dts | 15 + arch/arm/dts/imx6dl-pico.dts | 17 + arch/arm/dts/imx6q-nitrogen6x.dts | 19 + arch/arm/dts/imx6q-pico.dts | 17 + arch/arm/dts/imx6q-sabrelite.dts | 19 + arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 69 ++ arch/arm/dts/imx6qdl-pico.dtsi | 424 ++++++++ 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 | 21 + arch/arm/mach-imx/mx6/clock.c | 32 +- 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/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-imx6/Kconfig | 15 + board/technexion/pico-imx6/MAINTAINERS | 9 + board/technexion/pico-imx6/Makefile | 5 + board/technexion/pico-imx6/README | 73 ++ board/technexion/pico-imx6/pico-imx6.c | 362 +++++++ board/technexion/pico-imx6/spl.c | 314 ++++++ 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/imx6dl_mamoj_defconfig | 1 + configs/imx8mq_evk_defconfig | 2 +- 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 | 69 ++ configs/pico-hobbit-imx6ul_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6_defconfig | 73 ++ configs/pico-imx6ul_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 69 ++ configs/pico-pi-imx6ul_defconfig | 1 + configs/sksimx6_defconfig | 1 - 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/mx53loco.h | 14 +- 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-imx6.h | 164 +++ include/configs/pico-imx6ul.h | 33 +- include/configs/pico-imx7d.h | 6 +- include/dt-bindings/clock/imx6ul-clock.h | 50 +- include/spl.h | 15 +- scripts/config_whitelist.txt | 1 - tools/imx8mimage.c | 7 +- tools/logos/technexion.bmp | Bin 0 -> 22390 bytes tools/spl_size_limit.c | 3 + 139 files changed, 4932 insertions(+), 2724 deletions(-) create mode 100644 arch/arm/dts/imx6dl-nitrogen6x.dts create mode 100644 arch/arm/dts/imx6dl-pico.dts create mode 100644 arch/arm/dts/imx6q-nitrogen6x.dts create mode 100644 arch/arm/dts/imx6q-pico.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-pico.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 board/technexion/pico-imx6/Kconfig create mode 100644 board/technexion/pico-imx6/MAINTAINERS create mode 100644 board/technexion/pico-imx6/Makefile create mode 100644 board/technexion/pico-imx6/README create mode 100644 board/technexion/pico-imx6/pico-imx6.c create mode 100644 board/technexion/pico-imx6/spl.c 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-imx6_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 include/configs/pico-imx6.h create mode 100644 tools/logos/technexion.bmp
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 1/1 imx: mx6ul_14x14_evk: fix link issue
In reply to Tom RiniSince recent splash changes common code for splashscreen logo should be used instead of adding duplicated code under board directories. mx6ul_9x9_evk and mx6ul_14x14_evk configurations used old board specific logo code and do not link, fix them.
--- .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 19 ++----------------- configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + include/configs/mx6ul_14x14_evk.h | 1 + 4 files changed, 5 insertions(+), 17 deletions(-)
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +2 -17
@@ -28,10 +28,6 @@#include "../common/pfuze.h" #include <usb.h> #include <usb/ehci-ci.h> -#ifdef CONFIG_DM_VIDEO -#include <bmp_logo_data.h> -#include <video.h> -#endif DECLARE_GLOBAL_DATA_PTR ;
@@ -449,6 +445,8 @@ static int setup_lcd(void) return 0; } +#else +static inline int setup_lcd (void ) {return 0 ; }#endif int board_early_init_f (void )
@@ -505,21 +503,8 @@ int board_late_init(void)env_set ("board_rev" ,"14X14" );#endif -#if defined(CONFIG_DM_VIDEO ) -struct udevice *dev; -int ret; - - ret =uclass_get_device (UCLASS_VIDEO ,0 , &dev); -if (ret) -return ret; -setup_lcd (); - ret =video_bmp_display (dev, (ulong )bmp_logo_bitmap,0 ,0 , true); -if (ret) -return ret; -#endif -return 0 ; }
configs/mx6ul_14x14_evk_defconfig +1 -0
@@ -68,3 +68,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y
configs/mx6ul_9x9_evk_defconfig +1 -0
@@ -71,3 +71,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y
include/configs/mx6ul_14x14_evk.h +1 -0
@@ -60,6 +60,7 @@"fdt_addr=0x83000000\0" \"boot_fdt=try\0" \"ip_dyn=yes\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
Signature · 1 line
2.17.1
PATCH 1/1 imx: mx6ul_14x14_evk: fix link issue
Quoted 8 lines
Subject: [PATCH] imx:
mx6ul_14x14_evk: fix link issueSince recent splash changes common code for splashscreen logo should be used instead of adding duplicated code under board directories.
mx6ul_9x9_evkandmx6ul_14x14_evkconfigurations used old board specific logo code and do not link, fix them.Signed-off-by Anatolij Gustschin <[email protected]>
Quoted 90 lines
--- .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 19 ++----------------- configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + include/configs/mx6ul_14x14_evk.h | 1 + 4 files changed, 5 insertions(+), 17 deletions(-)board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +2
-17@@ -28,10 +28,6 @@#include "../common/pfuze.h" #include <usb.h> #include <usb/ehci-ci.h> -#ifdef CONFIG_DM_VIDEO -#include <bmp_logo_data.h> -#include <video.h> -#endif DECLARE_GLOBAL_DATA_PTR ;@@ -449,6 +445,8 @@ static int setup_lcd(void) return 0; } +#else +static inline int setup_lcd (void ) {return 0 ; }#endif int board_early_init_f (void )@@ -505,21 +503,8 @@ int board_late_init(void)env_set ("board_rev" ,"14X14" );#endif -#if defined(CONFIG_DM_VIDEO ) -struct udevice *dev; -int ret; - - ret =uclass_get_device (UCLASS_VIDEO ,0 , &dev); -if (ret) -return ret; -setup_lcd (); - ret =video_bmp_display (dev, (ulong )bmp_logo_bitmap,0 ,0 , true); -if (ret) -return ret; -#endif -return 0 ; }configs/mx6ul_14x14_evk_defconfig +1
-0@@ -68,3 +68,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y(quoted diff) +0
-0b/configs/mx6ul_9x9_evk_defconfig index
95c6697e62..4b517436c8100644configs/mx6ul_9x9_evk_defconfig +1
-0@@ -71,3 +71,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=yinclude/configs/mx6ul_14x14_evk.h +1
-0@@ -60,6 +60,7 @@"fdt_addr=0x83000000\0" \"boot_fdt=try\0" \"ip_dyn=yes\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,l o:4,hs:41,vs:10,sync:0,vmode:0\0" \include/configs/mx6ul_14x14_evk.h +0
-1"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ --2.17.1