summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-11-21 00:06:33 +0000
committerwdenk <wdenk>2004-11-21 00:06:33 +0000
commit9d5028c2f7a65d3777867a6cfc966a01a5823132 (patch)
treec971cc2b0d41e422585c1911fffda7d2d6403ee4 /common
parentcacfab588a897c369a4906818c5ed4bc40a450c5 (diff)
downloadu-boot-imx-9d5028c2f7a65d3777867a6cfc966a01a5823132.zip
u-boot-imx-9d5028c2f7a65d3777867a6cfc966a01a5823132.tar.gz
u-boot-imx-9d5028c2f7a65d3777867a6cfc966a01a5823132.tar.bz2
* Update for AT91RM9200DK and CMC_PU2 boards:
- Enable booting directly from flash - fix CMC_PU2 flash driver * Fix mkimage usage message
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c14
-rw-r--r--common/soft_i2c.c4
2 files changed, 11 insertions, 7 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 43ea5f1..356a2a4 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -449,8 +449,8 @@ U_BOOT_CMD(
bootm, CFG_MAXARGS, 1, do_bootm,
"bootm - boot application image from memory\n",
"[addr [arg ...]]\n - boot application image stored in memory\n"
- " passing arguments 'arg ...'; when booting a Linux kernel,\n"
- " 'arg' can be the address of an initrd image\n"
+ "\tpassing arguments 'arg ...'; when booting a Linux kernel,\n"
+ "\t'arg' can be the address of an initrd image\n"
);
#ifdef CONFIG_SILENT_CONSOLE
@@ -574,11 +574,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
kbd->bi_intfreq /= 1000000L;
kbd->bi_busfreq /= 1000000L;
#if defined(CONFIG_MPC8220)
- kbd->bi_inpfreq /= 1000000L;
- kbd->bi_pcifreq /= 1000000L;
- kbd->bi_pevfreq /= 1000000L;
- kbd->bi_flbfreq /= 1000000L;
- kbd->bi_vcofreq /= 1000000L;
+ kbd->bi_inpfreq /= 1000000L;
+ kbd->bi_pcifreq /= 1000000L;
+ kbd->bi_pevfreq /= 1000000L;
+ kbd->bi_flbfreq /= 1000000L;
+ kbd->bi_vcofreq /= 1000000L;
#endif
#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
kbd->bi_cpmfreq /= 1000000L;
diff --git a/common/soft_i2c.c b/common/soft_i2c.c
index 9a10b31..f7ca498 100644
--- a/common/soft_i2c.c
+++ b/common/soft_i2c.c
@@ -29,6 +29,10 @@
#ifdef CONFIG_MPC8260 /* only valid for MPC8260 */
#include <ioports.h>
#endif
+#ifdef CONFIG_AT91RM9200DK /* need this for the at91rm9200dk */
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#endif
#include <i2c.h>
#if defined(CONFIG_SOFT_I2C)