dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up the error messages.

Browse Source 
Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
Gerald Van Baren
2007-06-25 20:55:58 -04:00
parent c45874b05a
commit 6f35ded9e8
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/fdt_support.c
View File

@@ -130,8 +130,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
nodeoffset = fdt_add_subnode(fdt, 0, "chosen"); nodeoffset = fdt_add_subnode(fdt, 0, "chosen");
if (nodeoffset < 0) { if (nodeoffset < 0) {
printf("WARNING fdt_chosen: " printf("WARNING fdt_chosen: "
"could not create the \"/chosen node\" " "could not create the /chosen node (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(nodeoffset)); fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
} }
@@ -146,8 +145,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
"bootargs", str, strlen(str)+1); "bootargs", str, strlen(str)+1);
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: " printf("WARNING fdt_chosen: "
"could not set \"bootargs\" " "could not set bootargs (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
} }
if (initrd_start && initrd_end) { if (initrd_start && initrd_end) {
@@ -156,16 +154,14 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
"linux,initrd-start", &tmp, sizeof(tmp)); "linux,initrd-start", &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: " printf("WARNING fdt_chosen: "
"could not set \"linux,initrd-start\" " "could not set linux,initrd-start (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
tmp = __cpu_to_be32(initrd_end); tmp = __cpu_to_be32(initrd_end);
err = fdt_setprop(fdt, nodeoffset, err = fdt_setprop(fdt, nodeoffset,
"linux,initrd-end", &tmp, sizeof(tmp)); "linux,initrd-end", &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: " printf("WARNING fdt_chosen: "
"could not set \"linux,initrd-end\" " "could not set linux,initrd-end (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
} }
#ifdef OF_STDOUT_PATH #ifdef OF_STDOUT_PATH
@@ -173,8 +169,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
"linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1); "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: " printf("WARNING fdt_chosen: "
"could not set \"linux,stdout-path\" " "could not set linux,stdout-path (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
#endif #endif
@@ -221,8 +216,7 @@ int fdt_env(void *fdt)
nodeoffset = fdt_add_subnode(fdt, 0, "u-boot-env"); nodeoffset = fdt_add_subnode(fdt, 0, "u-boot-env");
if (nodeoffset < 0) { if (nodeoffset < 0) {
printf("WARNING fdt_env: " printf("WARNING fdt_env: "
"could not create the \"/u-boot-env node\" " "could not create the /u-boot-env node (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(nodeoffset)); fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
} }
@@ -252,8 +246,7 @@ int fdt_env(void *fdt)
err = fdt_setprop(fdt, nodeoffset, lval, rval, strlen(rval)+1); err = fdt_setprop(fdt, nodeoffset, lval, rval, strlen(rval)+1);
if (err < 0) { if (err < 0) {
printf("WARNING fdt_env: " printf("WARNING fdt_env: "
"could not set \"%s\" " "could not set %s (%s).\n",
"(libfdt error %s).\n",
lval, fdt_strerror(err)); lval, fdt_strerror(err));
return err; return err;
} }
@@ -347,8 +340,7 @@ int fdt_bd_t(void *fdt)
nodeoffset = fdt_add_subnode(fdt, 0, "bd_t"); nodeoffset = fdt_add_subnode(fdt, 0, "bd_t");
if (nodeoffset < 0) { if (nodeoffset < 0) {
printf("WARNING fdt_bd_t: " printf("WARNING fdt_bd_t: "
"could not create the \"/bd_t node\" " "could not create the /bd_t node (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(nodeoffset)); fdt_strerror(nodeoffset));
printf("libfdt: %s\n", fdt_strerror(nodeoffset)); printf("libfdt: %s\n", fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
@@ -362,8 +354,7 @@ int fdt_bd_t(void *fdt)
bd_map[i].name, &tmp, sizeof(tmp)); bd_map[i].name, &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_bd_t: " printf("WARNING fdt_bd_t: "
"could not set \"%s\" " "could not set %s (%s).\n",
"(libfdt error %s).\n",
bd_map[i].name, fdt_strerror(err)); bd_map[i].name, fdt_strerror(err));
} }
/* /*
@@ -372,14 +363,12 @@ int fdt_bd_t(void *fdt)
err = fdt_setprop(fdt, nodeoffset, "enetaddr", &bd->bi_enetaddr, 6); err = fdt_setprop(fdt, nodeoffset, "enetaddr", &bd->bi_enetaddr, 6);
if (err < 0) if (err < 0)
printf("WARNING fdt_bd_t: " printf("WARNING fdt_bd_t: "
"could not set \"enetaddr\" " "could not set enetaddr (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
err = fdt_setprop(fdt, nodeoffset, "ethspeed", &bd->bi_ethspeed, 4); err = fdt_setprop(fdt, nodeoffset, "ethspeed", &bd->bi_ethspeed, 4);
if (err < 0) if (err < 0)
printf("WARNING fdt_bd_t: " printf("WARNING fdt_bd_t: "
"could not set \"ethspeed\" " "could not set ethspeed (%s).\n",
"(libfdt error %s).\n",
fdt_strerror(err)); fdt_strerror(err));
return 0; return 0;
} }