History log of /openbmc/u-boot/post/drivers/i2c.c (Results 26 – 31 of 31)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2008.10-rc3, v2008.10-rc2, v2008.10-rc1, v1.3.4, v1.3.4-rc2, v1.3.4-rc1, v1.3.3, v1.3.3-rc3, v1.3.3-rc2, v1.3.3-rc1
# 4b7a6dd8 25-Apr-2008 Wolfgang Denk <wd@denx.de>

Merge branch 'master' of /home/wd/git/u-boot/lwmon5

Conflicts:

common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.

Merge branch 'master' of /home/wd/git/u-boot/lwmon5

Conflicts:

common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

show more ...


# 0a51e924 31-Mar-2008 Yuri Tikhonov <yur@emcraft.com>

POST: preparations for moving CONFIG_POST to Makefiles

Remove CONFIG_POST ifdefs from the post/ source files.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>


Revision tags: v1.3.2, v1.3.2-rc3, v1.3.2-rc2, v1.3.2-rc1, v1.3.1, v1.3.1-rc1, v1.3.0, v1.3.0-rc4, v1.3.0-rc3, v1.3.0-rc2, v1.3.0-rc1
# 3c4bd60d 07-May-2007 Michal Simek <monstr@monstr.eu>

Merge git://www.denx.de/git/u-boot

Conflicts:

include/asm-microblaze/microblaze_intc.h
include/linux/stat.h


# ee89bf27 19-Apr-2007 Peter Pearse <peter.pearse@arm.com>

Merge with git://www.denx.de/git/u-boot.git


# d8be5766 08-Mar-2007 Wolfgang Denk <wd@pollux.denx.de>

Merge with /home/git/u-boot


# ad5bb451 06-Mar-2007 Wolfgang Denk <wd@pollux.denx.de>

Restructure POST directory to support of other CPUs, boards, etc.


12