u-boot.git/board/corscience, branch v2014.01 Unnamed repository; edit this file 'description' to name the repository. Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09T21:59:47+00:00 Albert ARIBAUD albert.u.boot@aribaud.net 2013-11-09T11:51:47+00:00 85b8c5c4bf80025de4632ae6c9a8a606e51508a4 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.h Makefile 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/Makefile include/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 
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.h

Makefile 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/Makefile

include/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
tricorder: support 256MiB SDRAM on revision > D 2013-11-01T19:55:59+00:00 Andreas Bießmann andreas.biessmann@corscience.de 2013-09-06T13:04:58+00:00 0178296588fe3004238c77d3dc0996d82b8c8ca1 Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de> 
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
tricorder: add led support 2013-11-01T19:55:59+00:00 Andreas Bießmann andreas.biessmann@corscience.de 2013-09-06T13:04:54+00:00 ad9f072c2e3b6b4b198f171cb1ba6c0e7fc3e06e Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de> 
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
tricorder: panic() on unknown board 2013-11-01T19:55:59+00:00 Andreas Bießmann andreas.biessmann@corscience.de 2013-09-06T13:04:53+00:00 890880583d84607e36b52a785a96b167728bbf73 Also hang() the board on panic(). Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de> 
Also hang() the board on panic().

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
tricorder: add tricordereeprom command 2013-11-01T19:55:58+00:00 Andreas Bießmann andreas.biessmann@corscience.de 2013-09-06T13:04:52+00:00 459f1da88b42e9a795e51c73fcd55fd339fc594b The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de> 
The new tricordereeprom command can read and write the eeprom for hardware
detection on tricorder devices.

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
board: arm: convert makefiles to Kbuild style 2013-11-01T15:42:12+00:00 Masahiro Yamada yamada.m@jp.panasonic.com 2013-10-21T02:53:37+00:00 a79854a90f7297ddfda2114c867fd62643fa6e3a Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Prafulla Wadaskar <prafulla@marvell.com> Cc: Minkyu Kang <mk7.kang@samsung.com> Cc: Vipin Kumar <vipin.kumar@st.com> Cc: Tom Warren <twarren@nvidia.com> Cc: Tom Rini <trini@ti.com> 
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Vipin Kumar <vipin.kumar@st.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Tom Rini <trini@ti.com>
Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24T13:44:38+00:00 Wolfgang Denk wd@denx.de 2013-07-08T07:37:19+00:00 1a4596601fd395f3afb8f82f3f840c5e00bdd57a Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>
omap_hsmmc: add driver check for write protection 2013-03-08T21:41:13+00:00 Nikita Kiryanov nikita@compulab.co.il 2012-12-03T02:19:47+00:00 e3913f56a26dbb49758370320dac477ab0324631 Add check for write protection in omap mmc driver. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com> 
Add check for write protection in omap mmc driver.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Tom Rini <trini@ti.com>
omap_hsmmc: implement driver check for card detection 2013-03-08T21:41:13+00:00 Nikita Kiryanov nikita@compulab.co.il 2012-12-03T02:19:44+00:00 e874d5b001e9d7ea0fc7596ef0fe6dd520ed8ec6 Implement driver check for card detection. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> 
Implement driver check for card detection.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Pass sdrc timing values through board_sdrc_timings structure 2012-12-10T15:54:02+00:00 Peter Barada peter.barada@logicpd.com 2012-11-13T07:40:28+00:00 8c4445d26633f43fcd04add3d6cdc3bc41d14841 Instead of passing individual registers by value to board_get_mem_timings, pass a board_mem_timings structure pointer for the board files to fill in. Pass same structure pointer to write_sdrc_timings. This saves about 90 bytes of space in SPL. Signed-off-by: Peter Barada <peter.barada@logicpd.com> 
Instead of passing individual registers by value to board_get_mem_timings,
pass a board_mem_timings structure pointer for the board files to fill in.
Pass same structure pointer to write_sdrc_timings.  This saves about
90 bytes of space in SPL.

Signed-off-by: Peter Barada <peter.barada@logicpd.com>