From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Mon, 17 Dec 2018 08:47:27 +0100 Subject: [U-Boot] [PATCH v2 03/11] exynos: Drop duplicate 'model' line In-Reply-To: <20181217023638.39803-4-sjg@chromium.org> References: <20181217023638.39803-1-sjg@chromium.org> <20181217023638.39803-4-sjg@chromium.org> Message-ID: <20181217084727.752eed18@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sun, 16 Dec 2018 19:36:30 -0700 Simon Glass wrote: > 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 > --- > > Changes in v2: None > > 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__ */ Reviewed-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: