Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

toradex: Remove not necessary model prints from checkboard()

Browse source 
Sysinfo prints the model obtained from device tree, checkboard()
take info from hardware and tdx_checkboard() use the model retrieved by
toradex config block.

Remove the print from checkboard() function because the model obtained
from toradex config block is the most complete.
If toradex config block is missing the model info from device tree is
enough.

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> # Verdin iMX8M Plus
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
This commit is contained in:
Emanuele Ghidoli 2024-02-23 10:11:38 +01:00 committed by Tom Rini
parent 32b64893fb
commit 28138dea7b
13 changed files with 8 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
board/toradex/apalis-imx8/apalis-imx8.c
View file

@ -208,16 +208,6 @@ void board_preboot_os(void)
gpio_direction_output(BKL1_GPIO, 0);
}
int checkboard(void)
{
puts("Model: Toradex Apalis iMX8\n");
build_info();
print_bootinfo();
return tdx_checkboard();
}
static enum pcb_rev_t get_pcb_revision(void)
{
unsigned int pcb_vers = 0;

7
board/toradex/apalis-tk1/apalis-tk1.c
View file

@ -91,13 +91,6 @@ int arch_misc_init(void)
return 0;
}
int checkboard(void)
{
puts("Model: Toradex Apalis TK1 2GB\n");
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

21
board/toradex/apalis_imx6/apalis_imx6.c
View file

@ -716,27 +716,6 @@ int board_late_init(void)
}
#endif /* CONFIG_BOARD_LATE_INIT */
int checkboard(void)
{
char it[] = " IT";
int minc, maxc;
switch (get_cpu_temp_grade(&minc, &maxc)) {
case TEMP_AUTOMOTIVE:
case TEMP_INDUSTRIAL:
break;
case TEMP_EXTCOMMERCIAL:
default:
it[0] = 0;
};
printf("Model: Toradex Apalis iMX6 %s %s%s\n",
is_cpu_type(MXC_CPU_MX6D) ? "Dual" : "Quad",
(gd->ram_size == 0x80000000) ? "2GB" :
(gd->ram_size == 0x40000000) ? "1GB" : "512MB", it);
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

8
board/toradex/apalis_t30/apalis_t30.c
View file

@ -45,14 +45,6 @@ int arch_misc_init(void)
return 0;
}
int checkboard(void)
{
printf("Model: Toradex Apalis T30 %dGB\n",
(gd->ram_size == 0x40000000) ? 1 : 2);
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

7
board/toradex/colibri-imx6ull/colibri-imx6ull.c
View file

@ -205,13 +205,6 @@ int board_late_init(void)
return 0;
}
int checkboard(void)
{
printf("Model: Toradex Colibri iMX6ULL\n");
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

10
board/toradex/colibri-imx8x/colibri-imx8x.c
View file

@ -114,16 +114,6 @@ int board_phy_config(struct phy_device *phydev)
}
#endif
int checkboard(void)
{
puts("Model: Toradex Colibri iMX8X\n");
build_info();
print_bootinfo();
return tdx_checkboard();
}
static void select_dt_from_module_version(void)
{
/*

20
board/toradex/colibri_imx6/colibri_imx6.c
View file

@ -636,26 +636,6 @@ int board_late_init(void)
}
#endif /* CONFIG_BOARD_LATE_INIT */
int checkboard(void)
{
char it[] = " IT";
int minc, maxc;
switch (get_cpu_temp_grade(&minc, &maxc)) {
case TEMP_AUTOMOTIVE:
case TEMP_INDUSTRIAL:
break;
case TEMP_EXTCOMMERCIAL:
default:
it[0] = 0;
};
printf("Model: Toradex Colibri iMX6 %s %sMB%s\n",
is_cpu_type(MXC_CPU_MX6DL) ? "DualLite" : "Solo",
(gd->ram_size == 0x20000000) ? "512" : "256", it);
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

8
board/toradex/colibri_imx7/colibri_imx7.c
View file

@ -273,14 +273,6 @@ void reset_cpu(void)
}
#endif
int checkboard(void)
{
printf("Model: Toradex Colibri iMX7%c\n",
is_cpu_type(MXC_CPU_MX7D) ? 'D' : 'S');
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

10
board/toradex/colibri_t20/colibri_t20.c
View file

@ -70,16 +70,6 @@ int arch_misc_init(void)
return 0;
}
int checkboard(void)
{
printf("Model: Toradex Colibri T20 %dMB V%s\n",
(gd->ram_size == 0x10000000) ? 256 : 512,
(get_nand_dev_by_index(0)->erasesize >> 10 == 512) ?
((gd->ram_size == 0x10000000) ? "1.1B" : "1.1C") : "1.2A");
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

7
board/toradex/colibri_t30/colibri_t30.c
View file

@ -28,13 +28,6 @@ int arch_misc_init(void)
return 0;
}
int checkboard(void)
{
puts("Model: Toradex Colibri T30 1GB\n");
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

10
board/toradex/colibri_vf/colibri_vf.c
View file

@ -366,16 +366,6 @@ int board_init(void)
return 0;
}
int checkboard(void)
{
if (is_colibri_vf61())
puts("Model: Toradex Colibri VF61\n");
else
puts("Model: Toradex Colibri VF50\n");
return tdx_checkboard();
}
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{

9
board/toradex/common/tdx-common.c
View file

@ -96,7 +96,12 @@ static const char *get_board_assembly(u16 ver_assembly)
return ver_name;
}
int tdx_checkboard(void)
__weak int print_bootinfo(void)
{
return 0;
}
int checkboard(void)
{
unsigned char ethaddr[6];
@ -144,6 +149,8 @@ int tdx_checkboard(void)
#endif
}
print_bootinfo();
/*
* Check if environment contains a valid MAC address,
* set the one from config block if not

1
board/toradex/common/tdx-common.h
View file

@ -11,6 +11,5 @@
int ft_common_board_setup(void *blob, struct bd_info *bd);
u32 get_board_revision(void);
int tdx_checkboard(void);
#endif /* _TDX_COMMON_H */