From a57329d61160fe8ae80e34394377001c54fc672e Mon Sep 17 00:00:00 2001 From: Gunjan Gupta Date: Wed, 17 Jan 2024 03:40:33 +0530 Subject: [PATCH] remove remnants of SKIP_BOOTSPLASH --- config/boards/armsom-sige7.csc | 1 - config/boards/armsom-w3.csc | 1 - config/boards/fxblox-rk1.wip | 3 +-- config/boards/hinlink-h88k.csc | 1 - config/boards/indiedroid-nova.csc | 1 - config/boards/licheepi-4a.wip | 3 +-- config/boards/nanopct6.wip | 1 - config/boards/nanopi-r6s.conf | 1 - config/boards/orangepi5-plus.conf | 1 - config/boards/orangepi5.conf | 1 - config/boards/rock-5-cmio.csc | 1 - config/boards/rock-5a.wip | 1 - config/boards/rock-5b.conf | 1 - config/sources/families/bcm2711.conf | 1 - config/sources/families/include/meson_common.inc | 2 -- config/sources/families/include/uefi_common.inc | 1 - config/sources/families/k3.conf | 2 -- config/sources/families/media.conf | 2 -- config/sources/families/rk35xx.conf | 5 ----- config/sources/families/rockchip-rk3588.conf | 2 -- lib/functions/configuration/main-config.sh | 2 -- 21 files changed, 2 insertions(+), 32 deletions(-) diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc index 73d41500ea..0a187b3f98 100755 --- a/config/boards/armsom-sige7.csc +++ b/config/boards/armsom-sige7.csc @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="ext4" DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin' BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' diff --git a/config/boards/armsom-w3.csc b/config/boards/armsom-w3.csc index fde93229d7..9de0de6539 100644 --- a/config/boards/armsom-w3.csc +++ b/config/boards/armsom-w3.csc @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="ext4" DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin' BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' diff --git a/config/boards/fxblox-rk1.wip b/config/boards/fxblox-rk1.wip index 9d2cd83c67..e0555ec110 100644 --- a/config/boards/fxblox-rk1.wip +++ b/config/boards/fxblox-rk1.wip @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="fat" DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin' BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' @@ -57,4 +56,4 @@ function post_family_config__fxblox-rk1_use_vendor_uboot() { BOOTSOURCE='https://github.com/functionland/u-boot.git' BOOTBRANCH='branch:next-dev' BOOTPATCHDIR="legacy" -} \ No newline at end of file +} diff --git a/config/boards/hinlink-h88k.csc b/config/boards/hinlink-h88k.csc index c0cfe7c8d3..5efc41bbea 100644 --- a/config/boards/hinlink-h88k.csc +++ b/config/boards/hinlink-h88k.csc @@ -10,7 +10,6 @@ BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3588-hinlink-h88k.dtb" BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes declare -g UEFI_EDK2_BOARD_ID="h88k" # This _only_ used for uefi-edk2-rk3588 extension function post_family_tweaks__hinlink_h88k_naming_audios() { diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc index 3778654e34..dee9e2227e 100644 --- a/config/boards/indiedroid-nova.csc +++ b/config/boards/indiedroid-nova.csc @@ -11,7 +11,6 @@ declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb" declare -g BOOT_SCENARIO="spl-blobs" declare -g BOOT_SUPPORT_SPI="no" declare -g IMAGE_PARTITION_TABLE="gpt" -declare -g SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes declare -g BOOTFS_TYPE="fat" declare -g SRC_EXTLINUX="no" # going back to standard uboot for now declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' diff --git a/config/boards/licheepi-4a.wip b/config/boards/licheepi-4a.wip index 108b61b3dd..2a823d7067 100644 --- a/config/boards/licheepi-4a.wip +++ b/config/boards/licheepi-4a.wip @@ -7,7 +7,6 @@ BOOT_FDT_FILE="thead/th1520-lichee-pi-4a.dtb" SRC_EXTLINUX="yes" SRC_CMDLINE="console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth=\$ethaddr tsched=0 rootrwoptions=rw,noatime rootrwreset=yes" BOOTCONFIG="light_lpi4a_defconfig" -SKIP_BOOTSPLASH="yes" BOOTFS_TYPE="ext4" BOOTSIZE="512" @@ -16,7 +15,7 @@ function post_family_tweaks__licheepi4a() { cp -v "$SRC/packages/blobs/riscv64/thead/light_aon_fpga.bin" "$SDCARD/boot/light_aon_fpga.bin" cp -v "$SRC/packages/blobs/riscv64/thead/light_c906_audio.bin" "$SDCARD/boot/light_c906_audio.bin" cp -v "$SRC/packages/blobs/riscv64/thead/fw_dynamic.bin" "$SDCARD/boot/fw_dynamic.bin" - + display_alert "Applying bt blobs" cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk-hciattach.service" "$SDCARD/etc/systemd/system/rtk-hciattach.service" cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk_hciattach" "$SDCARD/usr/local/bin/rtk_hciattach" diff --git a/config/boards/nanopct6.wip b/config/boards/nanopct6.wip index 53cdcf53ce..50ea81fcae 100644 --- a/config/boards/nanopct6.wip +++ b/config/boards/nanopct6.wip @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="fat" declare -g UEFI_EDK2_BOARD_ID="nanopc-t6" # This _only_ used for uefi-edk2-rk3588 extension diff --git a/config/boards/nanopi-r6s.conf b/config/boards/nanopi-r6s.conf index 1e5025cc88..4bfc6f04cf 100644 --- a/config/boards/nanopi-r6s.conf +++ b/config/boards/nanopi-r6s.conf @@ -10,7 +10,6 @@ BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6s.dtb" BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="fat" DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin' BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf index 4bc02124c2..bd8ceb4c87 100644 --- a/config/boards/orangepi5-plus.conf +++ b/config/boards/orangepi5-plus.conf @@ -13,7 +13,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="ext4" declare -g UEFI_EDK2_BOARD_ID="orangepi-5plus" # This _only_ used for uefi-edk2-rk3588 extension diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf index f203655221..5f90823da1 100644 --- a/config/boards/orangepi5.conf +++ b/config/boards/orangepi5.conf @@ -14,7 +14,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="fat" DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin' BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' diff --git a/config/boards/rock-5-cmio.csc b/config/boards/rock-5-cmio.csc index 6b4a6fe2af..aacbbf8fe5 100644 --- a/config/boards/rock-5-cmio.csc +++ b/config/boards/rock-5-cmio.csc @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes function post_family_tweaks__rock5cmio_naming_audios() { display_alert "$BOARD" "Renaming Rock CM5 audios" "info" diff --git a/config/boards/rock-5a.wip b/config/boards/rock-5a.wip index 5f39ef361c..3cb63be522 100644 --- a/config/boards/rock-5a.wip +++ b/config/boards/rock-5a.wip @@ -12,7 +12,6 @@ BOOT_SOC="rk3588" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes declare -g UEFI_EDK2_BOARD_ID="rock-5a" # This _only_ used for uefi-edk2-rk3588 extension function post_family_tweaks__rock5a_naming_audios() { diff --git a/config/boards/rock-5b.conf b/config/boards/rock-5b.conf index ccb8726ea3..a67b1e036c 100644 --- a/config/boards/rock-5b.conf +++ b/config/boards/rock-5b.conf @@ -12,7 +12,6 @@ BOOT_SCENARIO="spl-blobs" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" -SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes BOOTFS_TYPE="ext4" declare -g UEFI_EDK2_BOARD_ID="rock-5b" # This _only_ used for uefi-edk2-rk3588 extension diff --git a/config/sources/families/bcm2711.conf b/config/sources/families/bcm2711.conf index b6ae435dab..e33c25f6cd 100644 --- a/config/sources/families/bcm2711.conf +++ b/config/sources/families/bcm2711.conf @@ -9,7 +9,6 @@ declare -g LINUXFAMILY=bcm2711 declare -g ARCH=arm64 declare -g UEFI_FS_LABEL="RPICFG" # Windows/Mac users will see this if they mount the SD card. Configurable, but should be uppercase always -declare -g SKIP_BOOTSPLASH="yes" # video is init-ed before us declare -g CPUMIN=500000 declare -g CPUMAX=2900000 declare -g GOVERNOR=ondemand diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index d367566c59..5d871e1900 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -19,8 +19,6 @@ CPUMIN=504000 CPUMAX=1632000 GOVERNOR=ondemand -SKIP_BOOTSPLASH="yes" - case $BOARD in odroidc1) diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc index eda31b5b9c..4610ae7b25 100644 --- a/config/sources/families/include/uefi_common.inc +++ b/config/sources/families/include/uefi_common.inc @@ -7,7 +7,6 @@ # https://github.com/armbian/build/ # declare -g SERIALCON="tty1" # Cant reasonably expect UEFI stuff to have a serial console. Customize if otherwise. -declare -g SKIP_BOOTSPLASH="yes" # No splash. declare -g UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Default 3-seconds timeout for GRUB menu. declare -g BOARD_FIRMWARE_INSTALL="-full" # Install full firmware for UEFI boards declare -g DISTRO_GENERIC_KERNEL=no diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index ec4a34ac19..c5db441042 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -15,8 +15,6 @@ declare -g ATFBRANCH="tag:v2.10.0" declare -g BOOTBRANCH="tag:v2023.10-rc3" declare -g BOOTSCRIPT="boot-k3.cmd:uEnv.txt" -declare -g SKIP_BOOTSPLASH="yes" - case "${BRANCH}" in current) diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index e7e4cc927d..90ff319922 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -25,8 +25,6 @@ else BOOTPATCHDIR="u-boot-media" fi -SKIP_BOOTSPLASH="yes" - case $BRANCH in legacy) diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 96849a475b..81d2cfd43f 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -27,11 +27,6 @@ case $BRANCH in ;; - current | edge) - SKIP_BOOTSPLASH="yes" - - ;; - esac prepare_boot_configuration diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index c8cb51047d..38b4a52f39 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -30,7 +30,6 @@ case $BRANCH in ;; edge) - SKIP_BOOTSPLASH="yes" LINUXFAMILY=rockchip-rk3588 LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel. @@ -39,7 +38,6 @@ case $BRANCH in collabora) # Collabora's rk3588, where the action is these days - SKIP_BOOTSPLASH="yes" LINUXFAMILY=rockchip-rk3588 LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel. diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 65138a1469..12d0e31e01 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -239,7 +239,6 @@ function do_main_configuration() { ATF_COMPILE=yes # @TODO: move to armhf/arm64 [[ -z $WIREGUARD ]] && WIREGUARD="yes" [[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes" - [[ -z $SKIP_BOOTSPLASH ]] && SKIP_BOOTSPLASH="no" [[ -z $PLYMOUTH ]] && PLYMOUTH="yes" [[ -z $AUFS ]] && AUFS="yes" [[ -z $IMAGE_PARTITION_TABLE ]] && IMAGE_PARTITION_TABLE="msdos" @@ -254,7 +253,6 @@ function do_main_configuration() { source_family_config_and_arch if [[ "$HAS_VIDEO_OUTPUT" == "no" ]]; then - SKIP_BOOTSPLASH="yes" PLYMOUTH="no" [[ $BUILD_DESKTOP != "no" ]] && exit_with_error "HAS_VIDEO_OUTPUT is set to no. So we shouldn't build desktop environment" fi