Skip to contentSkip to conversation

Please pull u-boot-imx: u-boot-imx-20181217

GIT PULL Stefano Babic 3 participants 4 messages Dec 17, 2018 – Jan 1, 2019

lore
Share & tools
lore
#0 lore raw

Hi Tom,

please pull from u-boot-imx, u-boot-imx-20181217, thanks !

- fix missing MAINTANERS for embestmx6boards
- drop Wolfgang's patch
- apply V4 of "pico-imx7d: Increase the CONFIG_ENV_OFFSET size " that use fix values for size.

The following changes since commit d117d8f19b0625f88309e47a8a32c2faa384dddc:

Merge branch 'master' of git://git.denx.de/u-boot-i2c (2018-12-13
09:36:55 -0500)

are available in the Git repository at:

git://www.denx.de/git/u-boot-imx.git tags/u-boot-imx-20181217

for you to fetch changes up to 22f219feb807df91d958c3cc5a8634b6218b2565:

pico-imx7d: Increase the CONFIG_ENV_OFFSET size (2018-12-17 16:51:02
+0100)

----------------------------------------------------------------
imx for 2019.01

- introduce support for i.MX8M
- fix size limit for Vhybrid / pico boards
- several board fixes
- w1 driver for MX2x / MX5x

----------------------------------------------------------------
Denis Zalevskiy (6):
board: ge: Remove EEPROM bus param from read_vpd()
board: ge: Move VPD EEPROM configuration to the defconfig
bootcount: i2c: Add bus switching to the I2C bootcount driver
bootcount: Configure length limit for I2C bootcount
board: ge: Move VPD reading to the vpd_reader
board: ge: Store bootcount in EEPROM on PPD and Bx50v3

Fabien Lahoudere (1):
embestmx6boards: Add SPL support

Fabio Estevam (1):
pico-imx7d: Increase the CONFIG_ENV_OFFSET size

Gary Bisson (2):
imx: mx8m: add memory mapping for CAAM and TCM
imx: bootaux: fix stack and pc assignment on 64-bit platforms

Harald Seiler (1):
pcm058: fix NAND flash not using badblock table

Lukasz Majewski (6):
ARM: vybrid: Provide pinctrl driver for Vybrid (vf610)
ARM: DTS: Add iomux node to vf.dtsi for Vybrid devices
ARM: DTS: Provide pinfunc definitions for vybrid vf610 from Linux
kernel
nand: vybrid: Use calloc() instead of malloc() to allocate struct nfc
Kconfig: Add entry for VF610 NAND NFC device tree aware driver
nand: vybrid: Extend the vf610 NFC NAND driver to support device
tree (and DM)

Martin Fuzzey (1):
w1: Add driver for i.MX bus master controller

Martin Husemann (1):
tools: improve portability of imx_cntr_image.sh

Michael Heimpold (4):
configs: mx23_olinuxino_defconfig: fix status led definition
configs: mx23_olinuxino_defconfig: disable bootefi command
doc: imx: fix typo in imximage.txt
doc: imx: fix typos in mxsimage.txt

Parthiban Nallathambi (1):
imx: hab: extend hab_auth_img to calculate ivt_offset

Peng Fan (19):
imx: imx8qxp_mek: imximage: remove config.h
spl: introduce function prototypes
tools: add i.MX8M image support
arm: imx8qxp: build u-boot-dtb.cfgout before checking files Introduce CONFIG_FIT_EXTERNAL_OFFSET
imx: cpu: add CHIP_REV_2_1 macro
imx: introduce is_imx8mq helper
imx: rename mx8m,MX8M to imx8m,IMX8M
imx: spl: add MMC BOOT Device for i.MX8M
imx: imx8m: clock refactor dram pll part
imx: imx8m: introduce script to generate fit image
imx: imx8m: introduce imximage cfg file
imx: imx8mq: build flash.bin
imx: imx8m: not build bootaux when building SPL
imx: imx8m: add lpddr4 header file
drivers: ddr: introduce DDR driver for i.MX8M
imx: add i.MX8MQ EVK support
imx8m: ddr: removed unused macros
imx: mx53ppd: fix build error

Pierre-Jean Texier (1):
warp7: configs: add CONFIG_FIT option

Xiaoliang Yang (2):
watchdog: driver support for fsl-lsch2
watchdog: imx: add config to disable wdog reset

Yaniv Levinsky (1):
arm: imx7d: cl-som-imx7: migration to CONFIG_BLK

Ye Li (2):
SPL: Add HAB image authentication to FIT
imx8m: Enable CONFIG_SPL_FIT_IMAGE_TINY for iMX8M

Kconfig
| 10 ++
Makefile
| 7 +-
arch/arm/Kconfig
| 4 +-
arch/arm/Makefile
| 4 +-
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
| 11 ++
arch/arm/dts/Makefile
| 2 +
arch/arm/dts/fsl-imx8mq-evk.dts
| 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/dts/vf.dtsi
| 6 +
arch/arm/dts/vf610-pinfunc.h
| 810
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/include/asm/arch-imx/cpu.h
| 5 +-
arch/arm/include/asm/{arch-mx8m => arch-imx8m}/clock.h
| 22 ++++
arch/arm/include/asm/{arch-mx8m => arch-imx8m}/crm_regs.h
| 4 +-
arch/arm/include/asm/arch-imx8m/ddr.h
| 740
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/include/asm/{arch-mx8m => arch-imx8m}/gpio.h
| 4 +-
arch/arm/include/asm/{arch-mx8m => arch-imx8m}/imx-regs.h
| 4 +-
arch/arm/include/asm/{arch-mx8m/mx8mq_pins.h =>
arch-imx8m/imx8mq_pins.h} | 4 +-
arch/arm/include/asm/arch-imx8m/lpddr4_define.h
| 97 ++++++++++++++++
arch/arm/include/asm/{arch-mx8m => arch-imx8m}/sys_proto.h
| 4 +-
arch/arm/include/asm/arch-mx8m/ddr.h
| 355 --------------------------------------------------------
arch/arm/include/asm/mach-imx/iomux-v3.h
| 2 +-
arch/arm/include/asm/mach-imx/regs-lcdif.h
| 6 +-
arch/arm/include/asm/mach-imx/sys_proto.h
| 3 +-
arch/arm/mach-imx/Makefile
| 37 +++++-
arch/arm/mach-imx/cpu.c
| 16 +--
arch/arm/mach-imx/hab.c
| 29 ++++-
arch/arm/mach-imx/imx8m/Kconfig
| 23 ++++
arch/arm/mach-imx/{mx8m => imx8m}/Makefile
| 0
arch/arm/mach-imx/{mx8m => imx8m}/clock.c
| 138 +++++++++++++++++-----
arch/arm/mach-imx/{mx8m => imx8m}/clock_slice.c
| 0
arch/arm/mach-imx/imx8m/imximage.cfg
| 17 +++
arch/arm/mach-imx/{mx8m => imx8m}/lowlevel_init.S
| 0
arch/arm/mach-imx/{mx8m => imx8m}/soc.c
| 16 +++
arch/arm/mach-imx/imx_bootaux.c
| 8 +-
arch/arm/mach-imx/mkimage_fit_atf.sh
| 137 ++++++++++++++++++++++
arch/arm/mach-imx/mx6/Kconfig
| 1 +
arch/arm/mach-imx/mx8m/Kconfig
| 10 --
arch/arm/mach-imx/spl.c
| 59 ++++++++--
board/embest/mx6boards/MAINTAINERS
| 1 +
board/embest/mx6boards/mx6boards.c
| 48 ++++++++
board/freescale/imx8mq_evk/Kconfig
| 12 ++
board/freescale/imx8mq_evk/MAINTAINERS
| 6 +
board/freescale/imx8mq_evk/Makefile
| 12 ++
board/freescale/imx8mq_evk/README
| 36 ++++++
board/freescale/imx8mq_evk/imx8mq_evk.c
| 130 +++++++++++++++++++++
board/freescale/imx8mq_evk/lpddr4_timing.c
| 1320
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
board/freescale/imx8mq_evk/lpddr4_timing_b0.c
| 1191
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
board/freescale/imx8mq_evk/spl.c
| 246 +++++++++++++++++++++++++++++++++++++++
board/freescale/imx8qxp_mek/imximage.cfg
| 1 -
board/ge/bx50v3/Kconfig
| 2 +
board/ge/bx50v3/bx50v3.c
| 57 ++-------
board/ge/common/Kconfig
| 14 +++
board/ge/common/vpd_reader.c
| 57 ++++++++-
board/ge/common/vpd_reader.h
| 16 ++-
board/ge/mx53ppd/Kconfig
| 2 +
board/ge/mx53ppd/mx53ppd.c
| 50 ++------
common/image.c
| 1 +
common/spl/Kconfig
| 1 +
common/spl/spl_fit.c
| 21 +++-
configs/cl-som-imx7_defconfig
| 6 +-
configs/ge_bx50v3_defconfig
| 27 ++++-
configs/imx8mq_evk_defconfig
| 37 ++++++
configs/mx23_olinuxino_defconfig
| 3 +-
configs/mx53ppd_defconfig
| 29 ++++-
configs/riotboard_spl_defconfig
| 48 ++++++++
configs/warp7_defconfig
| 2 +
doc/device-tree-bindings/w1/mxc-w1.txt
| 37 ++++++
doc/imx/mkimage/imximage.txt
| 2 +-
doc/imx/mkimage/mxsimage.txt
| 4 +-
drivers/Makefile
| 1 +
drivers/bootcount/Kconfig
| 21 +++-
drivers/bootcount/bootcount_i2c.c
| 79 +++++++++++--
drivers/ddr/Kconfig
| 1 +
drivers/ddr/imx/Kconfig
| 1 +
drivers/ddr/imx/imx8m/Kconfig
| 22 ++++
drivers/ddr/imx/imx8m/Makefile
| 11 ++
drivers/ddr/imx/imx8m/ddr4_init.c
| 113 ++++++++++++++++++
drivers/ddr/imx/imx8m/ddrphy_csr.c
| 732
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/ddr/imx/imx8m/ddrphy_train.c
| 86 ++++++++++++++
drivers/ddr/imx/imx8m/ddrphy_utils.c
| 186 ++++++++++++++++++++++++++++++
drivers/ddr/imx/imx8m/helper.c
| 170 +++++++++++++++++++++++++++
drivers/ddr/imx/imx8m/lpddr4_init.c
| 188 ++++++++++++++++++++++++++++++
drivers/gpio/mxc_gpio.c
| 18 +--
drivers/misc/mxc_ocotp.c
| 6 +-
drivers/mmc/fsl_esdhc.c
| 8 +-
drivers/mtd/nand/raw/Kconfig
| 11 ++
drivers/mtd/nand/raw/vf610_nfc.c
| 49 +++++++-
drivers/net/fec_mxc.c
| 2 +-
drivers/pinctrl/nxp/Kconfig
| 14 +++
drivers/pinctrl/nxp/Makefile
| 1 +
drivers/pinctrl/nxp/pinctrl-vf610.c
| 40 +++++++
drivers/w1/Kconfig
| 14 +++
drivers/w1/Makefile
| 1 +
drivers/w1/mxc_w1.c
| 232 +++++++++++++++++++++++++++++++++++++
drivers/watchdog/Kconfig
| 6 +
drivers/watchdog/Makefile
| 2 +
drivers/watchdog/imx_watchdog.c
| 9 ++
include/configs/embestmx6boards.h
| 13 +++
include/configs/ge_bx50v3.h
| 6 +-
include/configs/imx8mq_evk.h
| 252 ++++++++++++++++++++++++++++++++++++++++
include/configs/mx53ppd.h
| 6 +-
include/configs/pcm058.h
| 1 +
include/configs/pico-imx7d.h
| 14 ++-
include/image.h
| 1 +
include/imximage.h
| 17 ++-
include/spl.h
| 13 +++
tools/Makefile
| 1 +
tools/imagetool.h
| 1 +
tools/imx8m_image.sh
| 43 +++++++
tools/imx8mimage.c
| 623
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/imx_cntr_image.sh
| 2 +-
tools/mkimage.c
| 7 ++

 111 files changed, 8862 insertions(+), 590 deletions(-)
 create mode 100644 arch/arm/dts/fsl-imx8mq-evk.dts
 create mode 100644 arch/arm/dts/vf610-pinfunc.h
 rename arch/arm/include/asm/{arch-mx8m => arch-imx8m}/clock.h (97%)
 rename arch/arm/include/asm/{arch-mx8m => arch-imx8m}/crm_regs.h (65%)
 create mode 100644 arch/arm/include/asm/arch-imx8m/ddr.h
 rename arch/arm/include/asm/{arch-mx8m => arch-imx8m}/gpio.h (63%)
 rename arch/arm/include/asm/{arch-mx8m => arch-imx8m}/imx-regs.h (99%)
 rename arch/arm/include/asm/{arch-mx8m/mx8mq_pins.h =>
arch-imx8m/imx8mq_pins.h} (99%)
 create mode 100644 arch/arm/include/asm/arch-imx8m/lpddr4_define.h
 rename arch/arm/include/asm/{arch-mx8m => arch-imx8m}/sys_proto.h (82%)
 delete mode 100644 arch/arm/include/asm/arch-mx8m/ddr.h
 create mode 100644 arch/arm/mach-imx/imx8m/Kconfig
 rename arch/arm/mach-imx/{mx8m => imx8m}/Makefile (100%)
 rename arch/arm/mach-imx/{mx8m => imx8m}/clock.c (85%)
 rename arch/arm/mach-imx/{mx8m => imx8m}/clock_slice.c (100%)
 create mode 100644 arch/arm/mach-imx/imx8m/imximage.cfg
 rename arch/arm/mach-imx/{mx8m => imx8m}/lowlevel_init.S (100%)
 rename arch/arm/mach-imx/{mx8m => imx8m}/soc.c (92%)
 create mode 100755 arch/arm/mach-imx/mkimage_fit_atf.sh
 delete mode 100644 arch/arm/mach-imx/mx8m/Kconfig
 create mode 100644 board/freescale/imx8mq_evk/Kconfig
 create mode 100644 board/freescale/imx8mq_evk/MAINTAINERS
 create mode 100644 board/freescale/imx8mq_evk/Makefile
 create mode 100644 board/freescale/imx8mq_evk/README
 create mode 100644 board/freescale/imx8mq_evk/imx8mq_evk.c
 create mode 100644 board/freescale/imx8mq_evk/lpddr4_timing.c
 create mode 100644 board/freescale/imx8mq_evk/lpddr4_timing_b0.c
 create mode 100644 board/freescale/imx8mq_evk/spl.c
 create mode 100644 board/ge/common/Kconfig
 create mode 100644 configs/imx8mq_evk_defconfig
 create mode 100644 configs/riotboard_spl_defconfig
 create mode 100644 doc/device-tree-bindings/w1/mxc-w1.txt
 create mode 100644 drivers/ddr/imx/Kconfig
 create mode 100644 drivers/ddr/imx/imx8m/Kconfig
 create mode 100644 drivers/ddr/imx/imx8m/Makefile
 create mode 100644 drivers/ddr/imx/imx8m/ddr4_init.c
 create mode 100644 drivers/ddr/imx/imx8m/ddrphy_csr.c
 create mode 100644 drivers/ddr/imx/imx8m/ddrphy_train.c
 create mode 100644 drivers/ddr/imx/imx8m/ddrphy_utils.c
 create mode 100644 drivers/ddr/imx/imx8m/helper.c
 create mode 100644 drivers/ddr/imx/imx8m/lpddr4_init.c
 create mode 100644 drivers/pinctrl/nxp/pinctrl-vf610.c
 create mode 100644 drivers/w1/mxc_w1.c
 create mode 100644 include/configs/imx8mq_evk.h
 create mode 100755 tools/imx8m_image.sh
 create mode 100644 tools/imx8mimage.c
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
=====================================================================
#1 lore raw
Quoted 26 lines · Stefano Babic

Hi Tom,

please pull from u-boot-imx, u-boot-imx-20181217, thanks !

- fix missing MAINTANERS for embestmx6boards
- drop Wolfgang's patch
- apply V4 of "pico-imx7d: Increase the CONFIG_ENV_OFFSET size " that use fix values for size.

The following changes since commit d117d8f19b0625f88309e47a8a32c2faa384dddc:

Merge branch 'master' of git://git.denx.de/u-boot-i2c (2018-12-13
09:36:55 -0500)

are available in the Git repository at:

git://www.denx.de/git/u-boot-imx.git tags/u-boot-imx-20181217

for you to fetch changes up to 22f219feb807df91d958c3cc5a8634b6218b2565:

pico-imx7d: Increase the CONFIG_ENV_OFFSET size (2018-12-17 16:51:02
+0100)

----------------------------------------------------------------
imx for 2019.01

Quoted 6 lines

- introduce support for i.MX8M
- fix size limit for Vhybrid / pico boards
- several board fixes
- w1 driver for MX2x / MX5x

----------------------------------------------------------------

So, this breaks travis. I know I've mentioned some of this off-list, but for the record and to aid in future debugging of issues like this, if we look at https://travis-ci.org/trini/u-boot/builds/472348357 we can see just a single job fails. So I rebased and put in as the first commit a hack to .travis.yml where I remove every other job in the matrix so it runs (relatively) quick. Then I did a git bisect where for the test I did:

$ git push -f github HEAD:TRAVIS-imx-PR-bisect
And then bisect good/bad depending on what happens.  This narrowed down
things to:
Author: Denis Zalevskiy <[email protected]>
Date:   Wed Oct 17 10:33:28 2018 +0200

bootcount: i2c: Add bus switching to the I2C bootcount driver

Being the culprit. My _guess_ is that after looking at the commit we have some boards that are prompting for SYS_BOOTCOUNT_I2C_BUS/SYS_BOOTCOUNT_I2C_ADDR now and not having a value set to they don't get built, but don't quite show up as an obvious failure either (aside, Simon, any idea why?). So, if we do:

$ ./tools/buildman/buildman -v --dry-run powerpc -x freescale
boards.cfg is up to date. Nothing to do.
Dry run, so not doing much. But I would do this:

Building current source for 47 boards (16 threads, 1 job per thread) Build directory: ..

powerpc : 47 boards
mpc8308_p1m sbc8349 sbc8349_PCI_33 sbc8349_PCI_66 ve8313 caddy2 vme8349 hrcon hrcon_dh strider_con strider_con_dp strider_cpu strider_cpu_dp ids8313 kmcoge5ne kmeter1 kmopti2 kmsupx5 kmtegr1 kmtepr2 kmvect1 suvd3 tuge1 tuxx1 TQM834x sbc8548 sbc8548_PCI_33 sbc8548_PCI_33_PCIE sbc8548_PCI_66 sbc8548_PCI_66_PCIE socrates UCP1020 UCP1020_SPIFLASH controlcenterd_36BIT_SDCARD controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd_TRAILBLAZER controlcenterd_TRAILBLAZER_DEVELOP kmcoge4 kmlion1 Cyrus_P5020 Cyrus_P5040 xpedite520x xpedite537x xpedite550x sbc8641d xpedite517x MCR3000
Total boards to build for each commit: 47

There's the list of boards that it might be. Doing a for B in ...;do make O=/tmp/$B ${B}_defconfig oldconfig and I see that yup, ids8313 trips on the new symbols without having a value. So those two bootcount patches from Denis need a slight rework (the second depends on the first) or to be dropped for now.

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/20181226/e133e9b2/attachment.sig>
#2 lore raw

Hi Tom,

Quoted 5 lines · Tom Rini

There's the list of boards that it might be. Doing a for B in ...;do make O=/tmp/$B ${B}_defconfig oldconfig and I see that yup, ids8313 trips on the new symbols without having a value. So those two bootcount patches from Denis need a slight rework (the second depends on the first) or to be dropped for now.

As we are getting closer to the 2019.01 release, I think we should drop Denis' patches for now.

Thanks

#3 lore raw
Quoted 4 lines · Fabio Estevam

Hi Tom,

On Wed, Dec 26, 2018 at 9:27 PM Tom Rini <[email protected]> wrote:

Quoted 9 lines
Quoted 5 lines

There's the list of boards that it might be. Doing a for B in ...;do make O=/tmp/$B ${B}_defconfig oldconfig and I see that yup, ids8313 trips on the new symbols without having a value. So those two bootcount patches from Denis need a slight rework (the second depends on the first) or to be dropped for now.

As we are getting closer to the 2019.01 release, I think we should drop Denis' patches for now.

Agree, I drop Denis' patches and I reporst the PR.

Thanks,
Stefano

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
=====================================================================