Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-18 18:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm/include/asm/arch-am33xx
History
Albert ARIBAUD 85b8c5c4bf Merge branch 'iu-boot/master' into 'u-boot-arm/master' 
Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	board/compulab/cm_t35/Makefile
	board/corscience/tricorder/Makefile
	board/ppcag/bg0900/Makefile
	drivers/bootcount/Makefile
	include/configs/omap4_common.h
	include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

	board/compulab/common/Makefile
	board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

	include/configs/am335x_igep0033.h
	include/configs/omap3_igep00x0.h
2013-11-09 22:59:47 +01:00
..
clock.h Add TI816X support 2013-08-15 18:38:37 -04:00
clock_ti81xx.h Add TI816X support 2013-08-15 18:38:37 -04:00
clocks_am33xx.h am335x:Handle worst case scenario for Errata 1.0.24 2013-09-20 16:57:40 -04:00
cpu.h am33xx, davinci: Create and use <asm/davinci_rtc.h> 2013-11-01 15:30:22 -04:00
ddr_defs.h ARM: IGEP0033: Update timing to run DDR at 400MHz. 2013-10-07 07:43:46 -04:00
elm.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
gpio.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
hardware.h Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18 14:14:34 -04:00
hardware_am33xx.h arm, am335x: add some missing registers and defines for lcd and epwm support 2013-08-28 11:44:59 -04:00
hardware_am43xx.h usb: am437x: Add support for am437x xhci USB host 2013-10-20 23:42:41 +02:00
hardware_ti814x.h Add TI816X support 2013-08-15 18:38:37 -04:00
hardware_ti816x.h Add TI816X support 2013-08-15 18:38:37 -04:00
i2c.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mem.h am335x_evm: Add support for the NOR module on the memory cape 2013-07-30 09:21:41 -04:00
mmc_host_def.h Add TI816X support 2013-08-15 18:38:37 -04:00
mux.h Add TI816X support 2013-08-15 18:38:37 -04:00
mux_am33xx.h am33xx: refactor am33xx mux support and add ti814x support 2013-03-24 12:49:11 -04:00
mux_am43xx.h ARM: AM43xx: Add header files 2013-08-15 08:51:10 -04:00
mux_ti814x.h am33xx: refactor am33xx mux support and add ti814x support 2013-03-24 12:49:11 -04:00
mux_ti816x.h Add TI816X support 2013-08-15 18:38:37 -04:00
omap.h am33xx: Correct and expand comments on CONFIG_SPL_MAX_SIZE 2013-08-28 11:44:58 -04:00
omap_gpmc.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
spl.h Add TI816X support 2013-08-15 18:38:37 -04:00
sys_proto.h am335x_evm: am33xx_spl_board_init function and scale core frequency 2013-09-20 16:57:35 -04:00