brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-06 11:16:15 +09:00
Code Issues Projects Releases Wiki Activity
85b8c5c4bf
u-boot-brain/arch/arm/cpu/arm926ejs
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
..
armada100 arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
at91 arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
davinci arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
kirkwood arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
lpc32xx arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
mb86r0x arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
mx25 ARM: mx25: convert to common timer code 2013-11-04 11:09:34 -05:00
mx27 arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
mxs Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
nomadik arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
omap arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
orion5x arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
pantheon arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
spear arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
versatile ARM: versatile: convert to common timer code 2013-11-04 11:24:22 -05:00
cache.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
config.mk ARM: refactor compiler options in config.mk 2013-09-23 17:03:05 +02:00
cpu.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
Makefile arm926ejs: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
start.S Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00