enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove remnants of SKIP_BOOTSPLASH

Browse Source
This commit is contained in:
Gunjan Gupta 2024-01-17 03:40:33 +05:30
parent e7b2090c73
commit a57329d611
21 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/armsom-sige7.csc
View File

@ -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'

1
config/boards/armsom-w3.csc
View File

@ -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'

3
config/boards/fxblox-rk1.wip
View File

@ -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"
}
}

1
config/boards/hinlink-h88k.csc
View File

@ -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() {

1
config/boards/indiedroid-nova.csc
View File

@ -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'

3
config/boards/licheepi-4a.wip
View File

@ -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"

1
config/boards/nanopct6.wip
View File

@ -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

1
config/boards/nanopi-r6s.conf
View File

@ -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'

1
config/boards/orangepi5-plus.conf
View File

@ -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

1
config/boards/orangepi5.conf
View File

@ -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'

1
config/boards/rock-5-cmio.csc
View File

@ -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"

1
config/boards/rock-5a.wip
View File

@ -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() {

1
config/boards/rock-5b.conf
View File

@ -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

1
config/sources/families/bcm2711.conf
View File

@ -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

2
config/sources/families/include/meson_common.inc
View File

@ -19,8 +19,6 @@ CPUMIN=504000
CPUMAX=1632000
GOVERNOR=ondemand
SKIP_BOOTSPLASH="yes"
case $BOARD in
odroidc1)

1
config/sources/families/include/uefi_common.inc
View File

@ -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

2
config/sources/families/k3.conf
View File

@ -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)

2
config/sources/families/media.conf
View File

@ -25,8 +25,6 @@ else
BOOTPATCHDIR="u-boot-media"
fi
SKIP_BOOTSPLASH="yes"
case $BRANCH in
legacy)

5
config/sources/families/rk35xx.conf
View File

@ -27,11 +27,6 @@ case $BRANCH in
;;
current | edge)
SKIP_BOOTSPLASH="yes"
;;
esac
prepare_boot_configuration

2
config/sources/families/rockchip-rk3588.conf
View File

@ -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.

2
lib/functions/configuration/main-config.sh
View File

@ -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