Skip to content
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

Jump to bottom

Revert "Move support of nanopc t6 & lts from edge to current" #7481

Merged
merged 1 commit into from
Nov 17, 2024
Merged

Revert "Move support of nanopc t6 & lts from edge to current" #7481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion config/boards/nanopct6-lts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ 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="current,vendor"
KERNEL_TARGET="edge,current,vendor"
KERNEL_TEST_TARGET="vendor,current"
5 changes: 3 additions & 2 deletions config/boards/nanopct6.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ 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="current,vendor"
KERNEL_TARGET="edge,current,vendor"
KERNEL_TEST_TARGET="vendor,current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
Expand All @@ -28,7 +29,7 @@ function post_family_tweaks__nanopct6_naming_audios() {
}

# Mainline u-boot
function post_family_config_branch_current__nanopct6_use_mainline_uboot() {
function post_family_config_branch_edge__nanopct6_use_mainline_uboot() {
rpardini marked this conversation as resolved.
Show resolved Hide resolved
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

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