Commit 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb
Exists in
master
and in
50 other branches
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com>
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 217 changed files Side-by-side Diff
- Makefile
- README
- arch/arm/config.mk
- arch/arm/cpu/Makefile
- arch/arm/cpu/arm926ejs/at91/led.c
- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds
- arch/arm/cpu/armv7/Makefile
- arch/arm/cpu/armv7/am33xx/board.c
- arch/arm/cpu/armv7/am33xx/ddr.c
- arch/arm/cpu/armv7/at91/sama5d3_devices.c
- arch/arm/cpu/armv7/at91/timer.c
- arch/arm/cpu/armv7/exynos/clock.c
- arch/arm/cpu/armv7/exynos/pinmux.c
- arch/arm/cpu/armv7/exynos/spl_boot.c
- arch/arm/cpu/armv7/nonsec_virt.S
- arch/arm/cpu/armv7/omap-common/Makefile
- arch/arm/cpu/armv7/omap-common/emif-common.c
- arch/arm/cpu/armv7/omap-common/pipe3-phy.c
- arch/arm/cpu/armv7/omap-common/pipe3-phy.h
- arch/arm/cpu/armv7/omap-common/sata.c
- arch/arm/cpu/armv7/omap3/clock.c
- arch/arm/cpu/armv7/omap4/hw_data.c
- arch/arm/cpu/armv7/omap4/sdram_elpida.c
- arch/arm/cpu/armv7/omap5/hw_data.c
- arch/arm/cpu/armv7/omap5/hwinit.c
- arch/arm/cpu/armv7/omap5/prcm-regs.c
- arch/arm/cpu/armv7/omap5/sdram.c
- arch/arm/cpu/armv7/rmobile/Makefile
- arch/arm/cpu/armv7/rmobile/config.mk
- arch/arm/cpu/armv7/rmobile/cpu_info-r8a7790.c
- arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c
- arch/arm/cpu/armv7/rmobile/cpu_info.c
- arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S
- arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c
- arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h
- arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c
- arch/arm/cpu/armv7/rmobile/timer.c
- arch/arm/cpu/armv7/socfpga/Makefile
- arch/arm/cpu/armv7/socfpga/freeze_controller.c
- arch/arm/cpu/armv7/socfpga/spl.c
- arch/arm/cpu/armv7/zynq/cpu.c
- arch/arm/cpu/at91-common/Makefile
- arch/arm/cpu/at91-common/mpddrc.c
- arch/arm/cpu/at91-common/phy.c
- arch/arm/cpu/at91-common/spl.c
- arch/arm/cpu/at91-common/u-boot-spl.lds
- arch/arm/cpu/ixp/u-boot.lds
- arch/arm/cpu/u-boot-spl.lds
- arch/arm/cpu/u-boot.lds
- arch/arm/include/asm/arch-am33xx/ddr_defs.h
- arch/arm/include/asm/arch-at91/at91_common.h
- arch/arm/include/asm/arch-at91/at91_pio.h
- arch/arm/include/asm/arch-at91/at91_pit.h
- arch/arm/include/asm/arch-at91/at91_pmc.h
- arch/arm/include/asm/arch-at91/at91_spi.h
- arch/arm/include/asm/arch-at91/at91_wdt.h
- arch/arm/include/asm/arch-at91/at91cap9.h
- arch/arm/include/asm/arch-at91/at91sam9_smc.h
- arch/arm/include/asm/arch-at91/atmel_mpddrc.h
- arch/arm/include/asm/arch-at91/gpio.h
- arch/arm/include/asm/arch-at91/sama5d3.h
- arch/arm/include/asm/arch-at91/spl.h
- arch/arm/include/asm/arch-davinci/hardware.h
- arch/arm/include/asm/arch-exynos/dwmmc.h
- arch/arm/include/asm/arch-exynos/mmc.h
- arch/arm/include/asm/arch-exynos/power.h
- arch/arm/include/asm/arch-exynos/spi.h
- arch/arm/include/asm/arch-omap3/clock.h
- arch/arm/include/asm/arch-omap3/omap3.h
- arch/arm/include/asm/arch-omap4/sys_proto.h
- arch/arm/include/asm/arch-omap5/clock.h
- arch/arm/include/asm/arch-omap5/omap.h
- arch/arm/include/asm/arch-omap5/sata.h
- arch/arm/include/asm/arch-rmobile/gpio.h
- arch/arm/include/asm/arch-rmobile/r8a7790-gpio.h
- arch/arm/include/asm/arch-rmobile/r8a7790.h
- arch/arm/include/asm/arch-rmobile/r8a7791-gpio.h
- arch/arm/include/asm/arch-rmobile/r8a7791.h
- arch/arm/include/asm/arch-rmobile/rmobile.h
- arch/arm/include/asm/arch-s5pc1xx/mmc.h
- arch/arm/include/asm/arch-socfpga/freeze_controller.h
- arch/arm/include/asm/emif.h
- arch/arm/include/asm/omap_common.h
- board/BuS/vl_ma2sc/vl_ma2sc.c
- board/actux1/u-boot.lds
- board/actux2/u-boot.lds
- board/actux3/u-boot.lds
- board/afeb9260/afeb9260.c
- board/atmel/at91sam9260ek/at91sam9260ek.c
- board/atmel/at91sam9263ek/at91sam9263ek.c
- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
- board/atmel/sama5d3xek/sama5d3xek.c
- board/bluewater/snapper9260/snapper9260.c
- board/calao/sbc35_a9g20/sbc35_a9g20.c
- board/calao/usb_a9263/Makefile
- board/calao/usb_a9263/usb_a9263.c
- board/compulab/cm_t335/Makefile
- board/compulab/cm_t335/cm_t335.c
- board/compulab/cm_t335/mux.c
- board/compulab/cm_t335/spl.c
- board/compulab/cm_t335/u-boot.lds
- board/compulab/cm_t35/Makefile
- board/compulab/cm_t35/leds.c
- board/dvlhost/u-boot.lds
- board/egnite/ethernut5/ethernut5.c
- board/esd/meesc/meesc.c
- board/esd/otc570/otc570.c
- board/eukrea/cpu9260/cpu9260.c
- board/freescale/mx31ads/u-boot.lds
- board/isee/igep0033/board.c
- board/phytec/pcm051/board.c
- board/renesas/koelsch/Makefile
- board/renesas/koelsch/koelsch.c
- board/renesas/koelsch/qos.c
- board/renesas/koelsch/qos.h
- board/renesas/lager/Makefile
- board/renesas/lager/lager.c
- board/renesas/lager/qos.c
- board/renesas/lager/qos.h
- board/ronetix/pm9261/led.c
- board/ronetix/pm9261/pm9261.c
- board/ronetix/pm9263/led.c
- board/ronetix/pm9263/pm9263.c
- board/ronetix/pm9g45/pm9g45.c
- board/samsung/trats/trats.c
- board/samsung/trats2/trats2.c
- board/siemens/common/factoryset.c
- board/siemens/common/factoryset.h
- board/siemens/corvus/Makefile
- board/siemens/corvus/board.c
- board/siemens/dxr2/board.c
- board/siemens/dxr2/board.h
- board/siemens/dxr2/mux.c
- board/siemens/pxm2/board.c
- board/siemens/rut/board.c
- board/siemens/taurus/Makefile
- board/siemens/taurus/taurus.c
- board/taskit/stamp9g20/stamp9g20.c
- board/ti/am335x/board.c
- board/ti/am335x/u-boot.lds
- board/ti/dra7xx/evm.c
- board/ti/omap5_uevm/evm.c
- board/ti/omap730p2/Makefile
- board/ti/omap730p2/README.omap730p2
- board/ti/omap730p2/config.mk
- board/ti/omap730p2/flash.c
- board/ti/omap730p2/lowlevel_init.S
- board/ti/omap730p2/omap730p2.c
- board/ti/panda/panda.c
- board/ti/ti814x/evm.c
- board/ti/ti816x/evm.c
- board/vpac270/u-boot-spl.lds
- boards.cfg
- doc/README.at91-soc
- doc/README.scrapyard
- drivers/block/ahci.c
- drivers/bootcount/Makefile
- drivers/bootcount/bootcount_davinci.c
- drivers/bootcount/bootcount_env.c
- drivers/gpio/at91_gpio.c
- drivers/i2c/soft_i2c.c
- drivers/mtd/nand/atmel_nand.c
- drivers/net/at91_emac.c
- drivers/net/cpsw.c
- drivers/power/twl6030.c
- drivers/usb/gadget/g_dnl.c
- drivers/usb/gadget/regs-otg.h
- drivers/usb/gadget/s3c_udc_otg.c
- drivers/usb/host/ehci-omap.c
- drivers/video/bus_vcxk.c
- include/configs/afeb9260.h
- include/configs/am335x_evm.h
- include/configs/am3517_evm.h
- include/configs/arndale.h
- include/configs/at91sam9260ek.h
- include/configs/at91sam9263ek.h
- include/configs/at91sam9m10g45ek.h
- include/configs/at91sam9n12ek.h
- include/configs/cm_t335.h
- include/configs/cm_t35.h
- include/configs/corvus.h
- include/configs/cpu9260.h
- include/configs/dra7xx_evm.h
- include/configs/dxr2.h
- include/configs/eb_cpux9k2.h
- include/configs/ethernut5.h
- include/configs/exynos5250-dt.h
- include/configs/h2_p2_dbg_board.h
- include/configs/koelsch.h
- include/configs/lager.h
- include/configs/meesc.h
- include/configs/omap3_beagle.h
- include/configs/omap4_panda.h
- include/configs/omap5_uevm.h
- include/configs/omap730.h
- include/configs/omap730p2.h
- include/configs/otc570.h
- include/configs/pm9261.h
- include/configs/pm9263.h
- include/configs/pm9g45.h
- include/configs/pxm2.h
- include/configs/rut.h
- include/configs/sama5d3xek.h
- include/configs/sbc35_a9g20.h
- include/configs/siemens-am33x-common.h
- include/configs/snapper9260.h
- include/configs/stamp9g20.h
- include/configs/taurus.h
- include/configs/ti_am335x_common.h
- include/configs/trats.h
- include/configs/trats2.h
- include/configs/usb_a9263.h
- include/configs/vexpress_common.h
- include/configs/vl_ma2sc.h
- include/i2c.h
- include/twl6030.h