On Wed, Jul 02, 2014 at 10:33:16PM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > ba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab: > > Merge branch 'sandbox' of git://git.denx.de/u-boot-x86 (2014-06-24 > 14:06:22 -0400) > > are available in the git repository at: > > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 304f936aeaab0c3cc9d5af438fd3498ac7682991: > > Merge remote-tracking branch 'u-boot-samsung/master' (2014-07-01 > 20:52:51 +0200) > > ---------------------------------------------------------------- > > Akshay Saraswat (9): > Exynos5: DMC: Modify the definition of ddr3_mem_ctrl_init > Exynos5420: Remove code for enabling read leveling > Exynos5420: DMC: Add software read leveling > Exynos: SPI: Fix reading data from SPI flash > Exynos5420: Let macros be used for exynos5420 > Exynos5420: Introduce support for the Peach-Pit board > Exynos5: Config: Place environment at the end of SPI flash > Exynos5: Config: Increase SPL footprint for Exynos5420 > Exynos5: Config: Enable USB boot mode for all Exynos5 SoCs > > Albert ARIBAUD (8): > Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' > Merge branch 'u-boot/master' into 'u-boot-arm/master' > Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' > Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master' > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' > Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' > Merge remote-tracking branch 'u-boot-samsung/master' > > Alison Wang (2): > arm: vf610: Add QSPI driver support > arm: imx: Add two macros for VF610 in IOMUX_PAD structure > > Andreas Bießmann (2): > avr32: migrate cache functions > macb: make checkpatch clean > > Ash Charles (3): > omap: Don't enable GPMC CS0 with nothing attached > omap4: duovero: Correct name of default device tree > omap3: overo: Select fdtfile for expansion board > > Axel Lin (1): > spi: davinci: Fix register address for SPI1_BUS > > Chao Fu (1): > arm: vf610: Add QSPI support for VF610TWR > > Doug Anderson (1): > DMC: exynos5420: Gate CLKM to when reading PHY_CON13 > > Eric Nelson (1): > serial_mxc: disable new features of autobaud detection > > Fabio Estevam (10): > mx6sabreauto: Add the mx6dual-lite variant > mx6sabred: Add PFUZE100 PMIC support > mx25pdk: Add generic board support > mx6: Fix definition of IOMUXC_GPR12_DEVICE_TYPE_RC > embestmx6boards: Fix CONFIG_CONSOLE_DEV > embestmx6boards: Fix the dtb file name for riotboard > mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected > mx28evk: Add a target for SPI NOR boot > mx28evk: Add documentation on how to boot from SPI NOR > mx25pdk: Remove CONFIG_SYS_GENERIC_BOARD > > Felipe Balbi (5): > board: ti: am43xx: print unsupported board name > cpu: armv7: am33x: ddr: write emif ref_ctrl_shadow register > board: ti: am43xx: add support for AM43xx Starter Kit > board: ti: am43xx: add AM437x SK PHY Address > board: ti: am43xx: enable QSPI and Gbit Ethernet on AM437x SK > > Jeroen Hofstee (4): > tegra20: display: fix checking of return value > ARM: tegra: fix include guard > omap3: board: trivial: add void for no args > PMIC: MAX77686: fix invalid bus check > > Khoronzhuk, Ivan (2): > mtd: nand: davinci: add header file for driver definitions > ARM: keystone: aemif: move aemif driver to > drivers/memory/ti-aemif.c > > Marek Vasut (1): > arm: mx5: Enable CONFIG_SYS_GENERIC_BOARD on M53EVK > > Mark Rutland (1): > arm64: zero cntvoff_el2 > > Masahiro Yamada (3): > spl: consolidate arch/arm/include/asm/arch-*/spl.h > arm: fix a double-definition error of _start symbol > arm: zynq: fix a bug in Zynq linker script > > Michael Pratt (1): > Exynos: Split 5250 and 5420 memory bank configuration > > Minkyu Kang (1): > Revert "exynos: Enable PSHOLD in SPL" > > Nobuhiro Iwamatsu (2): > arm: rmobile: koelsch: Remove NOR-Flash support from boards.cfg > arm: rmobile: lager: Remove NOR-Flash support from boards.cfg > > Przemyslaw Marczak (2): > trats/trats2: exynos_power_init: return 0 if no battery detected. > Samsung: Goni: change maintainer to Robert Baldyga > > Shawn Guo (1): > mx6: drop ARM errata 742230 > > Stefano Babic (4): > MX25: fix build due to missing sys_proto.h > imx: correct HAB status for new chip TO > OMAP: disable gpmc timeout safely for reenabling > vf610: fix build due to missing sys_proto.h > > Stephen Warren (2): > ARM: tegra: fix extlinux.conf search location > ARM: tegra: set initrd_high so boot scripts work > > Steve Rae (1): > arm: bcm281xx: Add CONFIG_SYS_GENERIC_BOARD > > Tim Harvey (12): > spl: nand: add support for mxs nand > mx6: add common SPL configuration > mx6: add boot device support for SPL > imx: add comments and remove unused struct fields > mx6: add structs for mmdc and ddr iomux registers > mx6: add mmdc configuration for MX6Q/MX6DL > imx: iomux: add macros to setup iomux for multiple SoC types > imx: ventana: split read_eeprom into standalone file > imx: ventana: auto-configure for IMX6Q vs IMX6DL > imx: ventana: switch to SPL > dwc_ahsata: return failure for MX6 if not IMX6Q/IMX6D > imx: sata: return failure if not IMX6Q/IMX6D > > Tim Schendekehl (1): > arm: ethernut5: convert to generic board > > Tushar Behera (1): > Arndale: Enable preboot support > > Wu, Josh (3): > net: macb: enable dcache in macb > video: atmel_hlcdfb: enable dcache support > ARMv7: at91: enable ICache and DCache. > > Łukasz Majewski (2): > FIX: config: goni: Change goni configuration to use Tizen's THOR > downlodader FIX: config: goni: Change goni configuration to store envs > at eMMC > > arch/arm/cpu/arm720t/tegra-common/spl.c > | 2 +- > arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c > | 2 +- > arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c > | 1 + > arch/arm/cpu/armv7/am33xx/ddr.c > | 1 + > arch/arm/cpu/armv7/at91/cpu.c > | 2 + > arch/arm/cpu/armv7/exynos/dmc_common.c > | 2 +- > arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c > | 369 +++++++++++++++++++++++++++++++++++++++++------------- > arch/arm/cpu/armv7/exynos/exynos5_setup.h > | 21 ++-- > arch/arm/cpu/armv7/exynos/lowlevel_init.c > | 2 - > arch/arm/cpu/armv7/keystone/Makefile > | 1 - > arch/arm/cpu/armv7/mx6/Makefile > | 1 + > arch/arm/cpu/armv7/mx6/ddr.c > | 490 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/cpu/armv7/mx6/hab.c > | 73 +++++++++-- > arch/arm/cpu/armv7/omap-common/mem-common.c > | 6 +- > arch/arm/cpu/armv7/omap3/board.c > | 4 +- > arch/arm/cpu/armv7/tegra20/display.c > | 2 +- > arch/arm/cpu/armv7/zynq/u-boot.lds > | 1 + > arch/arm/cpu/armv8/transition.S > | 2 +- > arch/arm/dts/Makefile > | 3 +- > arch/arm/dts/exynos5420-peach-pit.dts > | 127 +++++++++++++++++++ > arch/arm/dts/exynos5420-smdk5420.dts > | 23 +--- > arch/arm/dts/exynos5420.dtsi > | 70 ----------- > arch/arm/dts/exynos54xx.dtsi > | 151 +++++++++++++++++++++++ > arch/arm/imx-common/Makefile > | 1 + > arch/arm/imx-common/cpu.c > | 16 ++- > arch/arm/imx-common/iomux-v3.c > | 18 ++- > arch/arm/imx-common/sata.c > | 7 +- > arch/arm/imx-common/spl.c > | 81 ++++++++++++ > arch/arm/include/asm/arch-at91/spl.h > | 24 ---- > arch/arm/include/asm/arch-davinci/emif_defs.h > | 72 ----------- > arch/arm/include/asm/arch-davinci/hardware.h > | 1 - > arch/arm/include/asm/arch-davinci/nand_defs.h > | 38 ------ > arch/arm/include/asm/arch-davinci/spl.h > | 16 --- > arch/arm/include/asm/arch-exynos/dmc.h > | 3 + > arch/arm/include/asm/arch-exynos/power.h > | 4 +- > arch/arm/include/asm/arch-keystone/hardware-k2hk.h > | 7 -- > arch/arm/include/asm/arch-keystone/hardware.h > | 30 +---- > arch/arm/include/asm/arch-keystone/nand_defs.h > | 23 ---- > arch/arm/include/asm/arch-mx35/spl.h > | 22 ---- > arch/arm/include/asm/arch-mx5/spl.h > | 13 -- > arch/arm/include/asm/arch-mx6/hab.h > | 17 ++- > arch/arm/include/asm/arch-mx6/imx-regs.h > | 2 + > arch/arm/include/asm/arch-mx6/iomux.h > | 2 +- > arch/arm/include/asm/arch-mx6/mx6-ddr.h > | 231 ++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx6/sys_proto.h > | 4 +- > arch/arm/include/asm/arch-tegra114/spl.h > | 22 ---- > arch/arm/include/asm/arch-tegra124/spl.h > | 13 -- > arch/arm/include/asm/arch-tegra20/spl.h > | 12 -- > arch/arm/include/asm/arch-tegra30/spl.h > | 12 -- > arch/arm/include/asm/arch-tnetv107x/emif_defs.h > | 1 - > arch/arm/include/asm/arch-tnetv107x/hardware.h > | 2 + > arch/arm/include/asm/arch-tnetv107x/nand_defs.h > | 23 ---- > arch/arm/include/asm/arch-vf610/crm_regs.h > | 11 +- > arch/arm/include/asm/arch-vf610/imx-regs.h > | 4 +- > arch/arm/include/asm/arch-vf610/iomux-vf610.h > | 17 ++- > arch/arm/include/asm/imx-common/iomux-v3.h > | 27 ++++ > arch/arm/include/asm/spl.h > | 20 +++ arch/arm/include/asm/{arch-keystone/emif_defs.h => > ti-common/davinci_nand.h} | 55 ++++++--- > arch/arm/include/asm/ti-common/ti-aemif.h > | 39 ++++++ > arch/arm/lib/vectors.S > | 2 - > arch/avr32/cpu/cache.c > | 20 +-- > arch/avr32/include/asm/arch-at32ap700x/cacheflush.h > | 2 - > arch/avr32/include/asm/dma-mapping.h > | 6 +- > arch/avr32/lib/board.c > | 4 +- > board/Barix/ipam390/ipam390.c > | 2 +- > board/ait/cam_enc_4xx/cam_enc_4xx.c > | 2 +- > board/davinci/da8xxevm/da830evm.c > | 3 +- > board/davinci/da8xxevm/da850evm.c > | 2 +- > board/davinci/dm355evm/dm355evm.c > | 3 +- > board/davinci/dm355leopard/dm355leopard.c > | 2 +- > board/davinci/dm365evm/dm365evm.c > | 3 +- > board/davinci/dm6467evm/dm6467evm.c > | 3 +- > board/davinci/ea20/ea20.c > | 2 +- > board/davinci/sonata/sonata.c > | 2 +- > board/denx/m53evk/m53evk.c > | 2 +- > board/enbw/enbw_cmc/enbw_cmc.c > | 2 +- > board/freescale/mx28evk/README > | 22 +++- > board/freescale/mx6qsabreauto/mx6dl.cfg > | 130 +++++++++++++++++++ > board/freescale/mx6sabresd/mx6sabresd.c > | 84 +++++++++++++ > board/freescale/vf610twr/vf610twr.c > | 29 ++++- > board/gateworks/gw_ventana/Makefile > | 3 +- > board/gateworks/gw_ventana/README > | 92 +++++++++----- > board/gateworks/gw_ventana/eeprom.c > | 89 +++++++++++++ > board/gateworks/gw_ventana/gw_ventana.c > | 597 > > +++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- > board/gateworks/gw_ventana/gw_ventana.cfg > | 15 --- > board/gateworks/gw_ventana/gw_ventana_spl.c > | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > board/gateworks/gw_ventana/ventana_eeprom.h > | 11 ++ > board/omicron/calimain/calimain.c > | 2 +- > board/overo/overo.c > | 14 +++ > board/samsung/trats/trats.c > | 2 +- > board/samsung/trats2/trats2.c > | 2 +- > board/ti/am43xx/board.c > | 79 +++++++++++- > board/ti/am43xx/board.h > | 5 + > board/ti/am43xx/mux.c > | 3 + > board/ti/k2hk_evm/board.c > | 10 +- > board/ti/tnetv107xevm/sdb_board.c > | 2 +- > boards.cfg > | 13 +- > doc/README.mxs > | 26 ++++ > drivers/Makefile > | 1 + > drivers/block/dwc_ahsata.c > | 5 + > drivers/memory/Makefile > | 1 + arch/arm/cpu/armv7/keystone/aemif.c => > drivers/memory/ti-aemif.c | 37 +++--- > drivers/mtd/nand/Makefile > | 1 + > drivers/mtd/nand/davinci_nand.c > | 3 +- > drivers/mtd/nand/mxs_nand_spl.c > | 231 ++++++++++++++++++++++++++++++++++ > drivers/net/macb.c > | 113 ++++++++++++----- > drivers/power/pmic/pmic_max77686.c > | 13 +- > drivers/serial/serial_mxc.c > | 4 +- > drivers/spi/Makefile > | 1 + > drivers/spi/davinci_spi.c > | 2 +- > drivers/spi/exynos_spi.c > | 5 +- > drivers/spi/fsl_qspi.c > | 482 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/spi/fsl_qspi.h > | 127 +++++++++++++++++++ > drivers/video/atmel_hlcdfb.c > | 6 + > include/configs/am43xx_evm.h > | 2 + > include/configs/arndale.h > | 2 + > include/configs/bcm28155_ap.h > | 1 + > include/configs/davinci_dm6467evm.h > | 2 + > include/configs/embestmx6boards.h > | 4 +- > include/configs/ethernut5.h > | 2 + > include/configs/exynos5-dt.h > | 15 ++- > include/configs/exynos5250-dt.h > | 13 +- > include/configs/exynos5420.h > | 52 ++++++++ > include/configs/gw_ventana.h > | 11 ++ > include/configs/imx6_spl.h > | 71 +++++++++++ > include/configs/k2hk_evm.h > | 6 + > include/configs/m53evk.h > | 1 + > include/configs/mx28evk.h > | 5 +- > include/configs/mx6_common.h > | 1 - > include/configs/mx6qsabreauto.h > | 4 + > include/configs/mx6sabresd.h > | 12 ++ > include/configs/omap3_overo.h > | 10 +- > include/configs/peach-pit.h > | 25 ++++ > include/configs/s5p_goni.h > | 17 ++- > include/configs/smdk5420.h > | 49 ++------ > include/configs/tegra-common-post.h > | 9 +- > include/configs/tegra-common-ums.h > | 2 +- > include/configs/ti_omap4_common.h > | 2 +- > include/configs/vf610twr.h > | 12 ++ > include/power/pfuze100_pmic.h > | 4 + 140 files changed, 4245 insertions(+), 1078 deletions(-) > create mode 100644 arch/arm/cpu/armv7/mx6/ddr.c create mode 100644 > arch/arm/dts/exynos5420-peach-pit.dts delete mode 100644 > arch/arm/dts/exynos5420.dtsi create mode 100644 > arch/arm/dts/exynos54xx.dtsi create mode 100644 > arch/arm/imx-common/spl.c delete mode 100644 > arch/arm/include/asm/arch-at91/spl.h delete mode 100644 > arch/arm/include/asm/arch-davinci/emif_defs.h delete mode 100644 > arch/arm/include/asm/arch-davinci/nand_defs.h delete mode 100644 > arch/arm/include/asm/arch-davinci/spl.h delete mode 100644 > arch/arm/include/asm/arch-keystone/nand_defs.h delete mode 100644 > arch/arm/include/asm/arch-mx35/spl.h delete mode 100644 > arch/arm/include/asm/arch-mx5/spl.h delete mode 100644 > arch/arm/include/asm/arch-tegra114/spl.h delete mode 100644 > arch/arm/include/asm/arch-tegra124/spl.h delete mode 100644 > arch/arm/include/asm/arch-tegra20/spl.h delete mode 100644 > arch/arm/include/asm/arch-tegra30/spl.h delete mode 100644 > arch/arm/include/asm/arch-tnetv107x/emif_defs.h delete mode 100644 > arch/arm/include/asm/arch-tnetv107x/nand_defs.h rename > arch/arm/include/asm/{arch-keystone/emif_defs.h => > ti-common/davinci_nand.h} (56%) create mode 100644 > arch/arm/include/asm/ti-common/ti-aemif.h create mode 100644 > board/freescale/mx6qsabreauto/mx6dl.cfg create mode 100644 > board/gateworks/gw_ventana/eeprom.c create mode 100644 > board/gateworks/gw_ventana/gw_ventana_spl.c create mode 100644 > drivers/memory/Makefile rename arch/arm/cpu/armv7/keystone/aemif.c => > drivers/memory/ti-aemif.c (63%) create mode 100644 > drivers/mtd/nand/mxs_nand_spl.c create mode 100644 > drivers/spi/fsl_qspi.c create mode 100644 drivers/spi/fsl_qspi.h > create mode 100644 include/configs/exynos5420.h create mode 100644 > include/configs/imx6_spl.h create mode 100644 > include/configs/peach-pit.h
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot