Skip to content

Commit

Permalink
Adjust parameters for several boards
Browse files Browse the repository at this point in the history
  • Loading branch information
igorpecovnik committed Aug 19, 2024
1 parent d0305be commit f8c5736
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion config/boards/armsom-sige7.csc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="Z-Keven"
BOOTCONFIG="armsom-sige7-rk3588_defconfig"
KERNEL_TARGET="vendor,edge,collabora"
KERNEL_TARGET="vendor,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/bananapi.csc → config/boards/bananapi.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Allwinner A20 dual core 1Gb RAM SoC 1xSATA GBE
BOARD_NAME="Banana Pi"
BOARDFAMILY="sun7i"
BOARD_MAINTAINER="DylanHP"
BOARD_MAINTAINER="janprunk"
BOOTCONFIG="Bananapi_defconfig"
KERNEL_TARGET="legacy,current,edge"

Expand Down
3 changes: 2 additions & 1 deletion config/boards/bananapim7.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ BOARD_MAINTAINER="amazingfate"
BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
# Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
BOARD_MAINTAINER="Z-Keven"
KERNEL_TARGET="vendor,edge,collabora"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current,edge"
BOARDFAMILY="rockchip-rk3588"
2 changes: 1 addition & 1 deletion config/boards/clearfogpro.csc
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ BOARD_MAINTAINER=""
BOOTCONFIG="clearfog_defconfig"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
KERNEL_TEST_TARGET="current,edge"
2 changes: 1 addition & 1 deletion config/boards/indiedroid-nova.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
declare -g BOARDFAMILY="rockchip-rk3588"
declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
declare -g BOOT_SOC="rk3588"
declare -g KERNEL_TARGET="vendor,collabora,edge"
declare -g KERNEL_TARGET="vendor,current,edge"
declare -g FULL_DESKTOP="yes"
declare -g BOOT_LOGO="desktop"
declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
Expand Down
6 changes: 3 additions & 3 deletions config/boards/khadas-edge2.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
declare -g BOARD_NAME="Khadas Edge2"
declare -g BOARDFAMILY="rockchip-rk3588"
declare -g BOARD_MAINTAINER="igorpecovnik"
declare -g BOARD_MAINTAINER="efectn"
declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
declare -g KERNEL_TARGET="vendor,edge"
declare -g KERNEL_TEST_TARGET="vendor"
declare -g KERNEL_TARGET="vendor,current,edge"
declare -g KERNEL_TEST_TARGET="vendor,current"
declare -g IMAGE_PARTITION_TABLE="gpt"
declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board

Expand Down
2 changes: 1 addition & 1 deletion config/boards/nanopc-cm3588-nas.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER=""
BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor,current,edge,collabora"
KERNEL_TARGET="vendor,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
IMAGE_PARTITION_TABLE="gpt"
Expand Down
4 changes: 2 additions & 2 deletions config/boards/nanopct6.csc → config/boards/nanopct6.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="Tonymac32"
BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor,current,edge,collabora"
KERNEL_TEST_TARGET="vendor,edge"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/nanopi-r4s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER="Manouchehri"
BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
KERNEL_TEST_TARGET="current,edge"
DEFAULT_CONSOLE="serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
HAS_VIDEO_OUTPUT="no"
Expand Down
4 changes: 2 additions & 2 deletions config/boards/nanopi-r6s.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="efectn"
BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor,edge"
KERNEL_TEST_TARGET="vendor"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
IMAGE_PARTITION_TABLE="gpt"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
BOARD_NAME="NanoPi M4V2"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER=""
BOARD_MAINTAINER="igorpecovnik"
BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion config/boards/odroidxu4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ BOOTCONFIG="odroid-xu4_defconfig"
SERIALCON="ttySAC2"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
KERNEL_TEST_TARGET="current"
KERNEL_TEST_TARGET="current,edge"
4 changes: 2 additions & 2 deletions config/boards/orangepi5-plus.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="efectn"
BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor,edge"
KERNEL_TEST_TARGET="vendor"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
Expand Down
4 changes: 2 additions & 2 deletions config/boards/orangepi5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ BOARD_MAINTAINER="efectn"
BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor,edge"
KERNEL_TEST_TARGET="vendor"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/orangepioneplus.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ BOARDFAMILY="sun50iw6"
BOARD_MAINTAINER=""
BOOTCONFIG="orangepi_one_plus_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TEST_TARGET="current"
KERNEL_TEST_TARGET="current,edge"
CRUSTCONFIG="orangepi_3_lts_defconfig"
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion config/boards/rock-5a.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ BOARD_NAME="Rock 5A"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="amazingfate"
BOOTCONFIG="rock-5a-rk3588s_defconfig"
KERNEL_TARGET="vendor,edge,collabora"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb"
Expand Down
4 changes: 2 additions & 2 deletions config/boards/rock-5b.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ BOARD_NAME="Rock 5B"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="amazingfate linhz0hz"
BOOTCONFIG="rock-5b-rk3588_defconfig"
KERNEL_TARGET="vendor,edge,collabora"
KERNEL_TEST_TARGET="vendor"
KERNEL_TARGET="vendor,current,edge"
KERNEL_TEST_TARGET="vendor,current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/rockpi-4b.csc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64"
BOARD_MAINTAINER=""
BOOTCONFIG="rock-pi-4-rk3399_defconfig"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
KERNEL_TEST_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
Expand Down
File renamed without changes.

0 comments on commit f8c5736

Please sign in to comment.