summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-04-04 02:18:56 +0200
committerWolfgang Denk <wd@denx.de>2007-04-04 02:18:56 +0200
commit25b0806fff1f1fd24f69f6d9ef04d8345667e60b (patch)
tree38cbc11d30a3a5de01c5cfa5f5ea0da4597aad64 /common
parent31c98a88228021b314c89ebb8104fb6473da4471 (diff)
parent0e7d4916afaf83083b9b70ad779f29f7b57bd8ed (diff)
downloadu-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.zip
u-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.tar.gz
u-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'common')
-rw-r--r--common/cmd_i2c.c3
-rw-r--r--common/serial.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 34571ee..755810d 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -969,7 +969,7 @@ U_BOOT_CMD(
"i2c sdram chip - print SDRAM configuration information\n"
#endif /* CFG_CMD_SDRAM */
);
-#else /* CONFIG_I2C_CMD_TREE */
+#endif /* CONFIG_I2C_CMD_TREE */
U_BOOT_CMD(
imd, 4, 1, do_i2c_md, \
"imd - i2c memory display\n", \
@@ -1024,6 +1024,5 @@ U_BOOT_CMD(
" (valid chip values 50..57)\n"
);
#endif
-#endif /* CONFIG_I2C_CMD_TREE */
#endif /* CFG_CMD_I2C */
diff --git a/common/serial.c b/common/serial.c
index 605d4e3..13e9f30 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -41,7 +41,7 @@ struct serial_device *default_serial_console (void)
|| defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
return &serial_scc_device;
#elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
- || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx)
+ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_MPC5xxx)
#if defined(CONFIG_CONS_INDEX) && defined(CFG_NS16550_SERIAL)
#if (CONFIG_CONS_INDEX==1)
return &eserial1_device;
@@ -91,7 +91,7 @@ void serial_initialize (void)
#endif
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
- || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx)
+ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_MPC5xxx)
serial_register(&serial0_device);
serial_register(&serial1_device);
#endif