Skip to content

Commit f4c346e

Browse files
authored
Revert "Move support of nanopc t6 & lts from edge to current (#7476)"
This reverts commit 378c64a.
1 parent a70b864 commit f4c346e

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

config/boards/nanopct6-lts.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ BOARD_NAME="NanoPC T6 LTS"
55
BOARDFAMILY="rockchip-rk3588"
66
BOARD_MAINTAINER="SuperKali Tonymac32"
77
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
8-
KERNEL_TARGET="current,vendor"
8+
KERNEL_TARGET="edge,current,vendor"
9+
KERNEL_TEST_TARGET="vendor,current"

config/boards/nanopct6.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
44
BOARD_MAINTAINER="SuperKali Tonymac32"
55
BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
66
BOOT_SOC="rk3588"
7-
KERNEL_TARGET="current,vendor"
7+
KERNEL_TARGET="edge,current,vendor"
8+
KERNEL_TEST_TARGET="vendor,current"
89
FULL_DESKTOP="yes"
910
BOOT_LOGO="desktop"
1011
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
@@ -28,7 +29,7 @@ function post_family_tweaks__nanopct6_naming_audios() {
2829
}
2930

3031
# Mainline u-boot
31-
function post_family_config_branch_current__nanopct6_use_mainline_uboot() {
32+
function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
3233
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
3334

3435
declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"

0 commit comments

Comments
 (0)