On Tue, May 20, 2014 at 10:57:08AM +0200, Albert ARIBAUD wrote:

Hello Tom,

The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687:

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400)

are available in the git repository at:

git://git.denx.de/u-boot-arm master

for you to fetch changes up to 05d134b084590684bcf4d832c0035952727b7cd9:

Merge remote-tracking branch 'u-boot/master' (2014-05-20 10:05:42 +0200)

Note: there still is a Zynq PR pending right now, but I wanted to get re-synchronized with mainline first; a further PR with Zynq and individual patches will arrive soon.

---

Akshay Saraswat (3): Exynos5: config: Enable FIT S5P: Exynos: Add GPIO pin numbering and rename definitions S5P: Exynos: Config: Enable GPIO CMD config

Albert ARIBAUD (12): arm1136: move cache code from start.S to cache.c arm: move reset_cpu from start.S into cpu.c arm: pxa: move SP check from start.S to cpuinfo.c arm: remove unused _end_vect and _vectors_end symbols arm: move exception handling out of start.S files Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge remote-tracking branch 'u-boot-sh/rmobile' boards.cfg: reformat Merge remote-tracking branch 'u-boot/master'

Ash Charles (1): am335x: pepper: Add Gumstix Pepper AM335x-based machine

Belisko Marek (1): mtd: nand: omap_gpmc: Fix update of read_ecc in oob

Christian Riesch (1): arm, davinci: Use CONFIG_SPL_PAD_TO for padding the SPL in an ais image

Dmitry Lifshitz (3): ARM: OMAP5: add UART4 support ARM: OMAP5: Power: add LDO2 support for Palmas driver ARM: OMAP5: add CKO buffer control mask

Egli, Samuel (7): siemens: cosmetic: remove unused and rename defines siemens: update DDR3 parameters for dxr2 siemens: add led cmd for flexible LED control siemens: change LED indication in DFU mode siemens: cosmetic: rename project_dir siemens:cosmetic, dxr2: rename dxr2 to draco siemens, draco: add new target

Eric Benard (8): imx-common: add board_video_skip nitrogen6x: use common board_video_skip mx6sabresd: use common board_video_skip RiOTboard and MarSBoard: add new boards support imx-common/video: add detect_hdmi nitrogen6x: use common detect_hdmi mx6sabresd: use common detect_hdmi embest/mx6boards: use common detect_hdmi

Eric Nelson (1): ARM: imx6: nitrogen6x: Enable CONFIG_SYS_GENERIC_BOARD

Fabio Estevam (11): wandboard: Convert to generic board mx53loco: Convert to generic board mx6sabre_common: Convert to generic board mx53ard: Convert to generic board mx53smd: Convert to generic board mx53evk: Convert to generic board udoo: Convert to generic board hummingboard: Convert to generic board mx6slevk: Add SPI NOR flash support nitrogen6x: Fix the PAD settings for the ECSPI chipselect iomux-v3: Add support for mx6sl LVE bit

Inha Song (1): samsung: misc: add env default option to lcd menu

Jaehoon Chung (1): ARM: exynos: remove the unused code

Khoronzhuk, Ivan (1): config: k2hk_evm: Add generic board support

Marek Vasut (1): arm: mxs: Enable CONFIG_SYS_GENERIC_BOARD

Mateusz Zalega (1): ARM: Samsung: s5p_goni: maintainer update

Nobuhiro Iwamatsu (22): arm: rmobile: Coordinate the common part of the header file of r8a7790 and r8a7791 arm: rmobile: r8a779x: Fix L2 cache init and latency setting arm: rmobile: koelsch: Change name of structure arm: rmobile: koelsch: Remove NOR-Flash support arm: rmobile: lager: Change name of the structure arm: rmobile: lager: Remove NOR-Flash support arm: rmobile: Merge functions to get the CPU information of R8A7790 and R8A7791 arm: rmobile: Add 1 to value of the CPU revision in rmobile_get_cpu_rev_integer() arm: rmobile: Add rmobile_get_cpu_rev_fraction() for R-Car SoCs arm: rmobile: Add prototype for function to get the CPU information to rmobile.h arm: rmobile: Update print_cpuinfo function arm: rmobile: r8a7790: Add support ES2 revision arm: rmobile: r8a7791: Add support ES2 revision arm: rmobile: keolsch: Add support ES2 revision of R8A7791 arm: rmobile: lager: Update QoS initialization to version 0.955 arm: rmobile: koelsch: Update QoS initialization arm: rmobile: koelsch: Update calculation of CONFIG_SH_TMU_CLK_FREQ arm: rmobile: Add register infomation of PLL regsiter arm: rmobile: koelsch: Change to maximum CPU frequency arm: rmobile: lager: Update calculation of CONFIG_SH_TMU_CLK_FREQ arm: rmobile: lager: Change to maximum CPU frequency arm: rmobile: lager: Remove MACH_TYPE_LAGER and CONFIG_MACH_TYPE

Otavio Salvador (2): wandboard: add Future Eletronics 7" WVGA LCD extension board wandboard: Pass video kernel arguments for HDMI and LCD

Przemyslaw Marczak (4): samsung: misc: allows using environmental macros as args in menu commands samsung: misc: add gpt restore option to lcd menu samsung: misc: menu: increase delay in menu main loop samsung: misc: remove download mode info screen

Robert Nelson (2): omap3_beagle: use omap3-beagle-xm-ab.dtb for the xM AB revision omap3_beagle: xM A/B validate new dtb exits in file system

Stefano Babic (3): mx6: fix weird formatting in imx6q-sabreauto.dts Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm

Stephen Warren (10): ARM: tegra: set CONFIG_SYS_MMC_MAX_DEVICE ARM: tegra: fix CPU VDD comment in Tegra30 CPU init code ARM: tegra: allow pinmux mux option not to be set by init tables ARM: tegra: add GPIO initialization table function ARM: tegra: add function to enable input clamping on tristate ARM: tegra: make use of GPIO init table on Jetson TK1 ARM: tegra: clamp inputs on Jetson TK1 ARM: tegra: update Venice2 pinmux ARM: tegra: Venice2 pinmux spreadsheet updates ARM: tegra: use a CPU freq that all SKUs can support

Thomas Diener (2): imx25: Add new hardware registers video: Add support for imx25 lcd controller

Tim Harvey (10): ventana: fixed comments in eeprom header ventana: remove redundant include power: make pfuze100 be able to coexist with other pmics ventana: use non-generic pfuze100 init power: Add support for LTC3676 PMIC ventana: Add support for the LTC3676 PMIC imx6: ventana: fix system-serial dt property imx: ventana: Convert to generic board imx: ventana: add HDMI and LVDS display capability nand: remove CONFIG_SYS_NAND_PAGE_SIZE

Yegor Yefremov (1): am33xx: add SSC enable macro

Łukasz Majewski (2): trats2: config: fix: Set default console to ttySAC2 trats: config: fix: Set default console to ttySAC2

Makefile | 2 +- arch/arm/cpu/arm1136/start.S | 254 +------------- arch/arm/cpu/arm1176/start.S | 198 +---------- arch/arm/cpu/arm720t/start.S | 229 +------------ arch/arm/cpu/arm720t/tegra-common/cpu.c | 10 +- arch/arm/cpu/arm720t/tegra30/cpu.c | 23 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 3 +- arch/arm/cpu/arm920t/start.S | 216 +----------- arch/arm/cpu/arm926ejs/mxs/start.S | 92 +----- arch/arm/cpu/arm926ejs/spear/start.S | 27 +- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 1 + arch/arm/cpu/arm926ejs/start.S | 262 +-------------- arch/arm/cpu/arm946es/cpu.c | 13 + arch/arm/cpu/arm946es/start.S | 246 +------------- arch/arm/cpu/arm_intcm/start.S | 228 +------------ arch/arm/cpu/armv7/exynos/pinmux.c | 561 +++++++++++++++++-------------- arch/arm/cpu/armv7/rmobile/Makefile | 4 +- arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c | 29 -- arch/arm/cpu/armv7/rmobile/{cpu_info-r8a7790.c => cpu_info-rcar.c} | 12 +- arch/arm/cpu/armv7/rmobile/cpu_info.c | 49 ++- arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 20 +- arch/arm/cpu/armv7/socfpga/lowlevel_init.S | 15 +- arch/arm/cpu/armv7/start.S | 253 +------------- arch/arm/cpu/armv7/zynq/u-boot.lds | 2 +- arch/arm/cpu/pxa/cpuinfo.c | 6 + arch/arm/cpu/pxa/start.S | 253 +------------- arch/arm/cpu/sa1100/cpu.c | 14 + arch/arm/cpu/sa1100/start.S | 225 +------------ arch/arm/cpu/tegra-common/pinmux-common.c | 19 ++ arch/arm/cpu/u-boot-spl.lds | 1 + arch/arm/cpu/u-boot.lds | 1 + arch/arm/dts/exynos4210-origen.dts | 4 +- arch/arm/dts/exynos4210-trats.dts | 6 +- arch/arm/dts/exynos4210-universal_c210.dts | 4 +- arch/arm/dts/exynos4412-trats2.dts | 4 +- arch/arm/dts/imx6q-sabreauto.dts | 10 +- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/iomux-v3.c | 8 + arch/arm/imx-common/video.c | 65 ++++ arch/arm/include/asm/arch-am33xx/clock.h | 2 + arch/arm/include/asm/arch-exynos/cpu.h | 17 +- arch/arm/include/asm/arch-exynos/gpio.h | 1761 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- arch/arm/include/asm/arch-mx25/imx-regs.h | 175 ++++++++++ arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 4 + arch/arm/include/asm/arch-omap5/clock.h | 3 + arch/arm/include/asm/arch-omap5/omap.h | 1 + arch/arm/include/asm/arch-rmobile/r8a7790.h | 609 +--------------------------------- arch/arm/include/asm/arch-rmobile/r8a7791.h | 626 +---------------------------------- arch/arm/include/asm/arch-rmobile/rcar-base.h | 637 +++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-rmobile/rmobile.h | 6 + arch/arm/include/asm/arch-s5pc1xx/gpio.h | 948 ++++++++++++++++++++++++++++++++++++++++++++-------- arch/arm/include/asm/arch-tegra/gpio.h | 20 ++ arch/arm/include/asm/arch-tegra/pinmux.h | 5 + arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 - arch/arm/include/asm/arch-tegra114/pinmux.h | 1 + arch/arm/include/asm/arch-tegra124/pinmux.h | 1 + arch/arm/include/asm/arch-tegra20/pinmux.h | 1 + arch/arm/include/asm/arch-tegra30/pinmux.h | 1 + arch/arm/include/asm/imx-common/iomux-v3.h | 5 + arch/arm/include/asm/imx-common/video.h | 24 ++ arch/arm/lib/Makefile | 2 +- arch/arm/lib/cache.c | 13 +- arch/arm/lib/vectors.S | 291 ++++++++++++++++ board/boundary/nitrogen6x/nitrogen6x.c | 69 +--- board/compulab/cm_t335/u-boot.lds | 1 + board/embest/mx6boards/Makefile | 9 + board/embest/mx6boards/mx6boards.c | 601 +++++++++++++++++++++++++++++++++ board/freescale/mx31ads/u-boot.lds | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 67 +--- board/freescale/mx6slevk/mx6slevk.c | 20 ++ board/gateworks/gw_ventana/gw_ventana.c | 215 ++++++++++-- board/gateworks/gw_ventana/ventana_eeprom.h | 14 +- board/gumstix/pepper/Makefile | 13 + board/gumstix/pepper/board.c | 226 +++++++++++++ board/gumstix/pepper/board.h | 19 ++ board/gumstix/pepper/mux.c | 78 +++++ board/nvidia/jetson-tk1/jetson-tk1.c | 6 + board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 256 +++++++++----- board/nvidia/venice2/pinmux-config-venice2.h | 567 +++++++++++++++---------------- board/nvidia/venice2/venice2.c | 19 +- board/renesas/koelsch/koelsch.c | 194 +---------- board/renesas/koelsch/qos.c | 404 ++++++++++++++--------- board/renesas/lager/lager.c | 196 +---------- board/renesas/lager/qos.c | 236 ++++++------- board/samsung/arndale/arndale.c | 11 +- board/samsung/common/misc.c | 130 ++++---- board/samsung/goni/goni.c | 32 +- board/samsung/smdk5250/exynos5-dt.c | 20 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk5420/smdk5420.c | 15 +- board/samsung/smdkc100/smdkc100.c | 5 +- board/samsung/smdkv310/smdkv310.c | 19 +- board/samsung/trats/trats.c | 39 +-- board/samsung/trats2/trats2.c | 74 ++--- board/samsung/universal_c210/universal.c | 51 ++- board/siemens/common/board.c | 46 ++- board/siemens/{dxr2 => draco}/Makefile | 0 board/siemens/{dxr2 => draco}/board.c | 112 ++++--- board/siemens/{dxr2 => draco}/board.h | 26 +- board/siemens/{dxr2 => draco}/mux.c | 2 +- board/siemens/pxm2/board.c | 10 +- board/siemens/rut/board.c | 2 +- board/ti/am335x/u-boot.lds | 1 + board/wandboard/wandboard.c | 146 ++++++-- boards.cfg | 9 +- common/spl/spl_nand.c | 2 +- drivers/gpio/s5p_gpio.c | 204 ++++++++++-- drivers/gpio/tegra_gpio.c | 20 ++ drivers/mmc/tegra_mmc.c | 13 +- drivers/mtd/nand/omap_gpmc.c | 2 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_ltc3676.c | 32 ++ drivers/power/pmic/pmic_pfuze100.c | 2 +- drivers/video/Makefile | 1 + drivers/video/imx25lcdc.c | 121 +++++++ include/configs/beaver.h | 3 + include/configs/cardhu.h | 3 + include/configs/da850evm.h | 1 + include/configs/draco.h | 92 ++++++ include/configs/dxr2.h | 4 +- include/configs/embestmx6boards.h | 336 +++++++++++++++++++ include/configs/exynos5-dt.h | 2 + include/configs/gw_ventana.h | 20 ++ include/configs/hummingboard.h | 2 + include/configs/k2hk_evm.h | 1 + include/configs/koelsch.h | 36 +- include/configs/lager.h | 40 +-- include/configs/m28evk.h | 1 - include/configs/mx53ard.h | 2 + include/configs/mx53evk.h | 2 + include/configs/mx53loco.h | 2 + include/configs/mx53smd.h | 2 + include/configs/mx6sabre_common.h | 2 + include/configs/mx6sabresd.h | 1 + include/configs/mx6slevk.h | 12 + include/configs/mxs.h | 1 + include/configs/nitrogen6x.h | 2 + include/configs/omap3_beagle.h | 10 +- include/configs/pepper.h | 99 ++++++ include/configs/pxm2.h | 2 +- include/configs/s5p_goni.h | 4 +- include/configs/s5pc210_universal.h | 23 +- include/configs/siemens-am33x-common.h | 8 +- include/configs/smdk5250.h | 4 + include/configs/smdk5420.h | 4 + include/configs/smdkv310.h | 1 + include/configs/snow.h | 4 + include/configs/tegra-common.h | 7 + include/configs/trats.h | 17 +- include/configs/trats2.h | 17 +- include/configs/udoo.h | 2 + include/configs/wandboard.h | 38 ++- include/palmas.h | 4 + include/power/ltc3676_pmic.h | 51 +++ include/power/pfuze100_pmic.h | 1 + include/samsung/misc.h | 2 + 156 files changed, 7581 insertions(+), 6187 deletions(-) delete mode 100644 arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c rename arch/arm/cpu/armv7/rmobile/{cpu_info-r8a7790.c => cpu_info-rcar.c} (50%) create mode 100644 arch/arm/imx-common/video.c create mode 100644 arch/arm/include/asm/arch-rmobile/rcar-base.h create mode 100644 arch/arm/include/asm/imx-common/video.h create mode 100644 arch/arm/lib/vectors.S create mode 100644 board/embest/mx6boards/Makefile create mode 100644 board/embest/mx6boards/mx6boards.c create mode 100644 board/gumstix/pepper/Makefile create mode 100644 board/gumstix/pepper/board.c create mode 100644 board/gumstix/pepper/board.h create mode 100644 board/gumstix/pepper/mux.c rename board/siemens/{dxr2 => draco}/Makefile (100%) rename board/siemens/{dxr2 => draco}/board.c (63%) rename board/siemens/{dxr2 => draco}/board.h (71%) rename board/siemens/{dxr2 => draco}/mux.c (99%) create mode 100644 drivers/power/pmic/pmic_ltc3676.c create mode 100644 drivers/video/imx25lcdc.c create mode 100644 include/configs/draco.h create mode 100644 include/configs/embestmx6boards.h create mode 100644 include/configs/pepper.h create mode 100644 include/power/ltc3676_pmic.h

Applied to u-boot/master, thanks!