Skip to content

Commit

Permalink
Move support of nanopc t6 & lts from edge to current
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperKali committed Nov 14, 2024
1 parent 6d8b845 commit 364f22d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions config/boards/nanopct6-lts.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ BOARD_NAME="NanoPC T6 LTS"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="SuperKali Tonymac32"
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
KERNEL_TARGET="edge,current,vendor"
KERNEL_TEST_TARGET="vendor,current"
KERNEL_TARGET="current,vendor"
5 changes: 2 additions & 3 deletions config/boards/nanopct6.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="SuperKali Tonymac32"
BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="edge,current,vendor"
KERNEL_TEST_TARGET="vendor,current"
KERNEL_TARGET="current,vendor"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
Expand All @@ -29,7 +28,7 @@ function post_family_tweaks__nanopct6_naming_audios() {
}

# Mainline u-boot
function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
function post_family_config_branch_current__nanopct6_use_mainline_uboot() {
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
Expand Down

0 comments on commit 364f22d

Please sign in to comment.