Commit e20cc2ca15b5b0644f51b6e58d530d70acd2bc00
Exists in
master
and in
53 other branches
Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.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 167 changed files Side-by-side Diff
- .gitignore
- MAINTAINERS
- Makefile
- README
- arch/arm/config.mk
- arch/arm/cpu/arm1136/omap24xx/Makefile
- arch/arm/cpu/arm1136/omap24xx/reset.S
- arch/arm/cpu/arm1136/omap24xx/timer.c
- arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
- arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c
- arch/arm/cpu/armv7/Makefile
- arch/arm/cpu/armv7/am33xx/Makefile
- arch/arm/cpu/armv7/am33xx/board.c
- arch/arm/cpu/armv7/am33xx/clock.c
- arch/arm/cpu/armv7/am33xx/clock_am33xx.c
- arch/arm/cpu/armv7/am33xx/clock_am43xx.c
- arch/arm/cpu/armv7/am33xx/clock_ti814x.c
- arch/arm/cpu/armv7/am33xx/clock_ti816x.c
- arch/arm/cpu/armv7/am33xx/emif4.c
- arch/arm/cpu/armv7/am33xx/mem.c
- arch/arm/cpu/armv7/highbank/timer.c
- arch/arm/cpu/armv7/mx6/clock.c
- arch/arm/cpu/armv7/mx6/soc.c
- arch/arm/cpu/armv7/omap-common/Makefile
- arch/arm/cpu/armv7/omap-common/boot-common.c
- arch/arm/cpu/armv7/omap-common/clocks-common.c
- arch/arm/cpu/armv7/omap-common/emif-common.c
- arch/arm/cpu/armv7/omap3/clock.c
- arch/arm/cpu/armv7/omap3/lowlevel_init.S
- arch/arm/cpu/armv7/omap3/mem.c
- arch/arm/cpu/armv7/omap3/sys_info.c
- arch/arm/cpu/armv7/omap5/hw_data.c
- arch/arm/cpu/armv7/omap5/prcm-regs.c
- arch/arm/imx-common/cmd_hdmidet.c
- arch/arm/include/asm/arch-am33xx/clock.h
- arch/arm/include/asm/arch-am33xx/clock_ti81xx.h
- arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
- arch/arm/include/asm/arch-am33xx/cpu.h
- arch/arm/include/asm/arch-am33xx/ddr_defs.h
- arch/arm/include/asm/arch-am33xx/hardware.h
- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h
- arch/arm/include/asm/arch-am33xx/hardware_am43xx.h
- arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
- arch/arm/include/asm/arch-am33xx/hardware_ti816x.h
- arch/arm/include/asm/arch-am33xx/mem.h
- arch/arm/include/asm/arch-am33xx/mmc_host_def.h
- arch/arm/include/asm/arch-am33xx/mux.h
- arch/arm/include/asm/arch-am33xx/mux_am43xx.h
- arch/arm/include/asm/arch-am33xx/mux_ti816x.h
- arch/arm/include/asm/arch-am33xx/omap.h
- arch/arm/include/asm/arch-am33xx/spl.h
- arch/arm/include/asm/arch-am33xx/sys_proto.h
- arch/arm/include/asm/arch-armv7/systimer.h
- arch/arm/include/asm/arch-davinci/pinmux_defs.h
- arch/arm/include/asm/arch-mx6/clock.h
- arch/arm/include/asm/arch-mx6/mxc_hdmi.h
- arch/arm/include/asm/arch-omap3/clock.h
- arch/arm/include/asm/arch-omap3/clocks_omap3.h
- arch/arm/include/asm/arch-omap5/cpu.h
- arch/arm/include/asm/arch-omap5/omap.h
- arch/arm/include/asm/omap_common.h
- arch/arm/lib/board.c
- arch/arm/lib/spl.c
- board/Barix/ipam390/Makefile
- board/Barix/ipam390/README.ipam390
- board/Barix/ipam390/ipam390-ais-uart.cfg
- board/Barix/ipam390/ipam390.c
- board/Barix/ipam390/u-boot-spl-ipam390.lds
- board/altera/socfpga/Makefile
- board/altera/socfpga/socfpga_cyclone5.c
- board/altera/socfpga_cyclone5/Makefile
- board/altera/socfpga_cyclone5/socfpga_cyclone5.c
- board/boundary/nitrogen6x/README.mx6qsabrelite
- board/boundary/nitrogen6x/nitrogen6x.c
- board/davinci/da8xxevm/da850evm.c
- board/freescale/mx6qsabrelite/Makefile
- board/freescale/mx6qsabrelite/README
- board/freescale/mx6qsabrelite/mx6qsabrelite.c
- board/freescale/mx6sabresd/mx6sabresd.c
- board/highbank/highbank.c
- board/isee/igep0033/board.c
- board/isee/igep0033/board.h
- board/isee/igep00x0/igep00x0.c
- board/overo/overo.c
- board/overo/overo.h
- board/phytec/pcm051/board.c
- board/ti/am335x/Makefile
- board/ti/am335x/README
- board/ti/am335x/board.c
- board/ti/am335x/board.h
- board/ti/am335x/mux.c
- board/ti/am335x/u-boot.lds
- board/ti/am43xx/Makefile
- board/ti/am43xx/board.c
- board/ti/am43xx/board.h
- board/ti/am43xx/mux.c
- board/ti/beagle/beagle.c
- board/ti/beagle/beagle.h
- board/ti/dra7xx/evm.c
- board/ti/dra7xx/mux_data.h
- board/ti/omap5_uevm/evm.c
- board/ti/omap5_uevm/mux_data.h
- board/ti/ti814x/evm.c
- board/ti/ti816x/Makefile
- board/ti/ti816x/evm.c
- board/wandboard/wandboard.c
- boards.cfg
- common/spl/spl_mmc.c
- doc/README.falcon
- drivers/gpio/Makefile
- drivers/gpio/mxc_gpio.c
- drivers/gpio/tca642x.c
- drivers/net/calxedaxgmac.c
- drivers/net/cpsw.c
- drivers/net/phy/phy.c
- drivers/serial/ns16550.c
- drivers/usb/musb-new/musb_core.c
- drivers/video/mxc_ipuv3_fb.c
- include/bootstage.h
- include/configs/am335x_evm.h
- include/configs/am3517_crane.h
- include/configs/am3517_evm.h
- include/configs/am43xx_evm.h
- include/configs/apx4devkit.h
- include/configs/cm_t35.h
- include/configs/devkit8000.h
- include/configs/dig297.h
- include/configs/dra7xx_evm.h
- include/configs/highbank.h
- include/configs/igep0033.h
- include/configs/igep00x0.h
- include/configs/ipam390.h
- include/configs/m28evk.h
- include/configs/mcx.h
- include/configs/mx23_olinuxino.h
- include/configs/mx23evk.h
- include/configs/mx28evk.h
- include/configs/mx6qsabrelite.h
- include/configs/mx6sabre_common.h
- include/configs/mx6sabresd.h
- include/configs/mxs.h
- include/configs/nitrogen6x.h
- include/configs/nokia_rx51.h
- include/configs/omap3_beagle.h
- include/configs/omap3_evm_common.h
- include/configs/omap3_logic.h
- include/configs/omap3_mvblx.h
- include/configs/omap3_overo.h
- include/configs/omap3_pandora.h
- include/configs/omap3_sdp3430.h
- include/configs/omap3_zoom1.h
- include/configs/omap3_zoom2.h
- include/configs/omap4_common.h
- include/configs/omap5_common.h
- include/configs/omap5_uevm.h
- include/configs/pcm051.h
- include/configs/sc_sps_1.h
- include/configs/tam3517-common.h
- include/configs/ti814x_evm.h
- include/configs/ti816x_evm.h
- include/configs/ti_am335x_common.h
- include/configs/ti_armv7_common.h
- include/configs/tricorder.h
- include/configs/wandboard.h
- include/cpsw.h
- include/tca642x.h
- spl/Makefile