From 599bf33902e5bbcc14ef4fa838a8c5b71dc6738d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Wed, 26 Oct 2022 23:24:31 +0200 Subject: [PATCH] Small adjustment to beta build targets, typo (#4354) * Adjust board names * Cleanup beta builds --- config/boards/orangepi4-lts.conf | 2 +- config/boards/orangepi4.conf | 2 +- config/targets-cli-beta.conf | 12 +++--------- config/targets-desktop-beta.conf | 13 ------------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/config/boards/orangepi4-lts.conf b/config/boards/orangepi4-lts.conf index 49ed3d5f40..937c793f80 100644 --- a/config/boards/orangepi4-lts.conf +++ b/config/boards/orangepi4-lts.conf @@ -1,7 +1,7 @@ # Rockchip RK3399 hexa core 3/4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT # Uses the same u-boot dtb from Orangepi4 original board, but sets # specific kernel DTB with BOOT_FDT_FILE directive -BOARD_NAME="OrangePi 4 LTS" +BOARD_NAME="Orange Pi 4 LTS" BOARDFAMILY="rk3399" BOOTCONFIG="orangepi-4-rk3399_defconfig" BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb" diff --git a/config/boards/orangepi4.conf b/config/boards/orangepi4.conf index c256ad23be..6ac0213d8b 100644 --- a/config/boards/orangepi4.conf +++ b/config/boards/orangepi4.conf @@ -1,5 +1,5 @@ # Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT -BOARD_NAME="OrangePi 4" +BOARD_NAME="Orange Pi 4" BOARDFAMILY="rk3399" BOOTCONFIG="orangepi-4-rk3399_defconfig" KERNEL_TARGET="legacy,current,edge" diff --git a/config/targets-cli-beta.conf b/config/targets-cli-beta.conf index 152edb6c5a..f05924e818 100644 --- a/config/targets-cli-beta.conf +++ b/config/targets-cli-beta.conf @@ -5,12 +5,10 @@ # JetHub J80 jethubj80 edge jammy cli beta yes + # JetHub J100/J110 jethubj100 edge jammy cli beta yes -# Orangepi R1+ -orangepi-r1plus edge jammy cli beta yes - # Orangepi 3 LTS orangepi3-lts edge jammy cli beta yes @@ -29,7 +27,7 @@ quartz64a edge jammy cli # radxa-zero -radxa-zero2 current jammy cli beta yes +radxa-zero2 edge jammy cli beta yes # Radxa rock-5b @@ -37,7 +35,7 @@ rock-5b legacy jammy cli # Rockpi-S -rockpi-s current jammy cli beta yes +rockpi-s edge jammy minimal beta yes # Tinkerboard 2 @@ -52,10 +50,6 @@ uefi-x86 edge jammy cli uefi-arm64 edge jammy cli beta yes -# Virtual qemu -virtual-qemu current jammy cli beta yes - - # OneCloud kernel only onecloud current jammy cli beta no onecloud edge jammy cli beta no diff --git a/config/targets-desktop-beta.conf b/config/targets-desktop-beta.conf index 717cf15537..60c17be616 100644 --- a/config/targets-desktop-beta.conf +++ b/config/targets-desktop-beta.conf @@ -3,21 +3,8 @@ ########################################################################################################################################################### -# Radxa rock-5b -rock-5b legacy jammy desktop beta adv xfce config_base 3dsupport,browsers - - # uefi-x86 uefi-x86 current jammy desktop beta yes xfce config_base 3dsupport,browsers -uefi-x86 current jammy desktop beta yes gnome config_base 3dsupport,browsers -uefi-x86 current jammy desktop beta yes cinnamon config_base 3dsupport,browsers - # uefi-arm64 uefi-arm64 current jammy desktop beta yes xfce config_base 3dsupport,browsers -uefi-arm64 current jammy desktop beta yes gnome config_base 3dsupport,browsers -uefi-arm64 current jammy desktop beta yes cinnamon config_base 3dsupport,browsers - - -# qemu virtual images -virtual-qemu current jammy desktop beta adv xfce config_base 3dsupport,browsers