Changes in Makefile

dc557e9a1fe00ca9d884bd88feef5bebf23fede4 - Merge branch 'master' of git://git.denx.de/u-boot

Sat, 18 Jun 2016 08:24:54 +0000

Merge branch 'master' of git://git.denx.de/u-bootSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/drivers/video/exynos/Makefile

d77fa2ff766bbb4b867e791187f78b6033071613 - Merge http://git.denx.de/u-boot-samsung

Mon, 06 Jun 2016 17:24:23 +0000

Merge http://git.denx.de/u-boot-samsungSigned-off-by: Tom Rini Conflicts: configs/peach-pi_defconfig configs/peach-pit_defconfig List of files: /rk3399_rockchip-uboot/drivers/video/exynos/Makefile

0c84358cb240953b467034a52fcc2f459ba4029b - exynos: video: Combine LCD driver into one file

Mon, 22 Feb 2016 04:08:48 +0000

exynos: video: Combine LCD driver into one fileAt present exynos_fimd.c is the controller and exynos_fb.c is the U-BootLCD interface. With driver model we want these in one file, so join themin preparation.Signed-off-by: Simon Glass Acked-by: Anatolij Gustschin Signed-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/drivers/video/exynos/Makefile

08a7aa1e5be7059d680fedf0a885655a895f638e - exynos: video: Move driver files into their own directory

Mon, 22 Feb 2016 04:08:38 +0000

exynos: video: Move driver files into their own directoryMove all the exynos video drivers into one place for ease of maintenance.Signed-off-by: Simon Glass Acked-by: Anatolij Gustschin Signed-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/drivers/video/exynos/Makefile