projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
common
/
cmd_bdinfo.c
diff --git
a/common/cmd_bdinfo.c
b/common/cmd_bdinfo.c
index
9651b30
..
58ee9f3
100644
(file)
--- a/
common/cmd_bdinfo.c
+++ b/
common/cmd_bdinfo.c
@@
-30,7
+30,7
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if
(CONFIG_COMMANDS & CF
G_CMD_BDI)
+#if
defined(CONFI
G_CMD_BDI)
static void print_num(const char *, ulong);
#ifndef CONFIG_ARM /* PowerPC and other */
static void print_num(const char *, ulong);
#ifndef CONFIG_ARM /* PowerPC and other */
@@
-167,7
+167,7
@@
int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_num ("sram size", (ulong)bd->bi_sramsize);
#endif
print_num ("sram size", (ulong)bd->bi_sramsize);
#endif
-#if defined(C
F
G_CMD_NET)
+#if defined(C
ONFI
G_CMD_NET)
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@
-195,7
+195,7
@@
int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_num ("sram start ", (ulong)bd->bi_sramstart);
print_num ("sram size ", (ulong)bd->bi_sramsize);
#endif
print_num ("sram start ", (ulong)bd->bi_sramstart);
print_num ("sram size ", (ulong)bd->bi_sramsize);
#endif
-#if defined(C
F
G_CMD_NET)
+#if defined(C
ONFI
G_CMD_NET)
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@
-338,4
+338,4
@@
U_BOOT_CMD(
"bdinfo - print Board Info structure\n",
NULL
);
"bdinfo - print Board Info structure\n",
NULL
);
-#endif
/* CFG_CMD_BDI */
+#endif