brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-13 14:46:21 +09:00
Code Issues Projects Releases Wiki Activity
124913556c
u-boot-brain/arch/arm/cpu/armv7
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
..
am33xx Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
at91 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
exynos armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
highbank ARM: highbank: convert to common timer code 2013-11-04 11:08:10 -05:00
mx5 Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
mx6 Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
omap-common Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
omap3 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
omap4 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
omap5 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
rmobile armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
s5p-common armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
s5pc1xx armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
socfpga ARM: socfpga: convert to common timer code 2013-11-04 11:23:45 -05:00
tegra-common armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
tegra20 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
tegra30 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
tegra114 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
u8500 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
vf610 armv7: convert makefiles to Kbuild style 2013-10-31 12:53:39 -04:00
zynq Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
cache_v7.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
lowlevel_init.S ARM: use r9 for gd 2013-09-23 18:00:02 +02:00
Makefile ARM: s5pc, exynos: move Samsung ARM SoC specific code under arch/arm/ 2013-10-31 13:26:44 -04:00
nonsec_virt.S ARM: virtualization: replace verbose license with SPDX identifier 2013-10-07 08:21:13 -04:00
start.S Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
syslib.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
virt-v7.c ARM: virtualization: replace verbose license with SPDX identifier 2013-10-07 08:21:13 -04:00