From ac599c557af1f9739ed23bdeef3f768be01bb9ff Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 27 Dec 2023 19:29:07 +0100 Subject: [PATCH] lib/family config: remove resquices of `KERNELDIR` which is completely unused for a long time - also `MAINLINE_KERNEL_DIR` not needed then --- config/sources/families/imx7d.conf | 2 -- config/sources/families/k3.conf | 1 - config/sources/families/media.conf | 2 -- config/sources/families/odroidxu4.conf | 2 -- config/sources/families/rk35xx.conf | 1 - config/sources/families/rockchip-rk3588.conf | 1 - config/sources/families/rockpis.conf | 1 - config/sources/families/s5p6818.conf | 1 - config/sources/families/sun50iw9.conf | 1 - config/sources/families/zynq.conf | 1 - lib/functions/configuration/main-config.sh | 1 - 11 files changed, 14 deletions(-) diff --git a/config/sources/families/imx7d.conf b/config/sources/families/imx7d.conf index 19d356de7c..8ca82cb536 100644 --- a/config/sources/families/imx7d.conf +++ b/config/sources/families/imx7d.conf @@ -21,7 +21,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/nxp-imx/linux-imx.git' declare -g KERNEL_MAJOR_MINOR="4.14" # Major and minor versions of this kernel. KERNELBRANCH='branch:imx_4.14.98_2.0.0_ga' - KERNELDIR='linux-imx7' BOOTBRANCH='branch:imx_v2018.03_4.14.98_2.0.0_ga' BOOTPATCHDIR="legacy" ;; @@ -29,7 +28,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/nxp-imx/linux-imx.git' declare -g KERNEL_MAJOR_MINOR="5.4" # Major and minor versions of this kernel. KERNELBRANCH='branch:imx_5.4.70_2.3.0' - KERNELDIR='linux-imx7-current' BOOTBRANCH='branch:imx_v2020.04_5.4.70_2.3.0' BOOTPATCHDIR="v2020.04" ;; diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index 7ddc948ba3..ec4a34ac19 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -24,7 +24,6 @@ case "${BRANCH}" in declare -g KERNELSOURCE="https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel" declare -g KERNEL_MAJOR_MINOR="6.1" declare -g KERNELBRANCH="branch:ti-linux-6.1.y" - declare -g KERNELDIR="linux-k3" ;; edge) diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index 349bf4e052..4eb8b96a3a 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -30,8 +30,6 @@ SKIP_BOOTSPLASH="yes" case $BRANCH in legacy) - KERNELDIR='linux-rockchip64' - KERNELSOURCE='https://github.com/150balbes/rockchip-kernel' declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. KERNELBRANCH='commit:9db2691ddfbdc7013d507df665f3e038eea7bf93' diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf index 01c6dd7bbb..505555413b 100644 --- a/config/sources/families/odroidxu4.conf +++ b/config/sources/families/odroidxu4.conf @@ -22,14 +22,12 @@ case $BRANCH in declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g KERNEL_SKIP_MAKEFILE_VERSION="yes" # Armbian patches change the version here, so no use having it in the version string. KERNELBRANCH='branch:odroidxu4-6.1.y' - KERNELDIR='linux-odroidxu4' KERNEL_DRIVERS_SKIP+=(driver_rtl8811CU_rtl8821C) # rtl8821 is already shipped with hardkernel's source ;; edge) declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. KERNELBRANCH='branch:linux-6.1.y' - KERNELDIR='linux-odroidxu4' ;; esac diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 049b931bc6..96849a475b 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -23,7 +23,6 @@ case $BRANCH in KERNELBRANCH='branch:rk-5.10-rkr6' declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. - KERNELDIR='linux-rockchip64' KERNELPATCHDIR='rk35xx-legacy' ;; diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 91facc8acb..f68cf88724 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -21,7 +21,6 @@ case $BRANCH in UBOOT_COMPILER="aarch64-linux-gnu-" UBOOT_USE_GCC='< 8.0' BOOTDIR='u-boot-rockchip64' - KERNELDIR='linux-rockchip64' KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo diff --git a/config/sources/families/rockpis.conf b/config/sources/families/rockpis.conf index 13539cea3c..a63b1f6204 100644 --- a/config/sources/families/rockpis.conf +++ b/config/sources/families/rockpis.conf @@ -44,7 +44,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/piter75/rockchip-kernel' declare -g KERNEL_MAJOR_MINOR="4.4" # Major and minor versions of this kernel. KERNELBRANCH='branch:rockpis-develop-4.4' - KERNELDIR='linux-rockchip64' unset IDBLOADER_BLOB ;; diff --git a/config/sources/families/s5p6818.conf b/config/sources/families/s5p6818.conf index 47c47f5b89..0e91269a83 100644 --- a/config/sources/families/s5p6818.conf +++ b/config/sources/families/s5p6818.conf @@ -20,7 +20,6 @@ case $BRANCH in KERNELSOURCE='https://github.com/armbian/linux' declare -g KERNEL_MAJOR_MINOR="4.14" # Major and minor versions of this kernel. See https://github.com/armbian/linux/blob/s5p6818/Makefile KERNELBRANCH='branch:s5p6818' - KERNELDIR='linux-mainline' ;; esac diff --git a/config/sources/families/sun50iw9.conf b/config/sources/families/sun50iw9.conf index fc6f7b3795..a24c02d2ff 100644 --- a/config/sources/families/sun50iw9.conf +++ b/config/sources/families/sun50iw9.conf @@ -22,7 +22,6 @@ case $BRANCH in declare -g KERNEL_MAJOR_MINOR="4.9" # Major and minor versions of this kernel. KERNELBRANCH="branch:orange-pi-4.9-sun50iw9" KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH} - KERNELDIR='linux-orangepi' INITRD_ARCH=arm ASOUND_STATE='asound.state.sun50iw9-legacy' diff --git a/config/sources/families/zynq.conf b/config/sources/families/zynq.conf index 153960c032..0b9a1e5abd 100644 --- a/config/sources/families/zynq.conf +++ b/config/sources/families/zynq.conf @@ -13,7 +13,6 @@ LINUXFAMILY=zynq KERNELSOURCE='https://github.com/Xilinx/linux-xlnx.git' declare -g KERNEL_MAJOR_MINOR="5.4" # Major and minor versions of this kernel. See https://github.com/Xilinx/linux-xlnx/blob/xilinx-v2020.2/Makefile KERNELBRANCH='tag:xilinx-v2020.2' -KERNELDIR='linux-xlnx' KERNELPATCHDIR='zynq-'$BRANCH BOOTSOURCE='https://github.com/Xilinx/u-boot-xlnx.git' diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index df837c43f0..efeafa8b2d 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -170,7 +170,6 @@ function do_main_configuration() { # Defaults... # @TODO: why? declare -g -r MAINLINE_UBOOT_DIR='u-boot' - declare -g -r MAINLINE_KERNEL_DIR='linux-mainline' # pre-calculate mirrors. important: this sets _SOURCE variants that might be used in common.conf to default things to mainline, but using mirror. # @TODO: setting them here allows family/board code (and hooks) to read them and embed them into configuration, which is bad: it might end up without the mirror.