Skip to content

armbian-kernel: remove inconsistent conditionals #8820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+363 −451
Open

armbian-kernel: remove inconsistent conditionals #8820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2a1d65
armbian-kernel: fix inconsistency in the ZRAM_BACKEND stuff; add a rant
rpardini Oct 25, 2025
8138fde
armbian-kernel: shfmt + trim whitespace; no changes
rpardini Oct 25, 2025
d7cf649
armbian-kernel: BTRFS_FS & EXT4_FS as built-in, not modules
rpardini Oct 26, 2025
ee40a24
armbian-kernel: remove inconsistent conditionals
rpardini Oct 26, 2025
7f02bd9
armbian-kernel: rework everything into arrays + `armbian_kernel_confi…
rpardini Oct 26, 2025
c15097b
armbian-kernel: standardize on opts_y/opts_n/opts_m + opts_val arrays
rpardini Oct 26, 2025
6d43017
armbian-kernel: drop CONFIG_ prefix, fix comments
rpardini Oct 26, 2025
7a8802a
armbian-kernel: remove forced EXT4/BTRFS as builtins (let each kernel…
rpardini Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions config/sources/families/include/meson64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ esac
# Use custom vendor driver for wireless rtl88x2cs
# See https://github.com/armbian/build/pull/6227
function custom_kernel_config__enable_rtl88x2cs_driver() {
kernel_config_modifying_hashes+=("CONFIG_RTL8822CS=m")
if [[ -f .config ]]; then
display_alert "Enabling rtl88x2cs driver in kernel config" "armbian-kernel" "wrn"
kernel_config_set_m CONFIG_RTL8822CS
fi
opts_m+=("CONFIG_RTL8822CS")
}

# this helper function includes postprocess for s400 and its variants.
Expand Down
14 changes: 5 additions & 9 deletions config/sources/families/meson-s4t7.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ function build_custom_uboot__meson_s4t7_build_custom_uboot() {
}

function custom_kernel_config__add_khadas_common_drivers() {
display_alert "Enabling kernel config" "DEBUG_KERNEL=y, EXPERT=y, EMBEDDED=y to fix khadas_common_drivers compilation" "info"
opts_y+=("DEBUG_KERNEL") # Unfortunately, debug kernel has to be enabled to make khadas_common_drivers compile
opts_y+=("EMBEDDED")
opts_y+=("EXPERT")

# viraniac: The kernel config hooks are always called twice, once without being in kernel directory and once with current directory being the kernel work directory.
if [[ ! -f .config ]]; then
display_alert "$BOARD" "Fetching khadas common drivers git info" "info"
Expand All @@ -136,15 +141,6 @@ function custom_kernel_config__add_khadas_common_drivers() {

# Hack to ensure that we will recreate kernel if common_drivers source changes
kernel_config_modifying_hashes+=("khadas_common_drivers=${GIT_INFO_COMMON_DRIVERS[SHA1]}")

# viraniac: kernel_config_modifying_hashes is only needed during first call of this function to calculate kernel artifact version string. It serves no purpose whatsoever during second call.
kernel_config_modifying_hashes+=("CONFIG_DEBUG_KERNEL=y" "CONFIG_EXPERT=y" "CONFIG_EMBEDDED=y")
else
# Unfortunately, debug kernel has to be enabled to make khadas_common_drivers compile
display_alert "Enabling kernel config" "DEBUG_KERNEL=y, EXPERT=y, EMBEDDED=y to fix khadas_common_drivers compilation" "info"
kernel_config_set_y DEBUG_KERNEL
kernel_config_set_y EXPERT
kernel_config_set_y EMBEDDED
fi
}

Expand Down
Loading