Changes in 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/corscience/tricorder/Makefile

ad9f072c2e3b6b4b198f171cb1ba6c0e7fc3e06e - tricorder: add led support

Fri, 06 Sep 2013 13:04:54 +0000

tricorder: add led supportSigned-off-by: Andreas Bießmann List of files: /rk3399_rockchip-uboot/board/corscience/tricorder/Makefile

459f1da88b42e9a795e51c73fcd55fd339fc594b - tricorder: add tricordereeprom command

Fri, 06 Sep 2013 13:04:52 +0000

tricorder: add tricordereeprom commandThe new tricordereeprom command can read and write the eeprom for hardwaredetection on tricorder devices.Signed-off-by: Andreas Bießmann List of files: /rk3399_rockchip-uboot/board/corscience/tricorder/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/corscience/tricorder/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/corscience/tricorder/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/corscience/tricorder/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/corscience/tricorder/Makefile

8167af14d58b32fe50a9a3a1bdc44b45e101f93f - OMAP3: Add Corscience Tricorder board

Sat, 28 Jan 2012 09:25:46 +0000

OMAP3: Add Corscience Tricorder boardTricorder is a board which is very similar to the Devkit8000. Itis designed as a base platform for further medical devices.www.corscience.de/en/medical-engineering/products/multiparameter/mp10-board.htmlSigned-off-by: Thomas Weber List of files: /rk3399_rockchip-uboot/board/corscience/tricorder/Makefile