From 0428c18033b6a7038ee33ea702026367eedbc075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 29 Nov 2022 19:47:37 +0100 Subject: [PATCH] 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 --- config/boards/nanopi-r4s.conf | 2 ++ config/boards/nanopineo3.conf | 2 ++ config/boards/orangepi-r1plus-lts.conf | 2 +- config/boards/tinkerboard.conf | 2 +- config/kernel/linux-rockchip-current.config | 2 +- config/kernel/linux-rockchip-edge.config | 2 +- config/targets.conf | 6 +++--- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config/boards/nanopi-r4s.conf b/config/boards/nanopi-r4s.conf index f7e8df798..01ae3b73f 100644 --- a/config/boards/nanopi-r4s.conf +++ b/config/boards/nanopi-r4s.conf @@ -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" diff --git a/config/boards/nanopineo3.conf b/config/boards/nanopineo3.conf index 677235da1..a7efd6321 100644 --- a/config/boards/nanopineo3.conf +++ b/config/boards/nanopineo3.conf @@ -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" diff --git a/config/boards/orangepi-r1plus-lts.conf b/config/boards/orangepi-r1plus-lts.conf index 9e72183f0..9967d8b0a 100644 --- a/config/boards/orangepi-r1plus-lts.conf +++ b/config/boards/orangepi-r1plus-lts.conf @@ -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" diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf index fb53b67d0..092a55803 100644 --- a/config/boards/tinkerboard.conf +++ b/config/boards/tinkerboard.conf @@ -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" diff --git a/config/kernel/linux-rockchip-current.config b/config/kernel/linux-rockchip-current.config index 6bfb48838..c4b7cd93f 100644 --- a/config/kernel/linux-rockchip-current.config +++ b/config/kernel/linux-rockchip-current.config @@ -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 diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config index e6d659ca2..e04918f73 100644 --- a/config/kernel/linux-rockchip-edge.config +++ b/config/kernel/linux-rockchip-edge.config @@ -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 diff --git a/config/targets.conf b/config/targets.conf index 31a055b20..1302ace1f 100644 --- a/config/targets.conf +++ b/config/targets.conf @@ -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