From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Sat, 11 Oct 2014 07:49:53 -0400 Subject: [U-Boot] Pull request: u-boot-arm/master In-Reply-To: References: Message-ID: <20141011114953.GZ25506@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sat, Oct 11, 2014 at 02:38:24AM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > db67801bf92f7fae6131dbc0d387131698fb9490: > > Merge branch 'master' of git://git.denx.de/u-boot-nand-flash > (2014-10-10 09:45:16 -0400) > > are available in the git repository at: > > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 3d420cbd355a5f09e4f113eb10579a264a8ef138: > > Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into > 'u-boot-arm/master' (2014-10-11 01:20:55 +0200) > > ---------------------------------------------------------------- > > Albert ARIBAUD (4): > Merge remote-tracking branch 'u-boot-imx/master' > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > Merge branch 'u-boot/master' into 'u-boot-arm/master' > Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into > 'u-boot-arm/master' > > Andreas Bie?mann (2): > macb: simplify gmac initialisation > sama5d3xek: run PHY's config > > Andrew Ruder (2): > arm: mx31: use common timer functions > arm: mx35: use common timer functions > > Bo Shen (1): > ARM: atmel: switch at91sam9263ek to generic board > > Christian Gmeiner (1): > imx6: add Bachmann OT1200 board > > Diego Rondini (1): > nitrogen6x: config: allow boot to USB stick > > Eric Nelson (23): > nitrogen6x: Update DDR timings for 2G memory arrangement > nitrogen6x: implement board_cfb_skip() to disable text output > nitrogen6x: configure SD2 pads for SDIO on USDHC2 > nitrogen6x: power-down miscellanous peripherals > nitrogen6x: staticize board file > nitrogen6x: prevent warnings about board_ehci* callbacks > nitrogen6x: display: add qvga panel > nitrogen6x: display: add support for LG-9.7 LVDS display > nitrogen6x: display: add LDB-WXGA-S for SPWG 1280x800 displays > nitrogen6x: display: add support for fusion 7 display > nitrogen6x: display: add svga display (800x600) > nitrogen6x: display: add Ampire 1024x600 panel > nitrogen6x: display: add wvga-lvds panel > nitrogen6x: display use I2C detect for HDMI > nitrogen6x: config: add USB Mass Storage (ums) support > nitrogen6x: config: add initrd_high > nitrogen6x: config: expose SATA, then MMC over USB > nitrogen6x: config: enable USB keyboard support > nitrogen6x: config: add CONFIG_CMD_MEMTEST > nitrogen6x: config: enable "i2c edid" > nitrogen6x: config: disable logo > nitrogen6x: config: add gpio command > nitrogen6x: config: enable Android fastboot > > Fabio Estevam (9): > mx6sxsabresd: Staticize i2c_pad_info1 > mx6qsabreauto: Staticize when possible > cm_fx6: Remove CONFIG_NETMASK > mx51evk: Fix CONFIG_SYS_FSL_ESDHC_ADDR > mx51evk: Add generic board support > mx25pdk: Fix CONFIG_SYS_FSL_ESDHC_ADDR > mx25pdk: Add generic board support > wandboard: Select CONFIG_CMD_FUSE > mx6sxsabresd: Fix PCI reset and power GPIO assignments > > Guillaume GARDET (1): > imx: nitrogen6x: Make use of both uSD and SD slots to load script > or kernel on Sabrelite board > > Heiko Schocher (1): > arm, at91: add generic board support for the taurus and corvus > board > > Kevin Mihelich (2): > nitrogen6x: config: use FS_GENERIC load command > nitrogen6x: config: enable EXT4 filesystem > > Marek Vasut (12): > usb: ehci: mxs: Add board-specific callbacks > arm: mxs: Wait when disabling VDDMEM current limiter > arm: mxs: Wait for DRAM to start > arm: mxs: olinuxino: Enable USB only when needed > arm: mxs: olinuxino: Fine-tune DRAM configuration > arm: m28evk: Test if bootscript exists before loading it > arm: m53evk: Test if bootscript exists before loading it > arm: m28evk: Enable FS_GENERIC > arm: m53evk: Enable FS_GENERIC > arm: m28evk: Zap superfluous tab in env > arm: m53evk: Zap superfluous tab in env > arm: socfpga: Use EMAC1 on SoCDK > > Masahiro Yamada (1): > exynos: update maintainer of Snow and SMDK5420 board > > Minkyu Kang (3): > Revert "odroid: set MPLL clock to 880MHz" > Merge branch 'master' of http://git.denx.de/u-boot-samsung > Merge branch 'uboot' > > Nikita Kiryanov (1): > compulab: eeprom: add default eeprom bus > > Nitin Garg (3): > imx: ddr: Move mx6q_4x_mt41j128.cfg to mx6sabresd board > imx: Support i.MX6 High Assurance Boot authentication > imx6sx: Fix i.MX6SX HAB api function table offset > > Nobuhiro Iwamatsu (11): > arm: rmobile: lager: Fix value of CONFIG_SH_SCIF_CLK_FREQ > arm: rmobile: lager: Add CONFIG_SCIF_USE_EXT_CLK > arm: rmobile: koelsch: Add CONFIG_SCIF_USE_EXT_CLK > arm: rmobile: koelsch: Update QoS initialization to version 0.334 > arm: rmobile: alt: Update QoS initialization to version 0.11 > arm: rmobile: lager: Update Qos setting to version 0.955 > arm: rmobile: lager: Add Qos setting for ES2 > arm: rmobile: lager: Fix CPU frequency setting > arm: rmobile: Remove unnecessary initialization for l2ctlr > arm: rmobile: r8a7791: Fix initialize L2 cache > arm: rmobile: r8a7794: Skip initialize L2 cache > > Pavel Machek (1): > arm: socfpga: add MAINTAINERS entry > > Peng Fan (3): > imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR > imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR > imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR > > Przemyslaw Marczak (1): > odroid: clock: set aclk_cores to 200MHz > > Robert Baldyga (1): > armv7: s5pc1xx: improve cache handling > > Robert Winkler (1): > nitrogen6x: display: add support lvds jeida screen > > Simon Glass (15): > Exynos: Use 900MHz ARM frequency in SPL for peach_pit > exynos5: Enable data cache > cros_ec: power: Add a tunnelled version of the tps65090 driver > cros_ec: exynos: Use the correct tps65090 driver in each case > dm: exynos: Split out the cros_ec drivers > exynos: dts: Add device tree node for cros_ec keyboard > exynos: Rename -dt config files to -common > exynos: Move common exynos settings into a common file > exynos: Move common smdk5420 things to common file > exynos: config: Move cros_ec and tps65090 out of smdk boards > config: Move arndale to use common exynos5250 file > config: Move smdkv310 to use common exynos4 file > samsung: Enable device tree for s5p_goni > samsung: Enable device tree for smdkc100 > exynos: Enable pre-relocation malloc() > > Stefan Agner (2): > mtd: nand: add Freescale vf610_nfc driver > arm: vf610: add NAND support for vf610twr > > Stefan Roese (1): > ARM: mx6: gw_ventana: Remove superfluous memset of GD in > board_init_f > > Stefano Babic (3): > Merge branch 'master' of git://git.denx.de/u-boot-arm > imx: Fix warning by building vf610twr_nand > Merge branch 'master' of git://git.denx.de/u-boot-arm > > Troy Kisky (4): > nitrogen6x: simplify board_mmc_getcd > nitrogen6x: configure SGTL5000, CSI camera clock outputs > nitrogen6x: phy: add 100 us delay after phy reset > nitrogen6x: config: allow more bootargs parameters > > Ye.Li (6): > imx: mx6qarm2: Add the kernel FDT Loading support > imx: mx6qarm2: Change the mmcroot and mmcpart env value > imx: mx6: Checking PLL2 PFD0 and PFD2 for periph_clk before PFD > reset usb: ehci-mx6: Rename the USB register base address > imx: mx6dlarm2: Add support for i.MX6DL arm2 DDR3 board > imx: mx6dlarm2: Add support for i.MX6Q/DL arm2 LPDDR2 boards > > MAINTAINERS | 7 + > arch/arm/Kconfig | 17 +- > arch/arm/cpu/arm1136/mx31/timer.c | 104 +- > arch/arm/cpu/arm1136/mx35/timer.c | 83 -- > arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 13 +- > arch/arm/cpu/armv7/exynos/Kconfig | 1 + > arch/arm/cpu/armv7/mx6/clock.c | 27 + > arch/arm/cpu/armv7/mx6/hab.c | 169 ++- > arch/arm/cpu/armv7/mx6/soc.c | 39 +- > arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 22 +- > arch/arm/cpu/armv7/s5pc1xx/Kconfig | 25 + > arch/arm/cpu/armv7/s5pc1xx/cache.S | 30 - > arch/arm/cpu/armv7/s5pc1xx/cache.c | 47 + > arch/arm/dts/Makefile | 3 + > arch/arm/dts/exynos4210-smdkv310.dts | 21 + > arch/arm/dts/exynos5420-peach-pit.dts | 57 +- > arch/arm/dts/s5pc1xx-goni.dts | 28 + > arch/arm/dts/s5pc1xx-smdkc100.dts | 29 + > arch/arm/include/asm/arch-mx31/imx-regs.h | 10 + > arch/arm/include/asm/arch-mx35/imx-regs.h | 12 + > arch/arm/include/asm/arch-mx6/clock.h | 1 + > arch/arm/include/asm/arch-mx6/hab.h | 16 +- > arch/arm/include/asm/arch-mx6/imx-regs.h | 9 +- > arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 + > arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 + > board/atmel/sama5d3xek/sama5d3xek.c | 29 +- > board/bachmann/ot1200/Kconfig | 23 + > board/bachmann/ot1200/MAINTAINERS | 6 + > board/bachmann/ot1200/Makefile | 9 + > board/bachmann/ot1200/README | 20 + > .../ddr => bachmann/ot1200}/mx6q_4x_mt41j128.cfg | 0 > board/bachmann/ot1200/ot1200.c | 251 ++++ > board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 24 +- > board/boundary/nitrogen6x/nitrogen6x.c | 292 ++++- > board/compulab/common/eeprom.c | 4 + > board/congatec/cgtqmx6eval/imximage.cfg | 169 +++ > board/freescale/mx6qarm2/MAINTAINERS | 4 + > board/freescale/mx6qarm2/imximage.cfg | 189 ++- > board/freescale/mx6qarm2/imximage_mx6dl.cfg | 462 +++++++ > board/freescale/mx6qarm2/mx6qarm2.c | 11 +- > board/freescale/mx6qsabreauto/mx6qsabreauto.c | 16 +- > board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 169 +++ > board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- > board/freescale/vf610twr/MAINTAINERS | 1 + > board/freescale/vf610twr/vf610twr.c | 47 +- > board/gateworks/gw_ventana/gw_ventana_spl.c | 7 - > board/olimex/mx23_olinuxino/mx23_olinuxino.c | 46 +- > board/renesas/alt/qos.c | 6 +- > board/renesas/koelsch/qos.c | 41 +- > board/renesas/lager/lager.c | 8 +- > board/renesas/lager/qos.c | 1358 > +++++++++++++++++++- > board/samsung/odroid/odroid.c | 64 +- > board/samsung/smdk5250/MAINTAINERS | 2 +- > board/samsung/smdk5420/MAINTAINERS | 4 - > configs/cgtqmx6qeval_defconfig | 2 +- > configs/mx6dlarm2_defconfig | 3 + > configs/mx6dlarm2_lpddr2_defconfig | 3 + > configs/mx6qarm2_defconfig | 2 +- > configs/mx6qarm2_lpddr2_defconfig | 3 + > configs/mx6qsabresd_defconfig | 2 +- > configs/ot1200_defconfig | 3 + > configs/s5p_goni_defconfig | 2 + > configs/smdkc100_defconfig | 2 + > configs/smdkv310_defconfig | 1 + > configs/vf610twr_defconfig | 2 +- > configs/vf610twr_nand_defconfig | 3 + > drivers/mmc/s5p_sdhci.c | 2 - > drivers/mtd/nand/Makefile | 1 + > drivers/mtd/nand/vf610_nfc.c | 724 +++++++++++ > drivers/net/macb.c | 25 +- > drivers/power/pmic/Makefile | 3 +- > drivers/power/pmic/pmic_tps65090_ec.c | 218 ++++ > drivers/usb/host/ehci-mx6.c | 4 +- > drivers/usb/host/ehci-mxs.c | 16 + > include/configs/arndale.h | 195 +-- > include/configs/at91sam9263ek.h | 2 + > include/configs/cm_fx6.h | 1 - > include/configs/corvus.h | 2 + > include/configs/{exynos4-dt.h => exynos-common.h} | 110 +- > include/configs/exynos4-common.h | 68 + > include/configs/{exynos5-dt.h => exynos5-common.h} | 126 +- > include/configs/exynos5-dt-common.h | 35 > + .../{exynos5250-dt.h => exynos5250-common.h} | 7 > +- .../configs/{exynos5420.h => exynos5420-common.h} | 22 +- > include/configs/koelsch.h | 1 + > include/configs/lager.h | 3 +- > include/configs/m28evk.h | 13 +- > include/configs/m53evk.h | 13 +- > include/configs/mx25pdk.h | 3 +- > include/configs/mx51evk.h | 3 +- > include/configs/mx6qarm2.h | 49 +- > include/configs/mx6slevk.h | 2 +- > include/configs/mx6sxsabresd.h | 6 +- > include/configs/nitrogen6x.h | 113 +- > include/configs/odroid.h | 4 +- > include/configs/origen.h | 5 +- > include/configs/ot1200.h | 197 +++ > include/configs/peach-pit.h | 16 +- > include/configs/s5p_goni.h | 9 +- > include/configs/s5pc210_universal.h | 5 +- > include/configs/smdk5250.h | 23 +- > include/configs/smdk5420.h | 5 +- > include/configs/smdkc100.h | 6 + > include/configs/smdkv310.h | 61 +- > include/configs/snow.h | 25 +- > include/configs/socfpga_cyclone5.h | 2 +- > include/configs/taurus.h | 2 + > include/configs/trats.h | 6 +- > include/configs/trats2.h | 6 +- > include/configs/vf610twr.h | 46 +- > include/configs/wandboard.h | 5 + 111 files > changed, 5360 insertions(+), 1003 deletions(-) create mode 100644 > arch/arm/cpu/armv7/s5pc1xx/Kconfig delete mode 100644 > arch/arm/cpu/armv7/s5pc1xx/cache.S create mode 100644 > arch/arm/cpu/armv7/s5pc1xx/cache.c create mode 100644 > arch/arm/dts/exynos4210-smdkv310.dts create mode 100644 > arch/arm/dts/s5pc1xx-goni.dts create mode 100644 > arch/arm/dts/s5pc1xx-smdkc100.dts create mode 100644 > arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644 > arch/arm/include/asm/arch-s5pc1xx/pinmux.h create mode 100644 > board/bachmann/ot1200/Kconfig create mode 100644 > board/bachmann/ot1200/MAINTAINERS create mode 100644 > board/bachmann/ot1200/Makefile create mode 100644 > board/bachmann/ot1200/README rename board/{freescale/imx/ddr => > bachmann/ot1200}/mx6q_4x_mt41j128.cfg (100%) create mode 100644 > board/bachmann/ot1200/ot1200.c create mode 100644 > board/congatec/cgtqmx6eval/imximage.cfg create mode 100644 > board/freescale/mx6qarm2/imximage_mx6dl.cfg create mode 100644 > board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg create mode 100644 > configs/mx6dlarm2_defconfig create mode 100644 > configs/mx6dlarm2_lpddr2_defconfig create mode 100644 > configs/mx6qarm2_lpddr2_defconfig create mode 100644 > configs/ot1200_defconfig create mode 100644 > configs/vf610twr_nand_defconfig create mode 100644 > drivers/mtd/nand/vf610_nfc.c create mode 100644 > drivers/power/pmic/pmic_tps65090_ec.c rename > include/configs/{exynos4-dt.h => exynos-common.h} (51%) create mode > 100644 include/configs/exynos4-common.h rename > include/configs/{exynos5-dt.h => exynos5-common.h} (64%) create mode > 100644 include/configs/exynos5-dt-common.h rename > include/configs/{exynos5250-dt.h => exynos5250-common.h} (88%) rename > include/configs/{exynos5420.h => exynos5420-common.h} (71%) create > mode 100644 include/configs/ot1200.h Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: