brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Fix fdt_chosen() to call ft_board_setup(), clean up long lines.

Browse Source 
The fdt_chosen() function was adding/seting some properties ad-hoc
  improperly and duplicated (poorly) what was done in ft_board_setup()

Clean up long lines (setting properties, printing errors).

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
Gerald Van Baren 2007-05-25 22:08:57 -04:00
parent 06e19a0770
commit 35ec398f16
1 changed files with 74 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
common/fdt_support.c
View File

@ -32,6 +32,10 @@
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#ifdef CONFIG_OF_BOARD_SETUP
void ft_board_setup(void *blob, bd_t *bd);
#endif
/* /*
* Global data (for the gd->bd) * Global data (for the gd->bd)
*/ */
@ -42,7 +46,6 @@ DECLARE_GLOBAL_DATA_PTR;
*/ */
struct fdt_header *fdt; struct fdt_header *fdt;
/********************************************************************/ /********************************************************************/
int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force) int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
@ -50,9 +53,8 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
int nodeoffset; int nodeoffset;
int err; int err;
u32 tmp; /* used to set 32 bit integer properties */ u32 tmp; /* used to set 32 bit integer properties */
char *str; /* used to set string properties */ char *str; /* used to set string properties */
ulong clock;
err = fdt_check_header(fdt); err = fdt_check_header(fdt);
if (err < 0) { if (err < 0) {
@ -60,6 +62,17 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
return err; return err;
} }
#ifdef CONFIG_OF_BOARD_SETUP
/*
* ft_board_setup() sets various board-specific properties to
* the proper values.
*
* STRICTLY SPEAKING, this is out of place, but it isn't clear
* where a better place would be.
*/
ft_board_setup(fdt, bd);
#endif
if (initrd_start && initrd_end) { if (initrd_start && initrd_end) {
struct fdt_reserve_entry re; struct fdt_reserve_entry re;
int used; int used;
@ -72,7 +85,8 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
return err; return err;
} }
if (used >= total) { if (used >= total) {
printf("WARNING fdt_chosen: no room in the reserved map (%d of %d)\n", printf("WARNING fdt_chosen: "
"no room in the reserved map (%d of %d)\n",
used, total); used, total);
return -1; return -1;
} }
@ -115,7 +129,10 @@ 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: could not create the \"/chosen node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); printf("WARNING fdt_chosen: "
"could not create the \"/chosen node\" "
"(libfdt error %s).\n",
fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
} }
} }
@ -125,42 +142,42 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
*/ */
str = getenv("bootargs"); str = getenv("bootargs");
if (str != NULL) { if (str != NULL) {
err = fdt_setprop(fdt, nodeoffset, "bootargs", str, strlen(str)+1); err = fdt_setprop(fdt, nodeoffset,
"bootargs", str, strlen(str)+1);
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: could not set \"bootargs\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: "
"could not set \"bootargs\" "
"(libfdt error %s).\n",
fdt_strerror(err));
} }
if (initrd_start && initrd_end) { if (initrd_start && initrd_end) {
tmp = __cpu_to_be32(initrd_start); tmp = __cpu_to_be32(initrd_start);
err = fdt_setprop(fdt, nodeoffset, "linux,initrd-start", &tmp, sizeof(tmp)); err = fdt_setprop(fdt, nodeoffset,
"linux,initrd-start", &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: could not set \"linux,initrd-start\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: "
"could not set \"linux,initrd-start\" "
"(libfdt error %s).\n",
fdt_strerror(err));
tmp = __cpu_to_be32(initrd_end); tmp = __cpu_to_be32(initrd_end);
err = fdt_setprop(fdt, nodeoffset, "linux,initrd-end", &tmp, sizeof(tmp)); err = fdt_setprop(fdt, nodeoffset,
"linux,initrd-end", &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: could not set \"linux,initrd-end\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: "
"could not set \"linux,initrd-end\" "
"(libfdt error %s).\n",
fdt_strerror(err));
} }
#ifdef OF_STDOUT_PATH #ifdef OF_STDOUT_PATH
err = fdt_setprop(fdt, nodeoffset, "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1); err = fdt_setprop(fdt, nodeoffset,
"linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
if (err < 0) if (err < 0)
printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_chosen: "
"could not set \"linux,stdout-path\" "
"(libfdt error %s).\n",
fdt_strerror(err));
#endif #endif
nodeoffset = fdt_find_node_by_path (fdt, "/cpus");
if (nodeoffset >= 0) {
clock = cpu_to_be32(bd->bi_intfreq);
err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
if (err < 0)
printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err));
}
#ifdef OF_TBCLK
nodeoffset = fdt_find_node_by_path (fdt, "/cpus/" OF_CPU "/timebase-frequency");
if (nodeoffset >= 0) {
clock = cpu_to_be32(OF_TBCLK);
err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
if (err < 0)
printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err));
}
#endif
return err; return err;
} }
@ -203,7 +220,10 @@ 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: could not create the \"/u-boot-env node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); printf("WARNING fdt_env: "
"could not create the \"/u-boot-env node\" "
"(libfdt error %s).\n",
fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
} }
@ -231,7 +251,10 @@ int fdt_env(void *fdt)
continue; continue;
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: could not set \"%s\" (libfdt error %s).\n", lval, fdt_strerror(err)); printf("WARNING fdt_env: "
"could not set \"%s\" "
"(libfdt error %s).\n",
lval, fdt_strerror(err));
return err; return err;
} }
} }
@ -297,7 +320,7 @@ int fdt_bd_t(void *fdt)
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
int nodeoffset; int nodeoffset;
int err; int err;
u32 tmp; /* used to set 32 bit integer properties */ u32 tmp; /* used to set 32 bit integer properties */
int i; int i;
err = fdt_check_header(fdt); err = fdt_check_header(fdt);
@ -323,7 +346,10 @@ 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: could not create the \"/bd_t node\" (libfdt error %s).\n", fdt_strerror(nodeoffset)); printf("WARNING fdt_bd_t: "
"could not create the \"/bd_t node\" "
"(libfdt error %s).\n",
fdt_strerror(nodeoffset));
printf("libfdt: %s\n", fdt_strerror(nodeoffset)); printf("libfdt: %s\n", fdt_strerror(nodeoffset));
return nodeoffset; return nodeoffset;
} }
@ -332,20 +358,29 @@ int fdt_bd_t(void *fdt)
*/ */
for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) { for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) {
tmp = cpu_to_be32(getenv("bootargs")); tmp = cpu_to_be32(getenv("bootargs"));
err = fdt_setprop(fdt, nodeoffset, bd_map[i].name, &tmp, sizeof(tmp)); err = fdt_setprop(fdt, nodeoffset,
bd_map[i].name, &tmp, sizeof(tmp));
if (err < 0) if (err < 0)
printf("WARNING fdt_bd_t: could not set \"%s\" (libfdt error %s).\n", bd_map[i].name, fdt_strerror(err)); printf("WARNING fdt_bd_t: "
"could not set \"%s\" "
"(libfdt error %s).\n",
bd_map[i].name, fdt_strerror(err));
} }
/* /*
* Add a couple of oddball entries... * Add a couple of oddball entries...
*/ */
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: could not set \"enetaddr\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_bd_t: "
"could not set \"enetaddr\" "
"(libfdt error %s).\n",
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: could not set \"ethspeed\" (libfdt error %s).\n", fdt_strerror(err)); printf("WARNING fdt_bd_t: "
"could not set \"ethspeed\" "
"(libfdt error %s).\n",
fdt_strerror(err));
return 0; return 0;
} }
#endif /* ifdef CONFIG_OF_HAS_BD_T */ #endif /* ifdef CONFIG_OF_HAS_BD_T */