| Message ID | 55F54047.1050305@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Sep 13, 2015 at 11:22:15AM +0200, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit 922f735ecf0de23eb0e01c208f5b422f39f6aed9: > > Merge git://git.denx.de/u-boot-usb (2015-09-12 15:50:02 -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 84c311f28e39d7b5b13069ae29a55bdf6c7c0890: > > udoo: Fix the error handling in board_eth_init() (2015-09-13 11:06:08 > +0200) > Applied to u-boot/master, thanks!
Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 922f735ecf0de23eb0e01c208f5b422f39f6aed9: Merge git://git.denx.de/u-boot-usb (2015-09-12 15:50:02 -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 84c311f28e39d7b5b13069ae29a55bdf6c7c0890: udoo: Fix the error handling in board_eth_init() (2015-09-13 11:06:08 +0200) ---------------------------------------------------------------- Adrian Alonso (13): imx: arch-mx6: add is_soc_type helper macro thermal: imx_thermal: rework driver to be reused arm: imx: common rework cache settings for imx6 arm: imx: imx-common: init: move arch init common setup imx: system counter driver for imx7d and mx6ul imx: imx7d: initial arch level support imx: imx7d: clock control module support imx: imx7d: Add SoC system support arm: imx-common: init: extend init_aips to support imx7 arm: imx-common: init: rework wdog settings for imx6/imx7 thermal: imx: add imx7d soc thermal support imx: imx7d: add imx-common cpu support for imx7d imx: mx7dsabresd: Add support for MX7D SABRESD board Fabio Estevam (17): thermal: imx_thermal: Do not print on error imx-common: cpu: Do not print on invalid temperature mx6ul_14x14_evk: Remove CONFIG_SPL_FAT_SUPPORT mx6ul_14x14_evk: Add a README file mx6slevk: Remove CONFIG_SPL_FAT_SUPPORT mx6sxsabresd: Remove CONFIG_SPL_FAT_SUPPORT cgtqmx6eval: Remove CONFIG_CMD_FUSE option mx6ul_14x14_evk: Remove CONFIG_SYS_GENERIC_BOARD mx6ul_14x14_evk: Remove unused config option mx6ul_14x14_evk: Do not undef config options mx6ul_14x14_evk: Remove CONFIG_FEC_DMA_MINALIGN mx6ul_14x14_evk: Use the default CONFIG_SYS_PBSIZE pcie_imx: Use 'ms' for milliseconds nitrogen6x: Fix the error handling in board_eth_init() ot1200: Fix the error handling in board_eth_init() tqma6_mba6: Fix the error handling in board_eth_init() udoo: Fix the error handling in board_eth_init() Michael Heimpold (1): mxs: mxsboot: fix endianess for sd boot images Nikita Kiryanov (4): compulab: eeprom: select i2c bus when querying for board rev compulab: eeprom: propagate error value in read_mac_addr() compulab: eeprom: add support for obtaining product name arm: mx6: cm-fx6: modify device tree for old revisions of utilite Peng Fan (5): Revert "imx: mx6: ddr correct tRFC and tXS" imx: discard duplicated MXC_OCOTP and CMD_FUSE imx: mx6ul: support mx6ul 9x9 evk board mx6: remove SYS_SOC from board Kconfig imx: mx6 discard 'select CPU_V7' for different targets arch/arm/Kconfig | 6 + arch/arm/Makefile | 4 +- arch/arm/cpu/armv7/Makefile | 3 +- arch/arm/cpu/armv7/mx6/Kconfig | 30 +- arch/arm/cpu/armv7/mx6/ddr.c | 4 +- arch/arm/cpu/armv7/mx6/soc.c | 198 +---- arch/arm/cpu/armv7/mx7/Kconfig | 27 + arch/arm/cpu/armv7/mx7/Makefile | 8 + arch/arm/cpu/armv7/mx7/clock.c | 1127 +++++++++++++++++++++++++ arch/arm/cpu/armv7/mx7/clock_slice.c | 757 +++++++++++++++++ arch/arm/cpu/armv7/mx7/soc.c | 269 ++++++ arch/arm/imx-common/Makefile | 10 +- arch/arm/imx-common/cache.c | 103 +++ arch/arm/imx-common/cpu.c | 33 +- arch/arm/imx-common/init.c | 117 +++ arch/arm/imx-common/syscounter.c | 126 +++ arch/arm/include/asm/arch-imx/cpu.h | 4 + arch/arm/include/asm/arch-mx6/imx-regs.h | 4 + arch/arm/include/asm/arch-mx7/clock.h | 348 ++++++++ arch/arm/include/asm/arch-mx7/clock_slice.h | 116 +++ arch/arm/include/asm/arch-mx7/crm_regs.h | 2813 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx7/imx-regs.h | 1307 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx7/sys_proto.h | 9 + arch/arm/include/asm/imx-common/boot_mode.h | 21 + arch/arm/include/asm/imx-common/sys_proto.h | 7 + arch/arm/include/asm/imx-common/syscounter.h | 29 + board/aristainetos/Kconfig | 9 - board/bachmann/ot1200/Kconfig | 3 - board/bachmann/ot1200/ot1200.c | 20 +- board/barco/platinum/Kconfig | 6 - board/barco/titanium/Kconfig | 3 - board/boundary/nitrogen6x/Kconfig | 3 - board/boundary/nitrogen6x/nitrogen6x.c | 19 +- board/compulab/cm_fx6/Kconfig | 3 - board/compulab/cm_fx6/cm_fx6.c | 22 +- board/compulab/cm_t35/cm_t35.c | 2 +- board/compulab/common/eeprom.c | 40 +- board/compulab/common/eeprom.h | 10 +- board/congatec/cgtqmx6eval/Kconfig | 3 - board/embest/mx6boards/Kconfig | 3 - board/freescale/mx6qarm2/Kconfig | 3 - board/freescale/mx6qsabreauto/Kconfig | 3 - board/freescale/mx6sabresd/Kconfig | 3 - board/freescale/mx6slevk/Kconfig | 3 - board/freescale/mx6sxsabresd/Kconfig | 3 - board/freescale/mx6ul_14x14_evk/Kconfig | 5 +- board/freescale/mx6ul_14x14_evk/README | 32 + board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 183 +++- board/freescale/mx7dsabresd/Kconfig | 15 + board/freescale/mx7dsabresd/MAINTAINERS | 6 + board/freescale/mx7dsabresd/Makefile | 6 + board/freescale/mx7dsabresd/imximage.cfg | 94 +++ board/freescale/mx7dsabresd/mx7dsabresd.c | 555 +++++++++++++ board/gateworks/gw_ventana/Kconfig | 3 - board/kosagi/novena/Kconfig | 3 - board/solidrun/mx6cuboxi/Kconfig | 3 - board/tqc/tqma6/Kconfig | 3 - board/tqc/tqma6/tqma6_mba6.c | 20 +- board/udoo/Kconfig | 3 - board/udoo/udoo.c | 19 +- board/wandboard/Kconfig | 3 - board/warp/Kconfig | 3 - configs/mx6ul_9x9_evk_defconfig | 8 + configs/mx7dsabresd_defconfig | 14 + drivers/pci/pcie_imx.c | 6 +- drivers/thermal/Makefile | 2 +- drivers/thermal/imx_thermal.c | 90 +- drivers/watchdog/Makefile | 2 +- include/configs/cgtqmx6eval.h | 7 +- include/configs/embestmx6boards.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 3 +- include/configs/mx6sxsabresd.h | 3 +- include/configs/mx6ul_14x14_evk.h | 49 +- include/configs/mx7_common.h | 95 +++ include/configs/mx7dsabresd.h | 194 +++++ include/configs/tbs2910.h | 2 +- tools/mxsboot.c | 19 +- 80 files changed, 8659 insertions(+), 440 deletions(-) create mode 100644 arch/arm/cpu/armv7/mx7/Kconfig create mode 100644 arch/arm/cpu/armv7/mx7/Makefile create mode 100644 arch/arm/cpu/armv7/mx7/clock.c create mode 100644 arch/arm/cpu/armv7/mx7/clock_slice.c create mode 100644 arch/arm/cpu/armv7/mx7/soc.c create mode 100644 arch/arm/imx-common/cache.c create mode 100644 arch/arm/imx-common/init.c create mode 100644 arch/arm/imx-common/syscounter.c create mode 100644 arch/arm/include/asm/arch-mx7/clock.h create mode 100644 arch/arm/include/asm/arch-mx7/clock_slice.h create mode 100644 arch/arm/include/asm/arch-mx7/crm_regs.h create mode 100644 arch/arm/include/asm/arch-mx7/imx-regs.h create mode 100644 arch/arm/include/asm/arch-mx7/sys_proto.h create mode 100644 arch/arm/include/asm/imx-common/syscounter.h create mode 100644 board/freescale/mx6ul_14x14_evk/README create mode 100644 board/freescale/mx7dsabresd/Kconfig create mode 100644 board/freescale/mx7dsabresd/MAINTAINERS create mode 100644 board/freescale/mx7dsabresd/Makefile create mode 100644 board/freescale/mx7dsabresd/imximage.cfg create mode 100644 board/freescale/mx7dsabresd/mx7dsabresd.c create mode 100644 configs/mx6ul_9x9_evk_defconfig create mode 100644 configs/mx7dsabresd_defconfig create mode 100644 include/configs/mx7_common.h create mode 100644 include/configs/mx7dsabresd.h