Message ID | 20240327162355.24584-4-kabel@kernel.org |
---|---|
State | Superseded |
Delegated to: | Stefan Roese |
Headers | show |
Series | Turris Omnia - New board revision support | expand |
On 3/27/24 17:23, Marek Behún wrote: > Since commit 8cd4bf7dc9ba ("turris: Use checkboard() instead of > show_board_info()") the model is show two times during boot: > Model: Turris Omnia > Model: Turris Omnia > > This is because the common function show_board_info() shows it, and > Turris' checkboard() also does. > > Remove the second print. > > Fixes: 8cd4bf7dc9ba ("turris: Use checkboard() instead of show_board_info()") > Signed-off-by: Marek Behún <kabel@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > board/CZ.NIC/turris_mox/turris_mox.c | 5 +---- > board/CZ.NIC/turris_omnia/turris_omnia.c | 1 - > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c > index 3489bdd74b..1a2f60e3d1 100644 > --- a/board/CZ.NIC/turris_mox/turris_mox.c > +++ b/board/CZ.NIC/turris_mox/turris_mox.c > @@ -565,13 +565,10 @@ static void handle_reset_button(void) > int checkboard(void) > { > int i, ret, board_version, ram_size, is_sd; > - const char *pub_key, *model; > + const char *pub_key; > const u8 *topology; > u64 serial_number; > > - model = fdt_getprop(gd->fdt_blob, 0, "model", NULL); > - printf("Model: %s\n", model); > - > ret = mbox_sp_get_board_info(&serial_number, NULL, NULL, &board_version, > &ram_size, NULL); > if (ret < 0) { > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c > index 6c2d7da528..87e33d88c4 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -933,7 +933,6 @@ int checkboard(void) > int err; > > err = turris_atsha_otp_get_serial_number(serial); > - printf("Model: Turris Omnia\n"); > printf(" MCU type: %s\n", omnia_get_mcu_type()); > printf(" MCU version: %s\n", omnia_get_mcu_version()); > printf(" RAM size: %i MiB\n", omnia_get_ram_size_gb() * 1024); Viele Grüße, Stefan Roese
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 3489bdd74b..1a2f60e3d1 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -565,13 +565,10 @@ static void handle_reset_button(void) int checkboard(void) { int i, ret, board_version, ram_size, is_sd; - const char *pub_key, *model; + const char *pub_key; const u8 *topology; u64 serial_number; - model = fdt_getprop(gd->fdt_blob, 0, "model", NULL); - printf("Model: %s\n", model); - ret = mbox_sp_get_board_info(&serial_number, NULL, NULL, &board_version, &ram_size, NULL); if (ret < 0) { diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 6c2d7da528..87e33d88c4 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -933,7 +933,6 @@ int checkboard(void) int err; err = turris_atsha_otp_get_serial_number(serial); - printf("Model: Turris Omnia\n"); printf(" MCU type: %s\n", omnia_get_mcu_type()); printf(" MCU version: %s\n", omnia_get_mcu_version()); printf(" RAM size: %i MiB\n", omnia_get_ram_size_gb() * 1024);
Since commit 8cd4bf7dc9ba ("turris: Use checkboard() instead of show_board_info()") the model is show two times during boot: Model: Turris Omnia Model: Turris Omnia This is because the common function show_board_info() shows it, and Turris' checkboard() also does. Remove the second print. Fixes: 8cd4bf7dc9ba ("turris: Use checkboard() instead of show_board_info()") Signed-off-by: Marek Behún <kabel@kernel.org> --- board/CZ.NIC/turris_mox/turris_mox.c | 5 +---- board/CZ.NIC/turris_omnia/turris_omnia.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-)