[U-Boot] [NXP-IMX] please pull imx-master-10-14

Peng Fan peng.fan at nxp.com
Tue Oct 15 06:01:39 UTC 2019


Hi Stefano,

> 
> > Subject: Re: [NXP-IMX] please pull imx-master-10-14
> >
> > Hi Peng,
> >
> > On 14/10/19 11:48, Peng Fan wrote:
> > > Hi Stefano,
> > >
> > > Please pull imx-master-10-14. This pull request was based on imx/master.
> > >
> >
> > I have 40 patches already applied in my -next, anyway without MX8MN. I
> > will first send a PR for these, and then I will pull your - a couple
> > of patches in your list are already applied by me. I will check this afterward.

I just rebased to Tom's tree and pushed. Please check whether it is well for you to pull.

Thanks,
Peng.

The following changes since commit 6891152a4596d38ac25d2fe1238e3b6a938554b8:

  Merge branch 'master' of git://git.denx.de/u-boot-socfpga (2019-10-14 21:00:10 -0400)

are available in the Git repository at:

  https://github.com/MrVan/u-boot.git imx-master-10-15

for you to fetch changes up to a0182902e05667c5d67e43f3f95eaf51f45dacc9:

  imx8qxp: mek: add secure boot script (2019-10-15 14:14:52 +0800)

----------------------------------------------------------------
Peng Fan (26):
      imx8qm: mek: enable dm-spl for pm
      arm: dts: imx8qxp-mek: add u-boot, dm-spl for lpuart0
      arm: dts: imx8qm-mek: add u-boot, dm-spl for lpuart0
      misc: imx8: scu: simplify code to make it extendable
      power: domain: make imx8-power-domain.c legacy
      power: domain: add i.MX8 scu power domain driver
      imx: add i.MX8MN kconfig entry
      imx8mn: support get_cpu_rev
      imx8m: add clk support for i.MX8MN
      imx8mn: set BYPASS ID SWAP to avoid AXI bus errors
      imx: add i.MX8MN PE property
      imx8mn: add pin header
      imx: spl: use spl_board_boot_device for i.MX8MN
      imx: add rom api support
      imx: cpu: restrict get_boot_device
      imx8mn: add get_boot_device
      tools: imx8mimage: add ROM VERSION
      pinctrl: imx8m: support i.MX8MN
      tools: imx8m_image: support ddr4 firmware
      clk: imx: add i.MX8MN ccf driver
      imx8m: add i.MX8MN ddr4 image cfg file
      imx: add dtsi for i.MX8MN
      imx: add i.MX8MN DDR4 board support
      imx8: Add AHAB secure boot support
      imx8qm: mek: add secure boot script
      imx8qxp: mek: add secure boot script

Ye Li (1):
      misc: scu: Increase the timeout for MU communication

 arch/arm/dts/Makefile                           |    3 +-
 arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi         |   13 ++
 arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi        |    8 +
 arch/arm/dts/imx8mm-evk.dts                     |    6 +-
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi        |   92 ++++++++++
 arch/arm/dts/imx8mn-ddr4-evk.dts                |  221 +++++++++++++++++++++++
 arch/arm/dts/imx8mn-pinfunc.h                   |  646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/imx8mn.dtsi                        |  712 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/include/asm/arch-imx/cpu.h             |    1 +
 arch/arm/include/asm/arch-imx8m/clock.h         |    2 +-
 arch/arm/include/asm/arch-imx8m/clock_imx8mm.h  |   78 ++++++++
 arch/arm/include/asm/arch-imx8m/imx8mn_pins.h   |  763 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/include/asm/mach-imx/iomux-v3.h        |    2 +-
 arch/arm/include/asm/mach-imx/sys_proto.h       |   35 ++++
 arch/arm/mach-imx/Kconfig                       |    4 +
 arch/arm/mach-imx/Makefile                      |    2 +
 arch/arm/mach-imx/cpu.c                         |    4 +-
 arch/arm/mach-imx/imx8/Kconfig                  |    5 +
 arch/arm/mach-imx/imx8/ahab.c                   |  347 +++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/imx8/parse-container.c        |   95 +++++++++-
 arch/arm/mach-imx/imx8m/Kconfig                 |   11 ++
 arch/arm/mach-imx/imx8m/Makefile                |    2 +-
 arch/arm/mach-imx/imx8m/clock_slice.c           |    4 +-
 arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg   |   17 ++
 arch/arm/mach-imx/imx8m/soc.c                   |   54 +++++-
 arch/arm/mach-imx/spl.c                         |    2 +-
 arch/arm/mach-imx/spl_imx_romapi.c              |  292 ++++++++++++++++++++++++++++++
 board/freescale/imx8mn_evk/Kconfig              |   14 ++
 board/freescale/imx8mn_evk/MAINTAINERS          |    6 +
 board/freescale/imx8mn_evk/Makefile             |   12 ++
 board/freescale/imx8mn_evk/ddr4_timing.c        | 1214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 board/freescale/imx8mn_evk/imx8mn_evk.c         |   29 +++
 board/freescale/imx8mn_evk/spl.c                |  123 +++++++++++++
 board/freescale/imx8qm_mek/spl.c                |   16 --
 configs/imx8mn_ddr4_evk_defconfig               |   78 ++++++++
 configs/imx8qm_mek_defconfig                    |    2 +-
 drivers/clk/imx/Kconfig                         |   16 ++
 drivers/clk/imx/Makefile                        |    2 +
 drivers/clk/imx/clk-imx8mn.c                    |  415 ++++++++++++++++++++++++++++++++++++++++++
 drivers/misc/imx8/scu.c                         |   48 +----
 drivers/pinctrl/nxp/pinctrl-imx8m.c             |    1 +
 drivers/power/domain/Makefile                   |    2 +-
 drivers/power/domain/imx8-power-domain-legacy.c |  315 ++++++++++++++++++++++++++++++++
 drivers/power/domain/imx8-power-domain.c        |  270 +++------------------------
 include/configs/imx8mn_evk.h                    |  156 ++++++++++++++++
 include/configs/imx8qm_mek.h                    |   64 +++++--
 include/configs/imx8qxp_mek.h                   |   64 +++++--
 include/dt-bindings/clock/imx8mn-clock.h        |  215 ++++++++++++++++++++++
 include/imximage.h                              |    1 +
 tools/imx8m_image.sh                            |   10 +
 tools/imx8mimage.c                              |   24 ++-
 51 files changed, 6163 insertions(+), 355 deletions(-)
 create mode 100644 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx8mn-ddr4-evk.dts
 create mode 100644 arch/arm/dts/imx8mn-pinfunc.h
 create mode 100644 arch/arm/dts/imx8mn.dtsi
 create mode 100644 arch/arm/include/asm/arch-imx8m/imx8mn_pins.h
 create mode 100644 arch/arm/mach-imx/imx8/ahab.c
 create mode 100644 arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg
 create mode 100644 arch/arm/mach-imx/spl_imx_romapi.c
 create mode 100644 board/freescale/imx8mn_evk/Kconfig
 create mode 100644 board/freescale/imx8mn_evk/MAINTAINERS
 create mode 100644 board/freescale/imx8mn_evk/Makefile
 create mode 100644 board/freescale/imx8mn_evk/ddr4_timing.c
 create mode 100644 board/freescale/imx8mn_evk/imx8mn_evk.c
 create mode 100644 board/freescale/imx8mn_evk/spl.c
 create mode 100644 configs/imx8mn_ddr4_evk_defconfig
 create mode 100644 drivers/clk/imx/clk-imx8mn.c
 create mode 100644 drivers/power/domain/imx8-power-domain-legacy.c
 create mode 100644 include/configs/imx8mn_evk.h
 create mode 100644 include/dt-bindings/clock/imx8mn-clock.h

> 
> Appreciate.
> 
> Thanks,
> Peng.
> 
> >
> > Regards,
> > Stefano
> >
> >
> > > CI is based the branch:
> > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftr
> > > av
> > >
> >
> is-ci.org%2FMrVan%2Fu-boot%2Fbuilds%2F597430352&data=02%7C01
> > %7Cpen
> > >
> >
> g.fan%40nxp.com%7Ca96bc9d9f4654a1291b608d7508d8503%7C686ea1d3b
> > c2b4c6fa
> > >
> >
> 92cd99c5c301635%7C0%7C0%7C637066441056700479&sdata=sqRjXhx
> > aH12dWwW
> > > lWRm47g6wEYeraYdFCCzPN9wqvrs%3D&reserved=0
> > > There are build failure in arm/arm64/bcm/rockchip, but not
> > > introduced by this pull-request per my understanding.
> > >
> > > There are conflicts when I apply patches from patchwork, I resolved
> > > the conflicts and applied on imx/master.
> > >
> > > --------------------------------------------------------
> > > i.MX8MN SoC support
> > > i.MX8QM/QXP secure boot script.
> > > board_mmc_get_env_dev for i.MX8MM EVK.
> > > Enlarge MU timeout and minor update for i.MX8QM/QXP.
> > > --------------------------------------------------------
> > >
> > > Thanks,
> > > Peng.
> > >
> > > The following changes since commit
> > 9189d6f1e9c4ae40a14558636ed7b59b53c4c885:
> > >
> > >   Merge
> > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgi
> > > tl
> > >
> >
> ab.denx.de%2Fu-boot%2Fcustodians%2Fu-boot-x86&data=02%7C01%7
> > Cpeng.
> > >
> >
> fan%40nxp.com%7Ca96bc9d9f4654a1291b608d7508d8503%7C686ea1d3bc2
> > b4c6fa92
> > >
> >
> cd99c5c301635%7C0%7C0%7C637066441056710471&sdata=%2BRGxY
> > 4Qu08LIk6T
> > > i7F6d1INvzkKDC8XOHuturavA%2BK8%3D&reserved=0 (2019-10-12
> > 10:52:48
> > > -0400)
> > >
> > > are available in the Git repository at:
> > >
> > >
> > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgi
> > > th
> > >
> >
> ub.com%2FMrVan%2Fu-boot.git&data=02%7C01%7Cpeng.fan%40nxp.c
> > om%7Ca9
> > >
> >
> 6bc9d9f4654a1291b608d7508d8503%7C686ea1d3bc2b4c6fa92cd99c5c3016
> > 35%7C0%
> > >
> >
> 7C0%7C637066441056710471&sdata=wPn5kucoUhNLzRQM2sk1uWvn3
> > ge2itW9QIv
> > > cU%2Bk8QPg%3D&reserved=0 imx-master-10-14
> > >
> > > for you to fetch changes up to
> > 2959d05c04516e0dddfb0d14a6f2190e43ad8c41:
> > >
> > >   imx8qxp: mek: add secure boot script (2019-10-14 10:12:00 +0800)
> > >
> > > ----------------------------------------------------------------
> > > Peng Fan (27):
> > >       imx: imx8mm_evk: add board_mmc_get_env_dev
> > >       imx8qm: mek: enable dm-spl for pm
> > >       arm: dts: imx8qxp-mek: add u-boot, dm-spl for lpuart0
> > >       arm: dts: imx8qm-mek: add u-boot, dm-spl for lpuart0
> > >       misc: imx8: scu: simplify code to make it extendable
> > >       power: domain: make imx8-power-domain.c legacy
> > >       power: domain: add i.MX8 scu power domain driver
> > >       imx: add i.MX8MN kconfig entry
> > >       imx8mn: support get_cpu_rev
> > >       imx8m: add clk support for i.MX8MN
> > >       imx8mn: set BYPASS ID SWAP to avoid AXI bus errors
> > >       imx: add i.MX8MN PE property
> > >       imx8mn: add pin header
> > >       imx: spl: use spl_board_boot_device for i.MX8MN
> > >       imx: add rom api support
> > >       imx: cpu: restrict get_boot_device
> > >       imx8mn: add get_boot_device
> > >       tools: imx8mimage: add ROM VERSION
> > >       pinctrl: imx8m: support i.MX8MN
> > >       tools: imx8m_image: support ddr4 firmware
> > >       clk: imx: add i.MX8MN ccf driver
> > >       imx8m: add i.MX8MN ddr4 image cfg file
> > >       imx: add dtsi for i.MX8MN
> > >       imx: add i.MX8MN DDR4 board support
> > >       imx8: Add AHAB secure boot support
> > >       imx8qm: mek: add secure boot script
> > >       imx8qxp: mek: add secure boot script
> > >
> > > Ye Li (1):
> > >       misc: scu: Increase the timeout for MU communication
> > >
> > >  arch/arm/dts/Makefile                           |    3 +-
> > >  arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi         |   13 ++
> > >  arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi        |    8 +
> > >  arch/arm/dts/imx8mm-evk.dts                     |    6 +-
> > >  arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi        |   92
> > ++++++++++
> > >  arch/arm/dts/imx8mn-ddr4-evk.dts                |  221
> > +++++++++++++++++++++++
> > >  arch/arm/dts/imx8mn-pinfunc.h                   |  646
> >
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > +++
> > >  arch/arm/dts/imx8mn.dtsi                        |  712
> >
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > ++++++++++
> > >  arch/arm/include/asm/arch-imx/cpu.h             |    1 +
> > >  arch/arm/include/asm/arch-imx8m/clock.h         |    2 +-
> > >  arch/arm/include/asm/arch-imx8m/clock_imx8mm.h  |   78
> > ++++++++
> > >  arch/arm/include/asm/arch-imx8m/imx8mn_pins.h   |  763
> >
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > +++++++++++++++
> > >  arch/arm/include/asm/mach-imx/iomux-v3.h        |    2 +-
> > >  arch/arm/include/asm/mach-imx/sys_proto.h       |   35 ++++
> > >  arch/arm/mach-imx/Kconfig                       |    4 +
> > >  arch/arm/mach-imx/Makefile                      |    2 +
> > >  arch/arm/mach-imx/cpu.c                         |    4 +-
> > >  arch/arm/mach-imx/imx8/Kconfig                  |    5 +
> > >  arch/arm/mach-imx/imx8/ahab.c                   |  347
> > +++++++++++++++++++++++++++++++++++
> > >  arch/arm/mach-imx/imx8/parse-container.c        |   95
> > +++++++++-
> > >  arch/arm/mach-imx/imx8m/Kconfig                 |   11 ++
> > >  arch/arm/mach-imx/imx8m/Makefile                |    2 +-
> > >  arch/arm/mach-imx/imx8m/clock_slice.c           |    4 +-
> > >  arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg   |   17 ++
> > >  arch/arm/mach-imx/imx8m/soc.c                   |   54
> +++++-
> > >  arch/arm/mach-imx/spl.c                         |    2 +-
> > >  arch/arm/mach-imx/spl_imx_romapi.c              |  292
> > ++++++++++++++++++++++++++++++
> > >  board/freescale/imx8mm_evk/imx8mm_evk.c         |    5 +
> > >  board/freescale/imx8mn_evk/Kconfig              |   14 ++
> > >  board/freescale/imx8mn_evk/MAINTAINERS          |    6 +
> > >  board/freescale/imx8mn_evk/Makefile             |   12 ++
> > >  board/freescale/imx8mn_evk/ddr4_timing.c        | 1214
> >
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > >  board/freescale/imx8mn_evk/imx8mn_evk.c         |   29 +++
> > >  board/freescale/imx8mn_evk/spl.c                |  123
> > +++++++++++++
> > >  board/freescale/imx8qm_mek/spl.c                |   16 --
> > >  configs/imx8mn_ddr4_evk_defconfig               |   78
> ++++++++
> > >  configs/imx8qm_mek_defconfig                    |    2 +-
> > >  drivers/clk/imx/Kconfig                         |   16 ++
> > >  drivers/clk/imx/Makefile                        |    2 +
> > >  drivers/clk/imx/clk-imx8mn.c                    |  415
> > ++++++++++++++++++++++++++++++++++++++++++
> > >  drivers/misc/imx8/scu.c                         |   48 +----
> > >  drivers/pinctrl/nxp/pinctrl-imx8m.c             |    1 +
> > >  drivers/power/domain/Makefile                   |    2 +-
> > >  drivers/power/domain/imx8-power-domain-legacy.c |  315
> > ++++++++++++++++++++++++++++++++
> > >  drivers/power/domain/imx8-power-domain.c        |  270
> > +++-------------------------
> > >  include/configs/imx8mn_evk.h                    |  156
> > ++++++++++++++++
> > >  include/configs/imx8qm_mek.h                    |   64 +++++--
> > >  include/configs/imx8qxp_mek.h                   |   64 +++++--
> > >  include/dt-bindings/clock/imx8mn-clock.h        |  215
> > ++++++++++++++++++++++
> > >  include/imximage.h                              |    1 +
> > >  tools/imx8m_image.sh                            |   10 ++
> > >  tools/imx8mimage.c                              |   24 ++-
> > >  52 files changed, 6168 insertions(+), 355 deletions(-)  create mode
> > > 100644 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> > >  create mode 100644 arch/arm/dts/imx8mn-ddr4-evk.dts  create mode
> > > 100644 arch/arm/dts/imx8mn-pinfunc.h  create mode 100644
> > > arch/arm/dts/imx8mn.dtsi  create mode 100644
> > > arch/arm/include/asm/arch-imx8m/imx8mn_pins.h
> > >  create mode 100644 arch/arm/mach-imx/imx8/ahab.c  create mode
> > 100644
> > > arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg
> > >  create mode 100644 arch/arm/mach-imx/spl_imx_romapi.c
> > >  create mode 100644 board/freescale/imx8mn_evk/Kconfig
> > >  create mode 100644 board/freescale/imx8mn_evk/MAINTAINERS
> > >  create mode 100644 board/freescale/imx8mn_evk/Makefile
> > >  create mode 100644 board/freescale/imx8mn_evk/ddr4_timing.c
> > >  create mode 100644 board/freescale/imx8mn_evk/imx8mn_evk.c
> > >  create mode 100644 board/freescale/imx8mn_evk/spl.c  create mode
> > > 100644 configs/imx8mn_ddr4_evk_defconfig  create mode 100644
> > > drivers/clk/imx/clk-imx8mn.c  create mode 100644
> > > drivers/power/domain/imx8-power-domain-legacy.c
> > >  create mode 100644 include/configs/imx8mn_evk.h  create mode
> > 100644
> > > include/dt-bindings/clock/imx8mn-clock.h
> > >
> >
> >
> > --
> >
> ==============================================================
> > =======
> > 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
> >
> ==============================================================
> > =======


More information about the U-Boot mailing list