Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-12 16:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm/include/asm/arch-mx6
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 mx6slevk: Add Ethernet support 2013-09-20 17:55:37 +02:00
crm_regs.h mx6: compute PLL PFD frequencies rather than using defines 2013-10-17 09:44:20 +02:00
gpio.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
hab.h imx: add status reporting for HAB status 2013-08-31 15:06:29 +02:00
imx-regs.h i.MX6: Correct ANATOP_PFD (Phase Fractional Divider) register declarations 2013-08-31 18:05:49 +02:00
iomux.h mx6: iomux: add GPR1 defines for use with nitrogen6x 2013-10-20 23:42:40 +02:00
mx6-ddr.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mx6-pins.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mx6dl-ddr.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mx6dl_pins.h mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin 2013-10-31 17:54:23 +01:00
mx6q-ddr.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mx6q_pins.h i.MX6DQ/DLS: Add pad MX6_PAD_GPIO_1__USB_OTG_ID 2013-09-27 13:53:35 +02:00
mx6sl_pins.h mx6slevk: Add Ethernet support 2013-09-20 17:55:37 +02:00
mxc_hdmi.h Merge git://git.denx.de/u-boot-arm 2013-07-31 11:30:38 +02:00
sys_proto.h i.MX6: Add convenience macros cpu_type(rev) and is_cpu_type(cpu) 2013-08-31 18:03:55 +02:00