Changes in Makefile

4b210ad34282bfd9fc982a8e3c9a9126f4094cdb - Merge branch 'master' of git://git.denx.de/u-boot-arm

Tue, 10 Dec 2013 22:15:18 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

ebc18afd0a150b0285c643a4d3c898e19323683b - cm-t35: use gpio_led driver for status led

Wed, 06 Nov 2013 14:39:47 +0000

cm-t35: use gpio_led driver for status ledSwitch to using the generic gpio_led driver instead of the private tocm_t35 board led implementation.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

85b8c5c4bf80025de4632ae6c9a8a606e51508a4 - Merge branch 'iu-boot/master' into 'u-boot-arm/master'

Sat, 09 Nov 2013 11:51:47 +0000

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.hMakefile conflicts are due to additions/removals ofobject files on the ARM branch vs KBuild introductionon the main branch. Resolution consists in adjustingthe list of object files in the main branch version.This also applies to two files which are not listedas conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefileinclude/configs/omap4_common.h conflicts are due tothe OMAP4 conversion to ti_armv7_common.h on the ARMside, and CONFIG_SYS_HZ removal on the main side.Resolution is to convert as this icludes removal ofCONFIG_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 becausethey are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

e1e55c13c965c1c2316cd1540c3e46e1c07fc4ee - cm-t35: move the display code to common place

Mon, 16 Sep 2013 18:49:59 +0000

cm-t35: move the display code to common placeCompulab OMAP3 boards use the same display initialization code.Move the display initialization code to live under board/compulab/commondirectory.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

689be5f83c17af6221764ab3a3890510af3c9022 - cm-t35: move the eeprom code to common place

Mon, 16 Sep 2013 18:49:58 +0000

cm-t35: move the eeprom code to common placeCompulab boards use the same eeprom code, so move the eeprom relatedcode to live under board/compulab/common directory.Also make several adjustments to eeprom functions namespace, so it willbe generic for compulab boards.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

a79854a90f7297ddfda2114c867fd62643fa6e3a - board: arm: convert makefiles to Kbuild style

Mon, 21 Oct 2013 02:53:37 +0000

board: arm: convert makefiles to Kbuild styleSigned-off-by: Masahiro Yamada Cc: Albert ARIBAUD Cc: Andreas Bießmann Cc: Stefano Babic Cc: Prafulla Wadaskar Cc: Minkyu Kang Cc: Vipin Kumar Cc: Tom Warren Cc: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

326ea986ac150acdc7656d57fca647db80b50158 - Merge git://git.denx.de/u-boot-arm

Wed, 31 Jul 2013 09:30:38 +0000

Merge git://git.denx.de/u-boot-armConflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.hSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

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

Thu, 25 Jul 2013 15:57:46 +0000

Merge branch 'u-boot/master' into u-boot-arm/master List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

1a4596601fd395f3afb8f82f3f840c5e00bdd57a - Add GPL-2.0+ SPDX-License-Identifier to source files

Mon, 08 Jul 2013 07:37:19 +0000

Add GPL-2.0+ SPDX-License-Identifier to source filesSigned-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

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

Sat, 11 May 2013 20:24:28 +0000

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile

811acf923d8a0052f22b50306d9362d7e0f8e108 - cm-t35: move cm-t35 to live in compulab directory

Mon, 22 Apr 2013 01:06:53 +0000

cm-t35: move cm-t35 to live in compulab directoryCurrently the cm-t35 support code lives under board/cm_t35 directory.Some of the code can be shared with other/future CompuLab boards,so move the cm-t35 to live under board/compulab/cm_t35 directory.Signed-off-by: Igor Grinberg Tested-by: Nikita Kiryanov List of files: /rk3399_rockchip-uboot/board/compulab/cm_t35/Makefile