diff --git a/config/boards/bananapir2pro.csc b/config/boards/bananapir2pro.csc index 8c0835e33..d01404ddc 100644 --- a/config/boards/bananapir2pro.csc +++ b/config/boards/bananapir2pro.csc @@ -3,7 +3,7 @@ BOARD_NAME="Banana Pi R2 Pro" BOARDFAMILY="media" BOARD_MAINTAINER="" BOOTCONFIG="bpi-r2pro-rk3568_defconfig" -KERNEL_TARGET="legacy,current,edge" +KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-bpi-r2-pro.dtb" diff --git a/config/boards/station-m2.conf b/config/boards/station-m2.conf index 4e7426d83..11f82d04d 100644 --- a/config/boards/station-m2.conf +++ b/config/boards/station-m2.conf @@ -3,7 +3,7 @@ BOARD_NAME="Station M2" BOARDFAMILY="media" BOARD_MAINTAINER="150balbes" BOOTCONFIG="firefly-m2-rk3568_defconfig" -KERNEL_TARGET="legacy,current,edge" +KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb" diff --git a/config/boards/station-p2.conf b/config/boards/station-p2.conf index 3557ed339..8d6ec9162 100644 --- a/config/boards/station-p2.conf +++ b/config/boards/station-p2.conf @@ -3,7 +3,7 @@ BOARD_NAME="Station P2" BOARDFAMILY="media" BOARD_MAINTAINER="150balbes" BOOTCONFIG="firefly-p2-rk3568_defconfig" -KERNEL_TARGET="legacy,current,edge" +KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-firefly-roc-pc.dtb" diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index 7618e582c..0ca665b1b 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -36,23 +36,12 @@ case $BRANCH in legacy) KERNELDIR='linux-rockchip64' - if [[ $BOARD == station-p2 || $BOARD == station-m2 || $BOARD == bananapir2pro ]]; then - KERNELSOURCE='https://github.com/150balbes/rockchip-kernel' - declare -g KERNEL_MAJOR_MINOR="4.19" # Major and minor versions of this kernel. - KERNELBRANCH='branch:kernel-4.19' - KERNELPATCHDIR='station-p2-'$BRANCH - LINUXFAMILY=station-p2 - LINUXCONFIG='linux-station-p2-'$BRANCH - EXTRAWIFI="no" - WIREGUARD="no" - else - KERNELSOURCE='https://github.com/150balbes/rockchip-kernel' - declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. - KERNELBRANCH='branch:kernel-5.10' - LINUXFAMILY=media - LINUXCONFIG='linux-media-'$BRANCH - KERNELPATCHDIR='media-'$BRANCH - fi + KERNELSOURCE='https://github.com/150balbes/rockchip-kernel' + declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel. + KERNELBRANCH='branch:kernel-5.10' + LINUXFAMILY=media + LINUXCONFIG='linux-media-'$BRANCH + KERNELPATCHDIR='media-'$BRANCH ;; current)