boards.cfg · 2c808a12ea7e00d5078e57a9640adcb0504c739c · onny / uboot-i9100

11 years ago

Merge branch 'u-boot/master' into 'u-boot-arm/master' · f15ea6e1

Albert ARIBAUD authored 11 years ago

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds

f15ea6e1

History

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Albert ARIBAUD authored 11 years ago

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds