On Sat, Sep 07, 2013 at 12:55:38AM +0200, Albert ARIBAUD wrote: > Hello Tom, > > The following changes since commit > fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c: > > Prepare v2013.10-rc2 (2013-09-02 14:20:36 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39: > > socfpga: Creating driver for Reset Manager (2013-09-06 12:09:06 +0200) > > ---------------------------------------------------------------- > Albert ARIBAUD (7): > arm: omap3: fix SRAM copy and execution sequence > Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' > Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' > Merge branch 'u-boot-atmel/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 branch 'u-boot-atmel/master' into 'u-boot-arm/master' > > Amaury Pouly (1): > mmc: mxsmmc: Enable MMC HC support > > Andreas Wass (2): > ARM: mxs: Added application UART driver > ARM: mxs: Add mx28evk_auart_console target > > Bo Shen (11): > net: macb: fix the following building warning > arm: atmel: add gmac support for sama5d3xek board > arm: atmel: add nand trimffs subcommand for at91sam9n12 and > at91sam9x5 arm: sama5d3: fix smc cs related registers offset > arm: sama5d3: remove unused define > arm: atmel: sama5d3: fix typo error for CONFIG_ENV_IS_NOWHERE > arm: atmel: remove the config.mk file > gpio: atmel: fix code to use pointer for pio port > gpio: atmel: add gpio common API support > gpio: atmel: add copyright and remove error header info > ARM: atmel: sama5d3: drop unused CONFIG_NET_MULTI > > Chin Liang See (2): > socfpga: Adding configuration for development kit > socfpga: Creating driver for Reset Manager > > Eric Nelson (6): > i.MX6: nitrogen6x: force HDMI onto IPU0/DI0 > fec_mxc: set ethaddr if fuses burned and not previously set > i.MX6: Add convenience macros cpu_type(rev) and is_cpu_type(cpu) > i.MX6: Correct ANATOP_PFD (Phase Fractional Divider) register > declarations i.MX6: nitrogen6x: Don't bother setting PLL3(480) PFD1 > divisor i.MX6: Set and clear the gating bits for Phase Fractional > Dividers > > Hector Palacios (1): > ARM: mxs: rename function that sets AUTO_RESTART flag > > Heiko Schocher (6): > arm, am33xx: add defines for gmii_sel_register bits > arm, am335x: add some missing registers and defines for lcd and > epwm support arm, spl: add watchdog library to SPL > arm, am335x: add watchdog support > video: add formike lcd panel init > arm, am335x: add support for 3 siemens boards > > Javier Martinez Canillas (1): > ARM: igep00x0.h: Enable raw initrd support > > Jens Scharsig (BuS Elektronik) (1): > arm: atmel: cpux9k2: board update and enhancement > > Lubomir Popov (1): > ARM: OMAP4470: Add Elpida EDB8164B3PF memory configuration > > Marek Vasut (3): > ARM: mxs: tools: Add mkimage support for MXS bootstream > tools: Sort lists of files in Makefile > tools: mxsboot: Staticize functions > > Michal Simek (4): > zynq: Add new ddrc driver for ECC support > zynq: slcr: Wait 100ms till clk is properly setup > zynq: Enable axi ethernet and emaclite driver initialization > arm: lds: Remove libgcc eabi exception handling tables > > Oleksandr Tyshchenko (1): > sdp4430: Initialize board id using CONFIG_MACH_TYPE > > SARTRE Leo (1): > ARM: Congatec: README update > > Stefano Babic (7): > tools: imx_header should not include flash_offset > tools: rename mximage_flash_offset to imximage_ivt_offset > tools: dynamically allocate imx_header in imximage > tools: add variable padding of data image in mkimage > tools: add padding of data image file for imximage > tools: add support for setting the CSF into imximage > imx: add status reporting for HAB status > > Stephen Warren (1): > ARM: tegra: support raw ramdisks > > Taras Kondratiuk (3): > ARM: OMAP4470: Add OMAP4470 identification > ARM: OMAP4470: Add voltage and dpll data > ARM: OMAP4460: sdp: Limit TPS mux config to 4460 > > Thierry Reding (2): > ARM: tegra: Make cache line size SoC specific > ARM: tegra: Enable data cache on Dalmore > > Tom Rini (13): > am33xx: Correct and expand comments on CONFIG_SPL_MAX_SIZE > TI:armv7: Move CONFIG_SPL_LIBDISK_SUPPORT to MMC section > omap5: Expand CONFIG_SPL_MAX_SIZE and comment upon > SRAM_SCRATCH_SPACE_ADDR TI:am335x: Better comment and organize the > networking related options am335x_evm: Add comment by SPL SPI support > am335x_evm: Regroup USB options > TI:armv7: Re-order slightly the generic CONFIG options, expand > related comments am335x_evm: Update README for customization > TI:am33xx: Move SPL YMODEM support to the per-board config > TI:omap5: Clarify comments about SPL and DDR timings in common > config omap5_uevm: Better comment why we have TCA642X and the reset time > dra7xx_evm: Re-order and comment the networking related config > options siemens-am33x-common.h: Always build CONFIG_OMAP_GPIO support > > Wu, Josh (6): > ARM: at91: atmel_nand: pmecc driver will select the galois table > by sector size ARM: at91: sama5d3: remove unused definition about PMECC > alpha table offset linux/compat.h: move dev_err, dev_info and dev_dbg > from usb driver to compat.h mtd: atmel_nand: alloc memory instead of > use static array for pmecc data ARM: at91: atmel_nand: add code to > check the ONFI parameter ECC requirement mtd: atmel_nand: pmecc: fix > bug fail to correct bit error in 1024-bytes sector > > MAINTAINERS | 5 + > arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 6 + > arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 8 + > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 9 +- > arch/arm/cpu/armv7/at91/sama5d3_devices.c | 24 ++ > arch/arm/cpu/armv7/mx6/Makefile | 7 +- > arch/arm/cpu/armv7/mx6/hab.c | 104 ++++++ > arch/arm/cpu/armv7/mx6/soc.c | 28 ++ > arch/arm/cpu/armv7/omap3/clock.c | 6 +- > arch/arm/cpu/armv7/omap3/lowlevel_init.S | 8 +- > arch/arm/cpu/armv7/omap4/hw_data.c | 36 ++ > arch/arm/cpu/armv7/omap4/hwinit.c | 3 + > arch/arm/cpu/armv7/omap4/sdram_elpida.c | 41 ++- > arch/arm/cpu/armv7/socfpga/Makefile | 2 +- > arch/arm/cpu/armv7/socfpga/misc.c | 27 -- > arch/arm/cpu/armv7/socfpga/reset_manager.c | 39 +++ > arch/arm/cpu/armv7/zynq/Makefile | 1 + > arch/arm/cpu/armv7/zynq/ddrc.c | 50 +++ > arch/arm/cpu/armv7/zynq/slcr.c | 2 +- > arch/arm/cpu/u-boot.lds | 2 + > arch/arm/include/asm/arch-am33xx/cpu.h | 74 ++++- > arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 7 + > arch/arm/include/asm/arch-am33xx/omap.h | 2 +- > arch/arm/include/asm/arch-at91/at91_common.h | 1 + > arch/arm/include/asm/arch-at91/at91sam9x5.h | 6 + > arch/arm/include/asm/arch-at91/sama5d3.h | 2 - > arch/arm/include/asm/arch-at91/sama5d3_smc.h | 2 +- > arch/arm/include/asm/arch-mx6/hab.h | 67 ++++ > arch/arm/include/asm/arch-mx6/imx-regs.h | 37 +-- > arch/arm/include/asm/arch-mx6/sys_proto.h | 7 + > arch/arm/include/asm/arch-mxs/regs-uartapp.h | 220 +++++++++++++ > arch/arm/include/asm/arch-omap3/clock.h | 2 - > arch/arm/include/asm/arch-omap4/clock.h | 7 +- > arch/arm/include/asm/arch-omap4/omap.h | 1 + > arch/arm/include/asm/arch-omap5/omap.h | 11 +- > arch/arm/include/asm/arch-socfpga/reset_manager.h | 10 +- > arch/arm/include/asm/arch-zynq/hardware.h | 8 + > arch/arm/include/asm/arch-zynq/sys_proto.h | 1 + > arch/arm/include/asm/omap_common.h | 1 + > board/atmel/at91sam9m10g45ek/config.mk | 1 - > board/atmel/at91sam9x5ek/config.mk | 1 - > board/atmel/sama5d3xek/sama5d3xek.c | 20 ++ > board/boundary/nitrogen6x/nitrogen6x.c | 8 +- > board/congatec/cgtqmx6eval/README | 3 +- > board/isee/igep0033/board.c | 6 +- > board/phytec/pcm051/board.c | 2 - > board/siemens/common/board.c | 171 ++++++++++ > board/siemens/common/factoryset.c | 284 > ++++++++++++++++ board/siemens/common/factoryset.h > | 27 ++ board/siemens/dxr2/Makefile | 49 +++ > board/siemens/dxr2/board.c | 241 > ++++++++++++++ board/siemens/dxr2/board.h | > 69 ++++ board/siemens/dxr2/mux.c | 112 > +++++++ board/siemens/pxm2/Makefile | 49 +++ > board/siemens/pxm2/board.c | 429 > ++++++++++++++++++++++++ > board/siemens/pxm2/board.h | 22 ++ > board/siemens/pxm2/mux.c | 186 +++++++++++ > board/siemens/pxm2/pmic.h | 71 ++++ > board/siemens/rut/Makefile | 49 +++ > board/siemens/rut/board.c | 432 > ++++++++++++++++++++++++ > board/siemens/rut/board.h | 22 ++ > board/siemens/rut/mux.c | 347 > ++++++++++++++++++++ > board/ti/am335x/README | 28 +- > board/ti/am335x/board.c | 6 +- > board/ti/sdp4430/sdp.c | 4 +- > board/xilinx/zynq/board.c | 19 ++ > boards.cfg | 4 + > common/image.c | 1 + > config.mk | 9 + > doc/README.SPL | 2 +- > doc/README.atmel_pmecc | 14 - > doc/README.imximage | 30 +- > doc/README.mxc_hab | 48 +++ > doc/README.mxsimage | 165 ++++++++++ > drivers/gpio/at91_gpio.c | 295 > ++++++++++------- drivers/mmc/mxsmmc.c > | 3 +- drivers/mtd/nand/atmel_nand.c | 201 > +++++++++++- drivers/net/fec_mxc.c | 2 > + drivers/net/macb.c | 12 +- > drivers/serial/Makefile | 1 + > drivers/serial/mxs_auart.c | 151 +++++++++ > drivers/serial/serial.c | 2 + > drivers/usb/musb-new/linux-compat.h | 16 - > drivers/video/Makefile | 1 + > drivers/video/formike.c | 511 > +++++++++++++++++++++++++++++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/omap_wdt.c | 121 +++++++ > include/configs/am335x_evm.h | 93 +++--- > include/configs/at91sam9m10g45ek.h | 2 + > include/configs/at91sam9n12ek.h | 3 + > include/configs/at91sam9x5ek.h | 5 +- > include/configs/dalmore.h | 3 - > include/configs/dra7xx_evm.h | 18 +- > include/configs/dxr2.h | 94 ++++++ > include/configs/eb_cpux9k2.h | 62 ++-- > include/configs/igep00x0.h | 1 + > include/configs/mxs.h | 7 +- > include/configs/omap4_sdp4430.h | 1 + > include/configs/omap5_common.h | 19 +- > include/configs/omap5_uevm.h | 3 + > include/configs/pxm2.h | 153 +++++++++ > include/configs/rut.h | 156 +++++++++ > include/configs/sama5d3xek.h | 11 +- > include/configs/siemens-am33x-common.h | 461 > ++++++++++++++++++++++++++ > include/configs/socfpga_cyclone5.h | 28 +- > include/configs/tegra-common.h | 3 +- > include/configs/tegra114-common.h | 3 + > include/configs/tegra20-common.h | 3 + > include/configs/tegra30-common.h | 3 + > include/configs/ti_am335x_common.h | 22 +- > include/configs/ti_armv7_common.h | 26 +- > include/image.h | 1 + > include/linux/compat.h | 8 + > include/video.h | 4 + > spl/Makefile | 1 + > tools/Makefile | 42 +-- > tools/imximage.c | 180 +++++++++- > tools/imximage.h | 20 +- > tools/logos/siemens.bmp | Bin 0 -> 25766 > bytes tools/mkimage.c | 26 +- > tools/mkimage.h | 6 +- > tools/mxsboot.c | 12 +- > tools/mxsimage.c | 2347 > > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > tools/mxsimage.h | 230 > +++++++++++++ 124 files changed, 8726 insertions(+), 453 deletions(-) > create mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg create > mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg create mode > 100644 arch/arm/cpu/armv7/mx6/hab.c create mode 100644 > arch/arm/cpu/armv7/socfpga/reset_manager.c create mode 100644 > arch/arm/cpu/armv7/zynq/ddrc.c create mode 100644 > arch/arm/include/asm/arch-mx6/hab.h create mode 100644 > arch/arm/include/asm/arch-mxs/regs-uartapp.h delete mode 100644 > board/atmel/at91sam9m10g45ek/config.mk delete mode 100644 > board/atmel/at91sam9x5ek/config.mk create mode 100644 > board/siemens/common/board.c create mode 100644 > board/siemens/common/factoryset.c create mode 100644 > board/siemens/common/factoryset.h create mode 100644 > board/siemens/dxr2/Makefile create mode 100644 > board/siemens/dxr2/board.c create mode 100644 > board/siemens/dxr2/board.h create mode 100644 board/siemens/dxr2/mux.c > create mode 100644 board/siemens/pxm2/Makefile create mode 100644 > board/siemens/pxm2/board.c create mode 100644 > board/siemens/pxm2/board.h create mode 100644 board/siemens/pxm2/mux.c > create mode 100644 board/siemens/pxm2/pmic.h create mode 100644 > board/siemens/rut/Makefile create mode 100644 > board/siemens/rut/board.c create mode 100644 board/siemens/rut/board.h > create mode 100644 board/siemens/rut/mux.c create mode 100644 > doc/README.mxc_hab create mode 100644 doc/README.mxsimage create mode > 100644 drivers/serial/mxs_auart.c create mode 100644 > drivers/video/formike.c create mode 100644 drivers/watchdog/omap_wdt.c > create mode 100644 include/configs/dxr2.h create mode 100644 > include/configs/pxm2.h create mode 100644 include/configs/rut.h > create mode 100644 include/configs/siemens-am33x-common.h > create mode 100644 tools/logos/siemens.bmp > create mode 100644 tools/mxsimage.c > create mode 100644 tools/mxsimage.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