projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: dts: tinker: add usb host power supply node
[oweals/u-boot.git]
/
common
/
board_info.c
diff --git
a/common/board_info.c
b/common/board_info.c
index 42d0641294a86c0c632213dd8a1ed52e96bbd7be..aa45e24b34603751c8e21cae4c631bd41eb54b1a 100644
(file)
--- a/
common/board_info.c
+++ b/
common/board_info.c
@@
-8,16
+8,14
@@
int __weak checkboard(void)
{
int __weak checkboard(void)
{
- printf("Board: Unknown\n");
return 0;
}
/*
* If the root node of the DTB has a "model" property, show it.
return 0;
}
/*
* If the root node of the DTB has a "model" property, show it.
- * If CONFIG_OF_CONTROL is disabled or the "model" property is missing,
- * fall back to checkboard().
+ * Then call checkboard().
*/
*/
-int show_board_info(void)
+int
__weak
show_board_info(void)
{
#ifdef CONFIG_OF_CONTROL
DECLARE_GLOBAL_DATA_PTR;
{
#ifdef CONFIG_OF_CONTROL
DECLARE_GLOBAL_DATA_PTR;
@@
-25,10
+23,8
@@
int show_board_info(void)
model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
- if (model)
{
+ if (model)
printf("Model: %s\n", model);
printf("Model: %s\n", model);
- return 0;
- }
#endif
return checkboard();
#endif
return checkboard();