Commit dac326b8234f698636d588c5722d3b174a800b1d
Committed by
Tom Rini
Tom Rini
1 parent
5031ca59b5
Exists in
v2017.01-smarct4x
and in
30 other branches
generic_board: Call "checkboard" even though the root node has a "model" property
In case of enable CONFIG_OF_CONTROL and has a "model" property in the root node, the board special "checkboard" will not be called. Usually we show some useful version information in the function. This patch enable call "checkboard" in any case. It is not conflicting with showing "model" at the same time. For example on LS2085AQDS: Showing "model" only: Model: Freescale Layerscape 2085a QDS Board Showing "checkboard" only: Board: LS2085E-QDS, Board Arch: V1, Board version: B, boot from vBank: 4 Showing both: Model: Freescale Layerscape 2085a QDS Board Board: LS2085E-QDS, Board Arch: V1, Board version: B, boot from vBank: 4 Signed-off-by: Haikun Wang <haikun.wang@freescale.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff
common/board_info.c
| ... | ... | @@ -14,8 +14,7 @@ |
| 14 | 14 | |
| 15 | 15 | /* |
| 16 | 16 | * If the root node of the DTB has a "model" property, show it. |
| 17 | - * If CONFIG_OF_CONTROL is disabled or the "model" property is missing, | |
| 18 | - * fall back to checkboard(). | |
| 17 | + * Then call checkboard(). | |
| 19 | 18 | */ |
| 20 | 19 | int show_board_info(void) |
| 21 | 20 | { |
| 22 | 21 | |
| ... | ... | @@ -25,10 +24,8 @@ |
| 25 | 24 | |
| 26 | 25 | model = fdt_getprop(gd->fdt_blob, 0, "model", NULL); |
| 27 | 26 | |
| 28 | - if (model) { | |
| 27 | + if (model) | |
| 29 | 28 | printf("Model: %s\n", model); |
| 30 | - return 0; | |
| 31 | - } | |
| 32 | 29 | #endif |
| 33 | 30 | |
| 34 | 31 | return checkboard(); |