Changes in Makefile

7f673c99c2d8d1aa21996c5b914f06d784b080ca - Merge branch 'master' of git://git.denx.de/u-boot-arm

Fri, 10 Jan 2014 15:56:00 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armBringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to beadded to include/configs/exynos5-dt.h now.Conflicts: include/configs/exynos5250-dt.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/barco/titanium/Makefile

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

Mon, 06 Jan 2014 07:49:58 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Conflicts: include/micrel.hThe conflict above was trivial, caused by four lines beingadded in both branches with different whitepace. List of files: /rk3399_rockchip-uboot/board/barco/titanium/Makefile

c2cde27d58cfa0b09b8ed4577fa313fdfaa57660 - mx6: titanium: Move BSP code to barco board directory

Mon, 04 Nov 2013 07:35:28 +0000

mx6: titanium: Move BSP code to barco board directorySince the titanium board is not a Freescale board, move itsBSP code from the freescale board directory to the newly createdbarco board directory.Signed-off-by: Stefan Roese Cc: Peter Korsgaard Cc: Stefano Babic Acked-by: Peter Korsgaard List of files: /rk3399_rockchip-uboot/board/barco/titanium/Makefile