Message ID | 20131210230527.1df515c5@lilith |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Tue, Dec 10, 2013 at 11:05:27PM +0100, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > f44483b57c49282299da0e5c10073b909cdad979: > > Merge branch 'serial' of git://git.denx.de/u-boot-microblaze > (2013-12-02 08:48:02 -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to f15ea6e1d67782a1626d4a4922b6c20e380085e5: > > Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-12-10 > 22:23:59 +0100) > > Note: two in-merge fixes were necessary. They are listed in > f15ea6e1. > > ---------------------------------------------------------------- > > Albert ARIBAUD (7): > Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' > Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' > Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master' > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > arm: keep all sections in ELF file > Merge branch 'u-boot/master' into 'u-boot-arm/master' > > Andreas Bie??mann (10): > video: remove AT91 legacy API from bus_vcxk > i2c: switch from AT91 legacy to ATMEL legacy > at91sam9m10g45ek: remove unused CONFIG_AT91_LEGACY > snapper9260: remove unused AT91_LEGACY > net: remove unused CONFIG_AT91_LEGACY > at91: remove all occourances of CONFIG_AT91_LEGACY > at91: add new gpio pin definitions > at91: redefine legacy GPIO PIN_BASE > at91: nand: switch atmel_nand to generic GPIO API > at91: switch coloured LED to gpio API > > Andrew Bradford (1): > am335x_evm: Fix CONS_INDEX numbering > > Bo Shen (8): > arm: atmel: sama5d3: correct the ID for DBGU and PIT > arm: at91: pm9261: remove undefined bit in mckr > arm: atmel: sama5d3: correct the error define of DIV > arm: atmel: sama5d3: the offset of MULA is 18 > arm: atmel: sama5d3: early enable PIO peripherals > arm: atmel: add ddr2 initialization function > arm: atmel: sama5d3: spl boot from fat fs SD card > arm: atmel: sam9m10g45ek: let CONFIG_SYS_NO_FLASH at proper > position > > Chin Liang See (1): > socfpga: Adding Freeze Controller driver > > Hardik Patel (1): > pandaboard: 1/1] ARM:OMAP4+: panda-es: Support Rev B3 Elpida DDR2 > RAM > > Heiko Schocher (6): > bootcount: store bootcount var in environment > arm, am33x: make RTC32K OSC enable configurable > usb, g_dnl: make bcdDevice value configurable > arm926ejs, at91: add common phy_reset function > arm, at91: add Siemens board taurus and axm > arm, at91: add siemens corvus board > > Ian Campbell (1): > vexpress: use correct timer address on extended memory map systems > > Igor Grinberg (1): > cm-t35: use gpio_led driver for status led > > Ilya Ledvich (3): > cm_t335: add cm_t335 board support > cm_t335: add support for status LED > cm_t335: add support for pca9555 i2c gpio extender > > Jaehoon Chung (3): > arm: exynos: fix set_mmc_clk for exynos4x12 > arm: exynos/goni: fix the return type for s5p_mmc_init > arm: exynos: remove the unused define. > > Jens Scharsig (BuS Elektronik) (1): > arm: atmel: eb_cpux9k2: config clean up > > Lars Poeschel (1): > pcm051: Support for revision 3 > > Lokesh Vutla (1): > ARM: OMAP5+: Remove unnecessary EFUSE settings > > Lubomir Popov (1): > ARM: OMAP4: Fix bug in omap4470_volts struct > > Luka Perkov (1): > config: arm: exynos5250: remove duplicate defines > > Masahiro Yamada (1): > ARM: align MVBAR on 32 byte boundary > > Mateusz Kulikowski (1): > arm: at91: support for the Calao USB-A9263 board (based on > AT91SAM9263) > > Matt Porter (1): > boards.cfg: update email address for ti814x_evm maintainer > > Michael Trimarchi (2): > arm: omap3: Add uart4 omap3 adddress > arm: omap3: Enable clocks for peripherals only if they are used > > Michal Simek (1): > arm: zynq: Do not remap OCM to high address > > Minkyu Kang (3): > arm: exynos: fix the align for exynos4_power structure > arm: exynos: adds ifdef for spi boot > arm: arndale: disable spi boot > > Nobuhiro Iwamatsu (7): > arm: rmobile: Move lowlevel_init.o to taget of each CPU > arm: rmobile: Add support R8A7790 > arm: rmobile: Add support lager board > arm: rmobile: Add support R8A7791 > arm: rmobile: Add support koelsch board > arm: kzm9g: Fix undefined reference to `__aeabi_uldivmod' error > arm: rmobile: Remove config.mk > > Oleg Kosheliev (2): > ARMV7: OMAP4: Add struct for twl603x data > ARMV7: OMAP4: Add twl6032 support > > Piotr Wilczek (7): > driver:usb:s3c_udc: add support for Exynos4x12 > trats2: enable ums support on Trats2 > trats2: enable dfu and thor protocol for Tizen download > board: trats2: remove unused defines from config file > board: trats2: fix environmental variables > board: trats2: fix access to samsung registers > board: trats2: update Tizen partition definitions > > Przemyslaw Marczak (1): > trats: usb: Add usb_cable_connected() function > > Radhey Shyam Pandey (1): > arm: zynq : Revert TZ_DDR_RAM to secure. > > Rajeshwari Shinde (1): > exynos: spl: Add a custom spi copy function > > Roger Quadros (11): > ahci: Error out with message on malloc() failure > ahci: Fix cache align error messages > ARM: OMAP5: Add Pipe3 PHY driver > ARM: OMAP5: Add PRCM and Control information for SATA > ARM: OMAP5: Add SATA platform glue > ARM: omap5_uevm: Add SATA support > ARM: DRA7xx: Add PRCM and Control information for SATA > ARM: dra7_evm: Add SATA support > usb: ehci-omap: Reset the USB Host OMAP module > omap3_beagle: Don't use ulpi_reset > omap4_panda: Don't use ulpi_reset > > SRICHARAN R (3): > ARM: DRA7: Add is_dra7xx cpu check definition > ARM: DRA: EMIF: Change DDR3 settings to use hw leveling > ARM: DRA7/OMAP5: EMIF: Add workaround for bug 0039 > > Samuel Egli (1): > arm, am335x: update for the siemens boards > > Soren Brinkmann (1): > serial: zynq: Remove unused #defines > > Stefan Roese (1): > arm: am335x: Add DT (FDT) support to Siemens boards > > Tom Rini (5): > am33xx: Make SoC bootcount driver have its own symbol > omap730p2: Remove board > am33xx: Stop modifying certain EMIF4D registers > am335x_evm: Update nandboot to use partitions and DT > AM3517 EVM: Enable ethernet > > Viktar Palstsiuk (1): > davinci: fix Master Priority Registers location > > Vladimir Koutny (1): > am335x: cpsw: optimize cpsw_recv to increase network performance > > Wu, Josh (1): > ARM: at91: sama5d3: add support for sama5d36 chip > > Makefile | 2 +- > README | 19 + > arch/arm/config.mk | 3 + > arch/arm/cpu/Makefile | 1 + > arch/arm/cpu/arm926ejs/at91/led.c | 16 +- > arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 16 +- > arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 16 +- > arch/arm/cpu/armv7/Makefile | 2 +- > arch/arm/cpu/armv7/am33xx/board.c | 4 + > arch/arm/cpu/armv7/am33xx/ddr.c | 7 - > arch/arm/cpu/armv7/at91/sama5d3_devices.c | 6 +- > arch/arm/cpu/armv7/at91/timer.c | 2 +- > arch/arm/cpu/armv7/exynos/clock.c | 3 +- > arch/arm/cpu/armv7/exynos/pinmux.c | 2 +- > arch/arm/cpu/armv7/exynos/spl_boot.c | 126 +- > arch/arm/cpu/armv7/nonsec_virt.S | 2 +- > arch/arm/cpu/armv7/omap-common/Makefile | 5 + > arch/arm/cpu/armv7/omap-common/emif-common.c | 142 ++- > arch/arm/cpu/armv7/omap-common/pipe3-phy.c | 231 ++++ > arch/arm/cpu/armv7/omap-common/pipe3-phy.h | 36 + > arch/arm/cpu/armv7/omap-common/sata.c | 75 ++ > arch/arm/cpu/armv7/omap3/clock.c | 2 - > arch/arm/cpu/armv7/omap4/hw_data.c | 12 +- > arch/arm/cpu/armv7/omap4/sdram_elpida.c | 9 +- > arch/arm/cpu/armv7/omap5/hw_data.c | 9 +- > arch/arm/cpu/armv7/omap5/hwinit.c | 18 +- > arch/arm/cpu/armv7/omap5/prcm-regs.c | 7 + > arch/arm/cpu/armv7/omap5/sdram.c | 214 +++- > arch/arm/cpu/armv7/rmobile/Makefile | 11 +- > arch/arm/cpu/armv7/rmobile/config.mk | 9 - > arch/arm/cpu/armv7/rmobile/cpu_info-r8a7790.c | 22 + > arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c | 29 + > arch/arm/cpu/armv7/rmobile/cpu_info.c | 10 + > arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S | 60 + > arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c | 829 +++++++++++++ > arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h | 92 ++ > arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | 1117 > ++++++++++++++++++ arch/arm/cpu/armv7/rmobile/timer.c > | 8 +- arch/arm/cpu/armv7/socfpga/Makefile | 2 +- > arch/arm/cpu/armv7/socfpga/freeze_controller.c | 215 ++++ > arch/arm/cpu/armv7/socfpga/spl.c | 9 + > arch/arm/cpu/armv7/zynq/cpu.c | 9 +- > arch/arm/cpu/at91-common/Makefile | 12 + > arch/arm/cpu/at91-common/mpddrc.c | 124 ++ > arch/arm/cpu/at91-common/phy.c | 57 + > arch/arm/cpu/at91-common/spl.c | 90 ++ > arch/arm/cpu/at91-common/u-boot-spl.lds | 50 + > arch/arm/cpu/ixp/u-boot.lds | 15 +- > arch/arm/cpu/u-boot-spl.lds | 15 +- > arch/arm/cpu/u-boot.lds | 18 +- > arch/arm/include/asm/arch-am33xx/ddr_defs.h | 37 +- > arch/arm/include/asm/arch-at91/at91_common.h | 5 + > arch/arm/include/asm/arch-at91/at91_pio.h | 33 - > arch/arm/include/asm/arch-at91/at91_pit.h | 16 - > arch/arm/include/asm/arch-at91/at91_pmc.h | 59 +- > arch/arm/include/asm/arch-at91/at91_spi.h | 2 +- > arch/arm/include/asm/arch-at91/at91_wdt.h | 21 - > arch/arm/include/asm/arch-at91/at91cap9.h | 69 -- > arch/arm/include/asm/arch-at91/at91sam9_smc.h | 60 - > arch/arm/include/asm/arch-at91/atmel_mpddrc.h | 115 ++ > arch/arm/include/asm/arch-at91/gpio.h | 26 +- > arch/arm/include/asm/arch-at91/sama5d3.h | 3 + > arch/arm/include/asm/arch-at91/spl.h | 20 + > arch/arm/include/asm/arch-davinci/hardware.h | 3 +- > arch/arm/include/asm/arch-exynos/dwmmc.h | 4 - > arch/arm/include/asm/arch-exynos/mmc.h | 2 +- > arch/arm/include/asm/arch-exynos/power.h | 2 +- > arch/arm/include/asm/arch-exynos/spi.h | 1 + > arch/arm/include/asm/arch-omap3/clock.h | 2 - > arch/arm/include/asm/arch-omap3/omap3.h | 1 + > arch/arm/include/asm/arch-omap4/sys_proto.h | 4 + > arch/arm/include/asm/arch-omap5/clock.h | 3 + > arch/arm/include/asm/arch-omap5/omap.h | 4 + > arch/arm/include/asm/arch-omap5/sata.h | 48 + > arch/arm/include/asm/arch-rmobile/gpio.h | 6 + > arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h | 387 +++++++ > arch/arm/include/asm/arch-rmobile/r8a7790.h | 614 ++++++++++ > arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h | 438 +++++++ > arch/arm/include/asm/arch-rmobile/r8a7791.h | 664 +++++++++++ > arch/arm/include/asm/arch-rmobile/rmobile.h | 4 + > arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- > .../include/asm/arch-socfpga/freeze_controller.h | 50 + > arch/arm/include/asm/emif.h | 14 +- > arch/arm/include/asm/omap_common.h | 10 + > board/BuS/vl_ma2sc/vl_ma2sc.c | 23 +- > board/actux1/u-boot.lds | 15 +- > board/actux2/u-boot.lds | 15 +- > board/actux3/u-boot.lds | 15 +- > board/afeb9260/afeb9260.c | 18 +- > board/atmel/at91sam9260ek/at91sam9260ek.c | 19 +- > board/atmel/at91sam9263ek/at91sam9263ek.c | 19 +- > board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +- > board/atmel/sama5d3xek/sama5d3xek.c | 91 ++ > board/bluewater/snapper9260/snapper9260.c | 16 +- > board/calao/sbc35_a9g20/sbc35_a9g20.c | 19 +- > board/calao/usb_a9263/Makefile | 14 + > board/calao/usb_a9263/usb_a9263.c | 148 +++ > board/compulab/cm_t335/Makefile | 10 + > board/compulab/cm_t335/cm_t335.c | 162 +++ > board/compulab/cm_t335/mux.c | 117 ++ > board/compulab/cm_t335/spl.c | 106 ++ > board/compulab/cm_t335/u-boot.lds | 101 ++ > board/compulab/cm_t35/Makefile | 2 +- > board/compulab/cm_t35/leds.c | 33 - > board/dvlhost/u-boot.lds | 15 +- > board/egnite/ethernut5/ethernut5.c | 3 +- > board/esd/meesc/meesc.c | 5 +- > board/esd/otc570/otc570.c | 5 +- > board/eukrea/cpu9260/cpu9260.c | 23 +- > board/freescale/mx31ads/u-boot.lds | 18 +- > board/isee/igep0033/board.c | 4 - > board/phytec/pcm051/board.c | 53 +- > board/renesas/koelsch/Makefile | 9 + > board/renesas/koelsch/koelsch.c | 283 +++++ > board/renesas/koelsch/qos.c | 1220 > ++++++++++++++++++++ > board/renesas/koelsch/qos.h | 12 + > board/renesas/lager/Makefile | 9 + > board/renesas/lager/lager.c | 287 +++++ > board/renesas/lager/qos.c | 1119 > ++++++++++++++++++ board/renesas/lager/qos.h > | 12 + board/ronetix/pm9261/led.c | 14 +- > board/ronetix/pm9261/pm9261.c | 5 +- > board/ronetix/pm9263/led.c | 10 +- > board/ronetix/pm9263/pm9263.c | 5 +- > board/ronetix/pm9g45/pm9g45.c | 5 +- > board/samsung/trats/trats.c | 11 + > board/samsung/trats2/trats2.c | 108 +- > board/siemens/common/factoryset.c | 24 +- > board/siemens/common/factoryset.h | 2 + > board/siemens/corvus/Makefile | 18 + > board/siemens/corvus/board.c | 195 ++++ > board/siemens/dxr2/board.c | 15 +- > board/siemens/dxr2/board.h | 9 +- > board/siemens/dxr2/mux.c | 158 +++ > board/siemens/pxm2/board.c | 8 +- > board/siemens/rut/board.c | 56 +- > board/siemens/taurus/Makefile | 18 + > board/siemens/taurus/taurus.c | 160 +++ > board/taskit/stamp9g20/stamp9g20.c | 31 +- > board/ti/am335x/board.c | 17 - > board/ti/am335x/u-boot.lds | 15 +- > board/ti/dra7xx/evm.c | 7 + > board/ti/omap5_uevm/evm.c | 7 + > board/ti/omap730p2/Makefile | 9 - > board/ti/omap730p2/README.omap730p2 | 91 -- > board/ti/omap730p2/config.mk | 25 - > board/ti/omap730p2/flash.c | 463 -------- > board/ti/omap730p2/lowlevel_init.S | 379 ------ > board/ti/omap730p2/omap730p2.c | 255 ---- > board/ti/panda/panda.c | 60 + > board/ti/ti814x/evm.c | 5 - > board/ti/ti816x/evm.c | 17 - > board/vpac270/u-boot-spl.lds | 18 +- > boards.cfg | 27 +- > doc/README.at91-soc | 7 + > doc/README.scrapyard | 5 +- > drivers/block/ahci.c | 18 +- > drivers/bootcount/Makefile | 3 +- > drivers/bootcount/bootcount_davinci.c | 4 + > drivers/bootcount/bootcount_env.c | 29 + > drivers/gpio/at91_gpio.c | 4 +- > drivers/i2c/soft_i2c.c | 2 +- > drivers/mtd/nand/atmel_nand.c | 8 +- > drivers/net/at91_emac.c | 9 - > drivers/net/cpsw.c | 2 +- > drivers/power/twl6030.c | 77 +- > drivers/usb/gadget/g_dnl.c | 23 +- > drivers/usb/gadget/regs-otg.h | 5 + > drivers/usb/gadget/s3c_udc_otg.c | 9 +- > drivers/usb/host/ehci-omap.c | 57 +- > drivers/video/bus_vcxk.c | 15 - > include/configs/afeb9260.h | 2 +- > include/configs/am335x_evm.h | 13 +- > include/configs/am3517_evm.h | 14 +- > include/configs/arndale.h | 4 - > include/configs/at91sam9260ek.h | 1 + > include/configs/at91sam9263ek.h | 1 + > include/configs/at91sam9m10g45ek.h | 9 +- > include/configs/at91sam9n12ek.h | 4 +- > include/configs/cm_t335.h | 182 +++ > include/configs/cm_t35.h | 9 +- > include/configs/corvus.h | 165 +++ > include/configs/cpu9260.h | 5 +- > include/configs/dra7xx_evm.h | 11 + > include/configs/dxr2.h | 13 +- > include/configs/eb_cpux9k2.h | 4 - > include/configs/ethernut5.h | 2 +- > include/configs/exynos5250-dt.h | 25 +- > include/configs/h2_p2_dbg_board.h | 120 -- > include/configs/koelsch.h | 133 +++ > include/configs/lager.h | 141 +++ > include/configs/meesc.h | 4 +- > include/configs/omap3_beagle.h | 3 - > include/configs/omap4_panda.h | 3 - > include/configs/omap5_uevm.h | 10 + > include/configs/omap730.h | 246 ---- > include/configs/omap730p2.h | 173 --- > include/configs/otc570.h | 4 +- > include/configs/pm9261.h | 16 +- > include/configs/pm9263.h | 8 +- > include/configs/pm9g45.h | 8 +- > include/configs/pxm2.h | 7 +- > include/configs/rut.h | 10 +- > include/configs/sama5d3xek.h | 34 + > include/configs/sbc35_a9g20.h | 1 + > include/configs/siemens-am33x-common.h | 74 +- > include/configs/snapper9260.h | 2 +- > include/configs/stamp9g20.h | 1 + > include/configs/taurus.h | 160 +++ > include/configs/ti_am335x_common.h | 5 +- > include/configs/trats.h | 1 + > include/configs/trats2.h | 68 +- > include/configs/usb_a9263.h | 169 +++ > include/configs/vexpress_common.h | 2 +- > include/configs/vl_ma2sc.h | 5 +- > include/i2c.h | 2 +- > include/twl6030.h | 38 + 217 files > changed, 12160 insertions(+), 2834 deletions(-) create mode 100644 > arch/arm/cpu/armv7/omap-common/pipe3-phy.c create mode 100644 > arch/arm/cpu/armv7/omap-common/pipe3-phy.h create mode 100644 > arch/arm/cpu/armv7/omap-common/sata.c delete mode 100644 > arch/arm/cpu/armv7/rmobile/config.mk create mode 100644 > arch/arm/cpu/armv7/rmobile/cpu_info-r8a7790.c create mode 100644 > arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c create mode 100644 > arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S create mode 100644 > arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c create mode 100644 > arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h create mode 100644 > arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c create mode 100644 > arch/arm/cpu/armv7/socfpga/freeze_controller.c create mode 100644 > arch/arm/cpu/at91-common/Makefile create mode 100644 > arch/arm/cpu/at91-common/mpddrc.c create mode 100644 > arch/arm/cpu/at91-common/phy.c create mode 100644 > arch/arm/cpu/at91-common/spl.c create mode 100644 > arch/arm/cpu/at91-common/u-boot-spl.lds create mode 100644 > arch/arm/include/asm/arch-at91/atmel_mpddrc.h create mode 100644 > arch/arm/include/asm/arch-at91/spl.h create mode 100644 > arch/arm/include/asm/arch-omap5/sata.h create mode 100644 > arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h create mode 100644 > arch/arm/include/asm/arch-rmobile/r8a7790.h create mode 100644 > arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h create mode 100644 > arch/arm/include/asm/arch-rmobile/r8a7791.h create mode 100644 > arch/arm/include/asm/arch-socfpga/freeze_controller.h create mode > 100644 board/calao/usb_a9263/Makefile create mode 100644 > board/calao/usb_a9263/usb_a9263.c create mode 100644 > board/compulab/cm_t335/Makefile create mode 100644 > board/compulab/cm_t335/cm_t335.c create mode 100644 > board/compulab/cm_t335/mux.c create mode 100644 > board/compulab/cm_t335/spl.c create mode 100644 > board/compulab/cm_t335/u-boot.lds delete mode 100644 > board/compulab/cm_t35/leds.c create mode 100644 > board/renesas/koelsch/Makefile create mode 100644 > board/renesas/koelsch/koelsch.c create mode 100644 > board/renesas/koelsch/qos.c create mode 100644 > board/renesas/koelsch/qos.h create mode 100644 > board/renesas/lager/Makefile create mode 100644 > board/renesas/lager/lager.c create mode 100644 > board/renesas/lager/qos.c create mode 100644 board/renesas/lager/qos.h > create mode 100644 board/siemens/corvus/Makefile > create mode 100644 board/siemens/corvus/board.c > create mode 100644 board/siemens/taurus/Makefile > create mode 100644 board/siemens/taurus/taurus.c > delete mode 100644 board/ti/omap730p2/Makefile > delete mode 100644 board/ti/omap730p2/README.omap730p2 > delete mode 100644 board/ti/omap730p2/config.mk > delete mode 100644 board/ti/omap730p2/flash.c > delete mode 100644 board/ti/omap730p2/lowlevel_init.S > delete mode 100644 board/ti/omap730p2/omap730p2.c > create mode 100644 drivers/bootcount/bootcount_env.c > create mode 100644 include/configs/cm_t335.h > create mode 100644 include/configs/corvus.h > delete mode 100644 include/configs/h2_p2_dbg_board.h > create mode 100644 include/configs/koelsch.h > create mode 100644 include/configs/lager.h > delete mode 100644 include/configs/omap730.h > delete mode 100644 include/configs/omap730p2.h > create mode 100644 include/configs/taurus.h > create mode 100644 include/configs/usb_a9263.h Applied to u-boot/master, thanks!