meta-digi-arm: add kernel parameter for single boot logo

Number of bootup logos is now configured using fbcon=logo-count parameter,
so use it instead of our deprecated custom code in the kernel.

For backwards compatibility, we add this parameter in the u-boot boot
script for all platforms but the ccimx93, where this is directly handled
by u-boot (v2022.04).

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-01-23 15:38:40 +01:00
parent 38ff495f5b
commit aab5eda5c2
9 changed files with 8 additions and 12 deletions

View File

@ -73,7 +73,7 @@ else
fi
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -101,7 +101,7 @@ else
fi
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -70,7 +70,7 @@ else
fi
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux nand ${mtdbootpart}

View File

@ -70,7 +70,7 @@ else
fi
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux nand ${mtdbootpart}

View File

@ -81,7 +81,7 @@ if test -n "${module_ram}"; then
fi
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -90,7 +90,7 @@ if test "${board_version}" -lt "3"; then
setenv overlays _ov_board_v1-v2_ccimx8mn-dvk.dtbo,${overlays}
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -93,7 +93,7 @@ if test "${soc_type}" = "imx8qxp"; then
setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays}
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -98,7 +98,7 @@ if test "${board_version}" -le "3"; then
setenv overlays _ov_board_v1-v3_ccimx8x-sbc-pro.dtbo,${overlays}
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}

View File

@ -51,7 +51,6 @@ fi
# Back up environment variables
setenv ORIG_overlays ${overlays}
setenv ORIG_extra_bootargs ${extra_bootargs}
#
# Determine overlays to apply depending on the hardware capabilities
@ -70,7 +69,6 @@ if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
setenv overlays _ov_som_wifi_ccimx93.dtbo,${overlays}
fi
setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs}
dboot linux mmc ${mmcbootdev}:${mmcpart}
#
@ -80,5 +78,3 @@ dboot linux mmc ${mmcbootdev}:${mmcpart}
#
setenv overlays ${ORIG_overlays}
setenv ORIG_overlays
setenv extra_bootargs ${ORIG_extra_bootargs}
setenv ORIG_extra_bootargs