10 Nov, 2013
1 commit
-
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 of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:board/compulab/common/Makefile
board/udoo/Makefileinclude/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_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 because
they are new:include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h
02 Nov, 2013
2 commits
-
Signed-off-by: Andreas Bießmann
-
The new tricordereeprom command can read and write the eeprom for hardware
detection on tricorder devices.Signed-off-by: Andreas Bießmann
01 Nov, 2013
1 commit
-
Signed-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
24 Jul, 2013
1 commit
-
Signed-off-by: Wolfgang Denk
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini
12 Feb, 2012
1 commit
-
Tricorder is a board which is very similar to the Devkit8000. It
is designed as a base platform for further medical devices.www.corscience.de/en/medical-engineering/products/multiparameter/mp10-board.html
Signed-off-by: Thomas Weber