Revert bootloader for R4S and Neo3, adjust names (#4510)

* Enable CONFIG_BPF_SYSCALL which might improve Docker support

* Adjust board names

* Move neo3 to previous bootloader too

* Disable 3d support on rock64
This commit is contained in:
Igor Pečovnik
2022-11-29 19:47:37 +01:00
committed by GitHub
parent 63a09be31d
commit 0428c18033
7 changed files with 11 additions and 7 deletions

View File

@@ -6,3 +6,5 @@ KERNEL_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"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

View File

@@ -9,3 +9,5 @@ MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
SERIALCON="ttyS2:1500000,ttyGS0"
HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-neo3-rev02.dtb"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

View File

@@ -1,5 +1,5 @@
# Rockchip RK3328 quad core 1GB 2 x GBE USB2 SPI
BOARD_NAME="OPi R1 Plus LTS"
BOARD_NAME="Orange Pi R1 Plus LTS"
BOARDFAMILY="rockchip64"
BOOTCONFIG="orangepi_r1_plus_lts_rk3328_defconfig"
KERNEL_TARGET="current,edge"

View File

@@ -1,5 +1,5 @@
# Rockchip RK3288 quad core 2GB RAM SoC GBE WiFi eMMC
BOARD_NAME="Tinkerboard"
BOARD_NAME="Tinker Board"
BOARDFAMILY="rockchip"
BOOTCONFIG="tinker-rk3288_defconfig"
MODULES_LEGACY="hci_uart rfcomm hidp 8723bs"

View File

@@ -95,7 +95,7 @@ CONFIG_HAVE_EBPF_JIT=y
#
# BPF subsystem
#
# CONFIG_BPF_SYSCALL is not set
CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set
# end of BPF subsystem

View File

@@ -96,7 +96,7 @@ CONFIG_HAVE_EBPF_JIT=y
#
# BPF subsystem
#
# CONFIG_BPF_SYSCALL is not set
CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set
# end of BPF subsystem

View File

@@ -604,9 +604,9 @@ rock64 current bullseye cli s
rock64 current jammy minimal stable yes
rock64 current bullseye minimal stable yes
#
rock64 current jammy desktop stable yes gnome config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
rock64 current jammy desktop stable yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
rock64 current jammy desktop stable adv xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
rock64 current jammy desktop stable yes gnome config_base browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
rock64 current jammy desktop stable yes cinnamon config_base browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
rock64 current jammy desktop stable adv xfce config_base browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
# Rock-3a