At present the model is shown twice, once in the generic code and once in the exynos code. Drop the latter.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/samsung/common/board.c | 14 ++++++-------- include/samsung/misc.h | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 6fd26a3a919..3391228522c 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -290,15 +290,13 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_DISPLAY_BOARDINFO int checkboard(void) { - const char *board_info; + if (IS_ENABLED(CONFIG_BOARD_TYPES)) { + const char *board_info = get_board_type(); + + if (board_info) + printf("Type: %s\n", board_info); + }
- board_info = fdt_getprop(gd->fdt_blob, 0, "model", NULL); - printf("Board: %s\n", board_info ? board_info : "unknown"); -#ifdef CONFIG_BOARD_TYPES - board_info = get_board_type(); - if (board_info) - printf("Type: %s\n", board_info); -#endif return 0; } #endif diff --git a/include/samsung/misc.h b/include/samsung/misc.h index 0f957dc3675..017560c2566 100644 --- a/include/samsung/misc.h +++ b/include/samsung/misc.h @@ -32,9 +32,7 @@ void draw_logo(void); char *get_dfu_alt_system(char *interface, char *devstr); char *get_dfu_alt_boot(char *interface, char *devstr); #endif -#ifdef CONFIG_BOARD_TYPES void set_board_type(void); const char *get_board_type(void); -#endif
#endif /* __SAMSUNG_MISC_COMMON_H__ */