From aab5eda5c2d1d8c1ddc430f26c9871da96263318 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 23 Jan 2023 15:38:40 +0100 Subject: [PATCH] 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 --- .../recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt | 4 ---- 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 063af73d2..099380233 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt index 5a9fde245..a0a1cc0d8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt index aeb249064..fb8232879 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt index da9bf0a57..dcb054d4b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt index 980500b91..e7d3c933c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index 73cfc63e8..3b7011212 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt index 33992d7c9..f05730df6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt index 840d7a098..86188c350 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt @@ -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} diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt index 6f35ee776..67f0811fd 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt @@ -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