Skip to content

Commit 515c57c

Browse files
libiunclibiunc
authored
Merge branch 'main' into patch-1
2 parents ce11508 + 95b8c4c commit 515c57c

File tree

11 files changed

+149
-68
lines changed

11 files changed

+149
-68
lines changed

‎.github/CODEOWNERS

+6-3
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ config/boards/qemu-uefi-x86.conf @davidandreoletti
130130
config/boards/radxa-e20c.csc @mattx433
131131
config/boards/radxa-e25.csc @krachlatte
132132
config/boards/radxa-e52c.conf @amazingfate
133-
config/boards/radxa-nio-12l.csc @HeyMeco
133+
config/boards/radxa-nio-12l.conf @HeyMeco
134134
config/boards/radxa-zero.conf @clee @engineer-80
135135
config/boards/radxa-zero2.csc @monkaBlyat
136136
config/boards/recore.csc @eliasbakken
@@ -169,6 +169,7 @@ config/boards/tritium-h3.conf @Tonymac32
169169
config/boards/tritium-h5.conf @Tonymac32
170170
config/boards/uefi-arm64.conf @rpardini
171171
config/boards/uefi-x86.conf @rpardini
172+
config/boards/visionfive2.eos @libiunc
172173
config/boards/wsl2-arm64.csc @rpardini
173174
config/boards/wsl2-x86.csc @rpardini
174175
config/boards/x96-mate.tvb @Ressetkk
@@ -193,6 +194,7 @@ config/kernel/linux-rockchip64-*.config @150balbes @ColorfulRhino @HeyMeco @Joh
193194
config/kernel/linux-sm8250-*.config @amazingfate
194195
config/kernel/linux-sm8550-*.config @FantasyGmm
195196
config/kernel/linux-spacemit-*.config @pyavitz
197+
config/kernel/linux-starfive2-*.config @libiunc
196198
config/kernel/linux-sun55iw3-syterkit-*.config @chainsx
197199
config/kernel/linux-sunxi-*.config @1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
198200
config/kernel/linux-sunxi64-*.config @AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
@@ -238,6 +240,7 @@ patch/kernel/archive/wsl2-x86-*/ @rpardini
238240
patch/kernel/genio-1200-*/ @HeyMeco
239241
patch/kernel/phytium-embedded-*/ @chainsx
240242
patch/kernel/rk35xx-vendor-*/ @CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
243+
patch/kernel/starfive2-*/ @libiunc
241244
patch/kernel/sun55iw3-syterkit-*/ @chainsx
242245
patch/kernel/thead-*/ @chainsx
243246
patch/kernel/wsl2-arm64-*/ @rpardini
@@ -277,8 +280,7 @@ patch/u-boot/v2025.01-rc3-coolpi-cm5/ @andyshrk
277280
patch/u-boot/v2025.01/ @ColorfulRhino @SuperKali @ZazaBR @amazingfate @catalinii @efectn @jeanrhum @joekhoobyar @paolosabatino @pyavitz @rpardini @torte71 @vamzii
278281
patch/u-boot/v2025.01/board_bananapim4berry/ @The-going
279282
patch/u-boot/v2025.01/board_h96-tvbox-3566/ @hqnicolas
280-
patch/u-boot/v2025.04-rc4/ @mlegenovic
281-
patch/u-boot/v2025.04/ @SuperKali @Tonymac32
283+
patch/u-boot/v2025.04/ @SuperKali @Tonymac32 @mlegenovic
282284
sources/families/bcm2711.conf @PanderMusubi @teknoid
283285
sources/families/genio.conf @HeyMeco
284286
sources/families/imx8m.conf @schmiedelm
@@ -302,6 +304,7 @@ sources/families/rockchip64.conf @150balbes @JohnTheCoolingFan @Manouchehri @TR
302304
sources/families/sm8250.conf @amazingfate
303305
sources/families/sm8550.conf @FantasyGmm
304306
sources/families/spacemit.conf @pyavitz
307+
sources/families/starfive2.conf @libiunc
305308
sources/families/sun50iw1.conf @Kreyren @PanderMusubi @devdotnetorg @eliasbakken
306309
sources/families/sun50iw2.conf @AGM1968 @Tonymac32 @schwar3kat @spendist @teknoid
307310
sources/families/sun50iw6.conf @NicoD-SBC

‎config/boards/odroidm2.csc

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ IMAGE_PARTITION_TABLE="gpt"
1010
FULL_DESKTOP="no"
1111
BOOT_LOGO="yes"
1212

13-
BOOTBRANCH_BOARD="tag:v2025.04-rc4"
13+
BOOTBRANCH_BOARD="tag:v2025.04-rc5"
1414
BOOTBRANCH="${BOOTBRANCH_BOARD}"
15-
BOOTPATCHDIR="v2025.04-rc4"
15+
BOOTPATCHDIR="v2025.04"
1616

1717
BOOTCONFIG="odroid-m2-rk3588s_defconfig"
1818
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

‎config/boards/radxa-e20c.csc

+32
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,35 @@ BOOT_LOGO="desktop"
99
BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
1010
BOOT_SCENARIO="spl-blobs"
1111
IMAGE_PARTITION_TABLE="gpt"
12+
13+
function post_family_tweaks_bsp__enable_leds_radxa-e20c() {
14+
display_alert "Creating board support LEDs config for $BOARD"
15+
cat <<- EOF > "${destination}"/etc/armbian-leds.conf
16+
[/sys/class/leds/lan-led]
17+
trigger=netdev
18+
interval=50
19+
brightness=1
20+
link=1
21+
tx=1
22+
rx=1
23+
device_name=end1
24+
25+
[/sys/class/leds/mmc1::]
26+
trigger=mmc1
27+
brightness=1
28+
29+
[/sys/class/leds/sys-led]
30+
trigger=heartbeat
31+
brightness=1
32+
invert=0
33+
34+
[/sys/class/leds/wan-led]
35+
trigger=netdev
36+
interval=50
37+
brightness=1
38+
link=1
39+
tx=1
40+
rx=1
41+
device_name=enp1s0
42+
EOF
43+
}

‎config/boards/visionfive2.eos

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RISC-V StarFive Visionfive V2
22
BOARD_NAME="VisionFive2"
33
BOARDFAMILY="starfive2"
4-
BOARD_MAINTAINER=""
4+
BOARD_MAINTAINER="libiunc"
55
KERNEL_TARGET="vendor"
66
BOOT_FDT_FILE="starfive/jh7110-visionfive-v2.dtb"
77
SRC_EXTLINUX="yes"

‎lib/functions/artifacts/artifact-armbian-bsp-cli.sh

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
6060
"INITRD_ARCH: ${INITRD_ARCH}" # /etc/armbian-release
6161
"KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}" # /etc/armbian-release
6262
"VENDOR: ${VENDOR}" # /etc/armbian-release
63+
"VENDORCOLOR: ${VENDORCOLOR}" # /etc/armbian-release
6364
"OVERLAY_DIR: ${OVERLAY_DIR}" # /etc/armbian-release
6465
"KERNEL_TARGET: ${KERNEL_TARGET}" # /etc/armbian-release
6566
"KERNEL_TEST_TARGET: ${KERNEL_TEST_TARGET}" # /etc/armbian-release

‎lib/functions/bsp/armbian-bsp-cli-deb.sh

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ function compile_armbian-bsp-cli() {
110110
FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE
111111
OVERLAY_DIR="$OVERLAY_DIR"
112112
VENDOR="$VENDOR"
113+
VENDORCOLOR="$VENDORCOLOR"
113114
VENDORDOCS="$VENDORDOCS"
114115
VENDORURL="$VENDORURL"
115116
VENDORSUPPORT="$VENDORSUPPORT"

‎lib/functions/compilation/armbian-kernel.sh

+43-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@
1010
# Forced .config options for all Armbian kernels.
1111
# Please note: Manually changing options doesn't check the validity of the .config file. This is done at next make time. Check for warnings in build log.
1212

13-
# This is an internal/core extension.
13+
# Enables additional wireless configuration options for Wi-Fi drivers on kernels 6.13 and later.
14+
#
15+
# This internal function updates the kernel configuration by adding necessary wireless options
16+
# to a global modification list, and if a .config file exists, it applies these changes directly.
17+
# It ensures that settings for wireless drivers (e.g. cfg80211 and mac80211) are properly enabled
18+
# to avoid build errors due to recent kernel updates.
19+
#
20+
# Globals:
21+
# KERNEL_MAJOR_MINOR - Current kernel version in major.minor format.
22+
# kernel_config_modifying_hashes - Array accumulating configuration changes.
23+
#
1424
function armbian_kernel_config__extrawifi_enable_wifi_opts_80211() {
1525
if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.13; then
1626
kernel_config_modifying_hashes+=("CONFIG_CFG80211=m" "CONFIG_MAC80211=m" "CONFIG_MAC80211_MESH=y" "CONFIG_CFG80211_WEXT=y")
@@ -25,6 +35,38 @@ function armbian_kernel_config__extrawifi_enable_wifi_opts_80211() {
2535
fi
2636
}
2737

38+
# Enables the NETKIT kernel configuration option for kernels version 6.7 and above.
39+
#
40+
# Globals:
41+
# KERNEL_MAJOR_MINOR - The kernel version string used to verify the minimum required version.
42+
#
43+
# This function checks if the current kernel's version is at least 6.7 and confirms the presence of a .config file.
44+
# If both conditions are met, it alerts the user about enabling NETKIT and sets the NETKIT option to 'y' in the kernel configuration.
45+
#
46+
function armbian_kernel_config__netkit() {
47+
if linux-version compare "${KERNEL_MAJOR_MINOR}" ge 6.7; then
48+
if [[ -f .config ]]; then
49+
display_alert "Enable NETKIT=y" "armbian-kernel" "debug"
50+
kernel_config_set_y NETKIT
51+
fi
52+
fi
53+
}
54+
55+
# Disables various kernel configuration options that conflict with Armbian's kernel build requirements.
56+
#
57+
# Globals:
58+
# kernel_config_modifying_hashes - Array tracking the configuration option changes.
59+
# KERNEL_MAJOR_MINOR - Kernel version used to apply version-specific configuration updates.
60+
#
61+
# Outputs:
62+
# Displays alerts to notify about the configuration changes being applied.
63+
#
64+
# Description:
65+
# This function disables several kernel configuration options such as module compression, module signing,
66+
# and automatic versioning to speed up the build process and ensure compatibility with Armbian requirements.
67+
# It forces EXPERT mode (EXPERT=y) to ensure hidden configurations are visible and applies different module
68+
# compression settings based on the kernel version. All modifications are only performed if the .config file exists.
69+
#
2870
function armbian_kernel_config__disable_various_options() {
2971
kernel_config_modifying_hashes+=("CONFIG_MODULE_COMPRESS_NONE=y" "CONFIG_MODULE_SIG=n" "CONFIG_LOCALVERSION_AUTO=n" "EXPERT=y")
3072
if [[ -f .config ]]; then
@@ -89,8 +131,6 @@ function armbian_kernel_config__force_pa_va_48_bits_on_arm64() {
89131
# Returns:
90132
# 0 on successful configuration application.
91133
#
92-
# Example:
93-
# armbian_kernel_config__600_enable_ebpf_and_btf_info
94134
function armbian_kernel_config__600_enable_ebpf_and_btf_info() {
95135
declare -A opts_val=()
96136
declare -a opts_y=() opts_n=()
@@ -139,8 +179,6 @@ function armbian_kernel_config__600_enable_ebpf_and_btf_info() {
139179
# Globals:
140180
# kernel_config_modifying_hashes - Array used to store configuration changes.
141181
#
142-
# Example:
143-
# armbian_kernel_config__enable_zram_support
144182
function armbian_kernel_config__enable_zram_support() {
145183
kernel_config_modifying_hashes+=("CONFIG_ZRAM=y")
146184
if [[ -f .config ]]; then
@@ -164,9 +202,6 @@ function armbian_kernel_config__enable_zram_support() {
164202
# filesystems (e.g., BTRFS, EXT4), control groups (cgroups), networking, security, and various netfilter
165203
# components. These settings ensure that the kernel is properly configured to support containerized environments.
166204
#
167-
# Example:
168-
# To enable Docker support in the kernel configuration, simply call:
169-
# armbian_kernel_config__enable_docker_support
170205
function armbian_kernel_config__enable_docker_support() {
171206
kernel_config_modifying_hashes+=("CONFIG_DOCKER=y")
172207
if [[ -f .config ]]; then
@@ -311,8 +346,6 @@ function armbian_kernel_config__enable_docker_support() {
311346
# Globals:
312347
# kernel_config_modifying_hashes - Array holding pending kernel configuration changes.
313348
#
314-
# Example:
315-
# armbian_kernel_config__enable_config_access_in_live_system
316349
function armbian_kernel_config__enable_config_access_in_live_system() {
317350
kernel_config_modifying_hashes+=("CONFIG_IKCONFIG_PROC=y")
318351
if [[ -f .config ]]; then

‎lib/functions/compilation/patch/drivers_network.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,11 @@ driver_rtl8811_rtl8812_rtl8814_rtl8821() {
175175
if linux-version compare "${version}" ge 3.14; then
176176

177177
# Attach to specific commit (is branch:v5.6.4.2)
178-
local rtl8812auver="commit:40ace7013407c147e0c40c9afef908319a99733c" # Commit date: Mar 25, 2025 (please update when updating commit ref)
178+
local rtl8812auver="commit:c3fb89a2f7066f4bf4e4d9d85d84f9791f14c83e" # Commit date: Mar 30, 2025 (please update when updating commit ref)
179179

180180
display_alert "Adding" "Wireless drivers for Realtek 8811, 8812, 8814 and 8821 chipsets ${rtl8812auver}" "info"
181181

182-
fetch_from_repo "$GITHUB_SOURCE/rpardini/aircrack-ng-rtl8812au-kernel-bump-fixes" "rtl8812au" "${rtl8812auver}" "yes" # https://github.com/aircrack-ng/rtl8812au
183-
182+
fetch_from_repo "$GITHUB_SOURCE/aircrack-ng/rtl8812au" "rtl8812au" "${rtl8812auver}" "yes" # https://github.com/aircrack-ng/rtl8812au
184183
cd "$kerneldir" || exit
185184

186185
# Brief detour. Turns out that HardKernel's vendor odroidxu4 kernel already has this driver

‎patch/u-boot/v2025.04-rc4/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch

-47
This file was deleted.

‎patch/u-boot/v2025.04/board_odroidm2/001-odroid-m2-fix-for-ethernet.patch

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Milivoje Legenovic <[email protected]>
3+
Date: Sat, 22 Mar 2025 13:46:35 +0100
4+
Subject: odroidm2: Fix for ethernet warnings in dmesg output
5+
6+
---
7+
dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts | 14 ++++++++--
8+
1 file changed, 12 insertions(+), 2 deletions(-)
9+
10+
diff --git a/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts b/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
11+
index 111111111111..222222222222 100644
12+
--- a/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
13+
+++ b/dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
14+
@@ -229,9 +229,9 @@
15+
};
16+
17+
&gmac1 {
18+
- clock_in_out = "output";
19+
+ clock_in_out = "input";
20+
phy-handle = <&rgmii_phy1>;
21+
- phy-mode = "rgmii-id";
22+
+ phy-mode = "rgmii";
23+
phy-supply = <&vcc_3v3_s0>;
24+
pinctrl-names = "default";
25+
pinctrl-0 = <&gmac1_miim
26+
@@ -241,6 +241,8 @@
27+
&gmac1_rgmii_bus
28+
&gmac1_clkinout>;
29+
status = "okay";
30+
+ tx_delay = <0x3a>;
31+
+ rx_delay = <0x3e>;
32+
};
33+
34+
&gpu {
35+
@@ -400,6 +402,8 @@
36+
rgmii_phy1: ethernet-phy@1 {
37+
compatible = "ethernet-phy-id001c.c916";
38+
reg = <1>;
39+
+ pinctrl-names = "default";
40+
+ pinctrl-0 = <&rtl8211f_rst>;
41+
reset-assert-us = <20000>;
42+
reset-deassert-us = <100000>;
43+
reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
44+
@@ -475,6 +479,12 @@
45+
};
46+
};
47+
48+
+ rtl8211f {
49+
+ rtl8211f_rst: rtl8211f-rst {
50+
+ rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
51+
+ };
52+
+ };
53+
+
54+
usb {
55+
usb2_host_pwren: usb2-host-pwren {
56+
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
57+
--
58+
Armbian
59+

‎requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Dependabot will keep these versions up to date.
77

88
pip == 25.0.1 # pip is the package installer for Python
9-
setuptools == 78.0.1 # for building Python packages
9+
setuptools == 78.1.0 # for building Python packages
1010
pyelftools == 0.32 # for building U-Boot
1111
unidiff == 0.7.5 # for parsing unified diff
1212
GitPython == 3.1.44 # for manipulating git repos
@@ -15,6 +15,6 @@ coloredlogs == 15.0.1 # for colored logging
1515
PyYAML == 6.0.2 # for parsing/writing YAML
1616
oras == 0.1.30 # for OCI stuff in mapper-oci-update
1717
Jinja2 == 3.1.6 # for templating
18-
rich == 13.9.4 # for rich text formatting
18+
rich == 14.0.0 # for rich text formatting
1919
dtschema == 2025.2 # for checking dts files and dt bindings
2020
yamllint == 1.37.0 # for checking dts files and dt bindings

0 commit comments

Comments
 (0)