From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Mon, 23 Jul 2018 11:44:04 +0200 Subject: [U-Boot] [PULL] Please pull u-boot-imx Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 474ecd2c84d97314b8145fbe3a57887f41b2edb3: env: Simplify Makefile using $(SPL_TPL_) (2018-07-21 12:24:31 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to f97f167107b33fc6596561dae1309571ade39055: configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr (2018-07-23 11:05:54 +0200) ---------------------------------------------------------------- Adam Ford (2): imx: i.mx6q: imx6q_logic: Migrate to SPL and enable SDP configs: imx6q_logic: Cleanup ramdiskaddr and fdtaddr Baruch Siach (2): mmc: drop mention of IN_PROGRESS status mx6cuboxi: drop CONFIG_SYS_FSL_USDHC_NUM Fabio Berton (1): pico-imx7d: Add support for update SPL using DFU Fabio Estevam (7): mx7: Remove BMODE support pico-imx7d: Convert to distro config pico-imx7d: Add fastboot support pico-imx7d: Add SPL support pico-imx7d: Add Falcon mode support pico-imx7d: Enable CONFIG_ARMV7_BOOT_SEC_DEFAULT pico-imx7d: Do not override addrmap5 Holger Dengler (1): tools/imximage: get HAB information from header Jon Nettleton (5): mmc: break out get_op_cond code to its own function mx6cuboxi: Add support for eMMC booting mx6cuboxi: Use mmc_get_op_cond() to check for an eMMC mx6cuboxi: Add emmc device tree suffix mx6cuboxi: Move the default environment for all devices Ludwig Zenz (4): Revert "ARM: imx6: Disable DDR DRAM calibration DHCOM i.MX6 PDK" ARM: imx6: configure ddrcode pins in spl DHCOM i.MX6 PDK ARM: imx6: DHCOM i.MX6 PDK: ddr init for 32bit bus and 4GBit chips ARM: dh_imx6: enable GigaDevice, Macronix, and Winbond SPI Flash support in Kconfig Mark Jonas (1): arm, imx6: add alternative PAD_CTL_DSE constants Martin Kaiser (1): mx25: fix the offset between the USB ports' registers Michael Trimarchi (4): eth: dm: fec: Add gpio phy reset binding imx: mx6: Fix implementantion reset_misc imx: imx6: Add comment to gpr_init function i.MX6: engicam: gpr_init can be called only for some architecture Otavio Salvador (9): pico-imx7d: Fix common distro configuration behavior pico-imx7d: Add GPT partitioning support pico-imx7d: Add default DFU targets pico-imx7d: Add bootmenu to choose the baseboard pico-imx7d: Allow default fdtfile to be overridden by defconfig pico-imx7d: Enable auxiliary code support pico-imx7d: README: Use dfu-util to flash U-Boot pico-imx7d: README: Drop old instructions about secure mode pico-imx7d: Add new pico-pi config Stefan Agner (12): mtd: nand: mxs_nand: add device tree support for i.MX 6 imx: add macro to detect whether USB has been initialized ARM: dts: imx6ull: use same compatible string as Linux is using board: toradex: add new and upcoming SKUs board: toradex: add Colibri iMX6ULL support ARM: PSCI: initialize stack pointer on secondary CPUs imx: mx7: psci: use C code exclusively imx: mx7: psci: provide complete PSCI 1.0 implementation imx: mx7: psci: support CPU0 on/off imx: mx7: psci: implement MIGRATE_INFO_TYPE colibri_imx7: add compatible string used in vanilla Linux colibri_imx7: improve DDR3 timing Stefano Babic (1): bootcount: flush after storing the bootcounter Uri Mashiach (1): arm: imx7d: cl-som-imx7: sf: support all SF types arch/arm/cpu/armv7/psci.S | 2 + arch/arm/dts/imx6ull-colibri.dts | 550 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull.dtsi | 2 +- arch/arm/include/asm/arch-mx25/imx-regs.h | 7 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 7 ++ arch/arm/include/asm/mach-imx/iomux-v3.h | 8 +++ arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/mx6/Kconfig | 11 ++- arch/arm/mach-imx/mx6/soc.c | 7 ++ arch/arm/mach-imx/mx7/Kconfig | 2 +- arch/arm/mach-imx/mx7/Makefile | 5 +- arch/arm/mach-imx/mx7/psci-mx7.c | 148 ++++++++++++++++++++++++++++++++++++---- arch/arm/mach-imx/mx7/psci.S | 60 ---------------- arch/arm/mach-imx/mx7/soc.c | 25 ------- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- board/engicam/common/spl.c | 3 +- board/logicpd/imx6/imx6logic.c | 141 ++++++++++++++++++++++++++++++++++++++ board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 111 ------------------------------ board/solidrun/mx6cuboxi/mx6cuboxi.c | 115 ++++++++++++++++++++++++++++--- board/technexion/pico-imx7d/Makefile | 2 +- board/technexion/pico-imx7d/README | 30 +++----- board/technexion/pico-imx7d/imximage.cfg | 97 -------------------------- board/technexion/pico-imx7d/pico-imx7d.c | 2 +- board/technexion/pico-imx7d/spl.c | 122 +++++++++++++++++++++++++++++++++ board/toradex/colibri-imx6ull/Kconfig | 29 ++++++++ board/toradex/colibri-imx6ull/MAINTAINERS | 10 +++ board/toradex/colibri-imx6ull/Makefile | 4 ++ board/toradex/colibri-imx6ull/colibri-imx6ull.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/toradex/colibri-imx6ull/imximage.cfg | 106 ++++++++++++++++++++++++++++ board/toradex/colibri_imx7/colibri_imx7.c | 20 +----- board/toradex/colibri_imx7/imximage.cfg | 10 +-- board/toradex/common/tdx-cfg-block.c | 7 ++ board/toradex/common/tdx-cfg-block.h | 7 ++ configs/cl-som-imx7_defconfig | 7 ++ configs/colibri-imx6ull_defconfig | 76 +++++++++++++++++++++ configs/dh_imx6_defconfig | 3 + configs/imx6q_logic_defconfig | 47 +++++++++++-- configs/pico-imx7d_defconfig | 41 ++++++++--- configs/pico-pi-imx7d_defconfig | 59 ++++++++++++++++ drivers/bootcount/bootcount.c | 3 + drivers/mmc/mmc.c | 61 ++++++++++------- drivers/mtd/nand/mxs_nand_dt.c | 8 +++ drivers/net/fec_mxc.c | 43 ++++++++++-- drivers/net/fec_mxc.h | 5 +- include/configs/colibri-imx6ull.h | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/imx6_logic.h | 46 +++++++++---- include/configs/mx6cuboxi.h | 27 ++++---- include/configs/pico-imx7d.h | 94 +++++++++++++------------ include/mmc.h | 12 +++- tools/imximage.c | 13 ++-- 50 files changed, 2523 insertions(+), 508 deletions(-) create mode 100644 arch/arm/dts/imx6ull-colibri.dts delete mode 100644 arch/arm/mach-imx/mx7/psci.S delete mode 100644 board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg delete mode 100644 board/technexion/pico-imx7d/imximage.cfg create mode 100644 board/technexion/pico-imx7d/spl.c create mode 100644 board/toradex/colibri-imx6ull/Kconfig create mode 100644 board/toradex/colibri-imx6ull/MAINTAINERS create mode 100644 board/toradex/colibri-imx6ull/Makefile create mode 100644 board/toradex/colibri-imx6ull/colibri-imx6ull.c create mode 100644 board/toradex/colibri-imx6ull/imximage.cfg create mode 100644 configs/colibri-imx6ull_defconfig create mode 100644 configs/pico-pi-imx7d_defconfig create mode 100644 include/configs/colibri-imx6ull.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 =====================================================================