]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
exynos: Drop duplicate 'model' line
authorSimon Glass <sjg@chromium.org>
Sat, 12 Jan 2019 01:37:07 +0000 (18:37 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 9 Feb 2019 19:50:21 +0000 (12:50 -0700)
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>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>
board/samsung/common/board.c
include/samsung/misc.h

index 6fd26a3a91988e39413dcd6ad30a47893528aae1..3391228522c6293b8496149c0f3dfa8c64776a85 100644 (file)
@@ -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
index 0f957dc36750aa6a9a2411f750a3430d3ba0adbe..017560c256626c41061fd13bfaa5c4aac6bb44da 100644 (file)
@@ -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__ */