summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c1
-rw-r--r--common/soft_i2c.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 2cf625d..e138d78b 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -366,6 +366,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
}
#ifdef CONFIG_LOGBUFFER
+ kbd=gd->bd;
/* Prevent initrd from overwriting logbuffer */
if (initrd_high < (kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD))
initrd_high = kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD;
diff --git a/common/soft_i2c.c b/common/soft_i2c.c
index 7777480..6357404 100644
--- a/common/soft_i2c.c
+++ b/common/soft_i2c.c
@@ -287,8 +287,9 @@ int i2c_probe(uchar addr)
{
int rc;
+ /* perform 1 byte read transaction */
send_start();
- rc = write_byte ((addr << 1) | 1);
+ rc = write_byte ((addr << 1) | 0);
send_stop();
return (rc ? 1 : 0);