summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-26 16:24:31 +0200
committerWolfgang Denk <wd@denx.de>2006-10-26 16:24:31 +0200
commit2b2a40bebbf1822506e80e631d7253e60f0e0fe6 (patch)
treecb331a26115df79afa0baab69faff3ff066c8f75 /common
parentb9e9adce0bbbfdb47a816f25cc1f1d3a1b2cd14b (diff)
downloadu-boot-imx-2b2a40bebbf1822506e80e631d7253e60f0e0fe6.zip
u-boot-imx-2b2a40bebbf1822506e80e631d7253e60f0e0fe6.tar.gz
u-boot-imx-2b2a40bebbf1822506e80e631d7253e60f0e0fe6.tar.bz2
Code cleanup.
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c5
-rw-r--r--common/cmd_dcr.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index ab3c32c..3091a58 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -929,7 +929,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
*/
(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
-#else
+#else /* CONFIG_OF_FLAT_TREE */
/* move of_flat_tree if needed */
if (of_data) {
ulong of_start, of_len;
@@ -971,8 +971,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
/* ft_dump_blob(of_flat_tree); */
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
}
-
-#endif
+#endif /* CONFIG_OF_FLAT_TREE */
}
#endif /* CONFIG_PPC */
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 5fe2ede..7221a86 100644
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -181,7 +181,7 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (argc < 4) {
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
- }
+ }
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
@@ -198,9 +198,9 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
* First parameter has format adr_dcrn; dat_dcrn will be
* calculated as adr_dcrn+1.
*/
- adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
- dat_dcrn = adr_dcrn+1;
- }
+ adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
+ dat_dcrn = adr_dcrn+1;
+ }
/* Register's offset */
offset = (unsigned short) simple_strtoul (argv[2], NULL, 16);