From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Tue, 10 Feb 2015 13:19:46 +0100 Subject: [U-Boot] [PULL] Please pull u-boot-imx Message-ID: <54D9F762.8050004@denx.de> 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 ab77f24119e80257de4ab017b877f92f96980562: Merge branch 'master' of git://git.denx.de/u-boot-ti (2015-01-16 10:25:01 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to aee0013e53b339a573e2a8d66062fe87765aa3bd: mx53loco: Fix boot hang during reboot stress test (2015-02-10 12:48:50 +0100) ---------------------------------------------------------------- Alexandre Coffignal (1): mxsboot : Support of 224-bytes OOB area length Christian Gmeiner (7): ot1200: select SUPPORT_SPL ot1200: make use of imx_ddr_size(..) ot1200: move ccgr and gpr init to c functions ot1200: enable spi clock directly in ccgr_init(..) ot1200: add SPL configuration ot1200: add basic SPL support ot1200: add ot1200_spl_defconfig file Fabio Estevam (2): mx6sxsabresd: Remove unneeded board_late_init() mx53loco: Fix boot hang during reboot stress test Graeme Russ (3): arm: mxs: Add debug outputs and comments to mxs SPL source files arm: mxs: Enable booting of mx28 without battery arm: mxs: Add 'Wait for JTAG user' if booted in JTAG mode Heiko Schocher (1): arm, imx6, aristainetos: board updates Nikita Kiryanov (14): arm: mx6: cm-fx6: expand boot sequence arm: mx6: cm-fx6: change dtb node for ethaddr compulab: eeprom: allow reading mac address from multiple eeproms arm: mx6: cm-fx6: pass 2nd nic mac addr to Linux arm: mx6: cm-fx6: increase size of malloc area arm: mx6: cm-fx6: add hdmi console support arm: mx6: cm-fx6: display compulab logo arm: mx6: cm-fx6: add support for usb keyboard compulab: splash: use errno values compulab: splash: refactor splash.c compulab: splash: support multiple splash sources compulab: splash: support loading splash from sf arm: mx6: cm-fx6: add splash screen support common: convert compulab splash load code to common code Otavio Salvador (1): wandboard: Use 32bit color depth for Fusion LCD Peng Fan (9): imx:mx6sxsabresd add spl config file imx:mx6sxsabresd select SUPPORT_SPL imx:mx6sxsabresd spl support in header file imx:mx6sx add dram io configure for mx6sx imx:mx6 add mx6sx in imx spl header file imx:mx6sxsabresd board spl support imx:mx6 update fuse_bank0_regs pmic:pfuze add macro for setting voltage pmic:pfuz100 add switch mode and more registers Stefan Roese (1): arm: mx6: Add Barco platinum-picon and platinum-titanium Stefano Babic (1): mx6: fix warning in platinum board Ye.Li (4): imx: mx6: Change ENV offset to 512K bytes for larger u-boot image imx: mx6qsabreauto: Change to use common GPMI IO clock function imx: imximage: Add QuadSPI boot support imx: mx6: Fixed AIPS3 base address issue arch/arm/Kconfig | 13 ++++ arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 6 ++ arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 13 +++- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 ++++++ arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 110 ++++++++++++++++++++++++++++++++-- arch/arm/cpu/armv7/mx6/ddr.c | 96 +++++++++++++++++++++++++----- arch/arm/cpu/armv7/mx6/soc.c | 2 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 16 +++-- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 46 ++++++++++++++ arch/arm/include/asm/arch-mxs/sys_proto.h | 17 ++++++ board/aristainetos/aristainetos.c | 8 +-- board/bachmann/ot1200/Makefile | 4 ++ board/bachmann/ot1200/mx6q_4x_mt41j128.cfg | 14 ----- board/bachmann/ot1200/ot1200.c | 34 +++++++++-- board/bachmann/ot1200/ot1200_spl.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/Kconfig | 37 ++++++++++++ board/barco/platinum/MAINTAINERS | 7 +++ board/barco/platinum/Makefile | 14 +++++ board/barco/platinum/platinum.c | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/platinum.h | 89 ++++++++++++++++++++++++++++ board/barco/platinum/platinum_picon.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/platinum_titanium.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/spl_picon.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/spl_titanium.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/compulab/cm_fx6/cm_fx6.c | 95 ++++++++++++++++++++++++++--- board/compulab/cm_t335/cm_t335.c | 2 +- board/compulab/cm_t35/cm_t35.c | 14 ++++- board/compulab/cm_t3517/cm_t3517.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/compulab/common/Makefile | 1 - board/compulab/common/common.h | 9 --- board/compulab/common/eeprom.c | 20 ++++--- board/compulab/common/eeprom.h | 4 +- board/compulab/common/splash.c | 72 ---------------------- board/freescale/mx53loco/imximage.cfg | 3 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 25 +------- board/freescale/mx6sxsabresd/MAINTAINERS | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++-- common/Makefile | 1 + common/splash_source.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/mx6sxsabresd_spl_defconfig | 4 ++ configs/ot1200_spl_defconfig | 4 ++ configs/platinum_picon_defconfig | 4 ++ configs/platinum_titanium_defconfig | 4 ++ doc/README.splashprepare | 13 ++++ include/configs/aristainetos.h | 167 ++++++++++++++++++++++++++++----------------------- include/configs/cm_fx6.h | 158 ++++++++++++++++++++++++++++--------------------- include/configs/cm_t35.h | 1 + include/configs/imx6_spl.h | 8 +++ include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabresd.h | 9 ++- include/configs/ot1200.h | 11 +++- include/configs/platinum.h | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/platinum_picon.h | 31 ++++++++++ include/configs/platinum_titanium.h | 38 ++++++++++++ include/configs/wandboard.h | 2 +- include/power/pfuze100_pmic.h | 55 +++++++++++++++++ include/splash.h | 11 ++++ tools/imximage.c | 2 + tools/imximage.h | 2 + tools/logos/compulab.bmp | Bin 0 -> 31810 bytes tools/mxsboot.c | 6 ++ 62 files changed, 2863 insertions(+), 329 deletions(-) create mode 100644 board/bachmann/ot1200/ot1200_spl.c create mode 100644 board/barco/platinum/Kconfig create mode 100644 board/barco/platinum/MAINTAINERS create mode 100644 board/barco/platinum/Makefile create mode 100644 board/barco/platinum/platinum.c create mode 100644 board/barco/platinum/platinum.h create mode 100644 board/barco/platinum/platinum_picon.c create mode 100644 board/barco/platinum/platinum_titanium.c create mode 100644 board/barco/platinum/spl_picon.c create mode 100644 board/barco/platinum/spl_titanium.c delete mode 100644 board/compulab/common/splash.c create mode 100644 common/splash_source.c create mode 100644 configs/mx6sxsabresd_spl_defconfig create mode 100644 configs/ot1200_spl_defconfig create mode 100644 configs/platinum_picon_defconfig create mode 100644 configs/platinum_titanium_defconfig create mode 100644 include/configs/platinum.h create mode 100644 include/configs/platinum_picon.h create mode 100644 include/configs/platinum_titanium.h create mode 100644 tools/logos/compulab.bmp -- ===================================================================== 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 =====================================================================