Skip to content

Commit ad5b137

Browse files
authored
Merge branch 'ophub:main' into main
2 parents 3d1a78a + d766bb1 commit ad5b137

File tree

12 files changed

+72
-34
lines changed

12 files changed

+72
-34
lines changed

.github/workflows/compile-kernel.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ on:
6767
options:
6868
- clang
6969
- gcc
70-
- gcc-11.3
71-
- gcc-12.2
72-
- gcc-12.3
73-
- gcc-13.2
74-
- gcc-13.3
7570
- gcc-14.2
7671
compress_format:
7772
description: "Set the initrd compression format"

CONTRIBUTORS.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,7 @@ The [u-boot](https://github.com/ophub/u-boot), [kernel](https://github.com/ophub
181181
| [stevenliuit](https://github.com/stevenliuit) | 170. [2024-11-27] According to his sharing in the [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/2661) request. the `DG-TN3568(rk3568)` box has received support. The used dtb is `rk3568-dg-tn3568.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The Gigabit wired network works fine. |
182182
| [doyoman](https://github.com/doyoman) | 171. [2024-12-05] According to his sharing in the [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/2691) request. the `Fmx1-Pro(rk3399)` box has received support. The used dtb is `rk3399-fmx1-pro.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The Gigabit wired network works fine. |
183183
| [zakuwaki](https://github.com/zakuwaki) | 172. [2024-12-06] According to his sharing in the [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/2673) request. the `yskj(rk3399)` box has received support. The used dtb is `rk3399-yskj.dtb`, u-boot used `trust.bin`, `uboot.img` and `idbloader.bin`. The Gigabit wired network works fine. |
184-
| [andyfanybo](https://github.com/andyfanybo) | 173. [2025-01-18] According to his sharing in the [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/2736) request. the `WXY-OEC-turbo-4g(rk3566)` box has received support. The used dtb is `rk3566-wxy-oec-turbo-4g.dtb`, u-boot used `u-boot.itb` and `idbloader.imgn`. The Gigabit wired network works fine. |
185-
| [dy008](https://github.com/dy008) | 174. [2025-03-01] According to his sharing in the [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/2817) request. the `Smart-Am60(rk3588)` box has received support. The used dtb is `rk3588-smart-am60.dtb`, u-boot used `u-boot.itb` and `idbloader.imgn`. The Gigabit wired network works fine. |
184+
| [andyfanybo](https://github.com/andyfanybo) | 173. [2025-01-18] According to his sharing in the [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/2736) request. the `WXY-OEC-turbo-4g(rk3566)` box has received support. The used dtb is `rk3566-wxy-oec-turbo-4g.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The Gigabit wired network works fine. |
185+
| [dy008](https://github.com/dy008) | 174. [2025-03-01] According to his sharing in the [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/2817) request. the `Smart-Am60(rk3588)` box has received support. The used dtb is `rk3588-smart-am60.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The Gigabit wired network works fine. |
186+
| [stevenliuit](https://github.com/stevenliuit) | 175. [2025-04-15] According to his sharing in the [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/2911) request. the `Alark35-3500(rk3568)` box has received support. The used dtb is `rk3568-alark35-3500.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The 100Mbps wired network works fine. |
187+
| [loadnl](https://github.com/loadnl) | 176. [2025-05-20] According to his sharing in the [Issues](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/748) request. the `Sv-33a6x(rk3399)` box has received support. The used dtb is `rk3399-sv-33a6x.dtb`, u-boot used `u-boot.itb` and `idbloader.img`. The Gigabit wired network works fine. |
Binary file not shown.

compile-kernel/tools/config/config-5.10

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
# Automatically generated file; DO NOT EDIT.
33
# Linux/arm64 5.10.237 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
5+
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=140201
88
CONFIG_LD_VERSION=243010000
99
CONFIG_CLANG_VERSION=0
1010
CONFIG_AS_IS_GNU=y
1111
CONFIG_AS_VERSION=24301
1212
CONFIG_LLD_VERSION=0
13+
CONFIG_CC_CAN_LINK=y
14+
CONFIG_CC_CAN_LINK_STATIC=y
1315
CONFIG_CC_HAS_ASM_GOTO=y
1416
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1517
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -23,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2325
#
2426
CONFIG_INIT_ENV_ARG_LIMIT=32
2527
# CONFIG_COMPILE_TEST is not set
28+
# CONFIG_UAPI_HEADER_TEST is not set
2629
CONFIG_LOCALVERSION=""
2730
# CONFIG_LOCALVERSION_AUTO is not set
2831
CONFIG_BUILD_SALT=""

compile-kernel/tools/config/config-5.15

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.15.182 Kernel Configuration
3+
# Linux/arm64 5.15.184 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
5+
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=140201
88
CONFIG_CLANG_VERSION=0
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24301
1111
CONFIG_LD_IS_BFD=y
1212
CONFIG_LD_VERSION=24301
1313
CONFIG_LLD_VERSION=0
14+
CONFIG_CC_CAN_LINK=y
15+
CONFIG_CC_CAN_LINK_STATIC=y
1416
CONFIG_CC_HAS_ASM_GOTO=y
1517
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1618
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -27,6 +29,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2729
CONFIG_INIT_ENV_ARG_LIMIT=32
2830
# CONFIG_COMPILE_TEST is not set
2931
# CONFIG_WERROR is not set
32+
# CONFIG_UAPI_HEADER_TEST is not set
3033
CONFIG_LOCALVERSION=""
3134
# CONFIG_LOCALVERSION_AUTO is not set
3235
CONFIG_BUILD_SALT=""

compile-kernel/tools/config/config-5.4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
#
55

66
#
7-
# Compiler: aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119
7+
# Compiler: aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119
88
#
99
CONFIG_CC_IS_GCC=y
1010
CONFIG_GCC_VERSION=140201
1111
CONFIG_CLANG_VERSION=0
12+
CONFIG_CC_CAN_LINK=y
1213
CONFIG_CC_HAS_ASM_GOTO=y
1314
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1415
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -22,6 +23,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2223
#
2324
CONFIG_INIT_ENV_ARG_LIMIT=32
2425
# CONFIG_COMPILE_TEST is not set
26+
# CONFIG_UAPI_HEADER_TEST is not set
2527
CONFIG_LOCALVERSION=""
2628
# CONFIG_LOCALVERSION_AUTO is not set
2729
CONFIG_BUILD_SALT=""

compile-kernel/tools/config/config-6.1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.1.138 Kernel Configuration
3+
# Linux/arm64 6.1.140 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
5+
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=140201
88
CONFIG_CLANG_VERSION=0
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24301
1111
CONFIG_LD_IS_BFD=y
1212
CONFIG_LD_VERSION=24301
1313
CONFIG_LLD_VERSION=0
14+
CONFIG_CC_CAN_LINK=y
15+
CONFIG_CC_CAN_LINK_STATIC=y
1416
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1517
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1618
CONFIG_CC_HAS_ASM_INLINE=y
@@ -26,6 +28,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2628
CONFIG_INIT_ENV_ARG_LIMIT=32
2729
# CONFIG_COMPILE_TEST is not set
2830
# CONFIG_WERROR is not set
31+
# CONFIG_UAPI_HEADER_TEST is not set
2932
CONFIG_LOCALVERSION=""
3033
# CONFIG_LOCALVERSION_AUTO is not set
3134
CONFIG_BUILD_SALT=""

compile-kernel/tools/config/config-6.12

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.28 Kernel Configuration
3+
# Linux/arm64 6.12.30 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
5+
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=140201
88
CONFIG_CLANG_VERSION=0
@@ -13,6 +13,8 @@ CONFIG_LD_VERSION=24301
1313
CONFIG_LLD_VERSION=0
1414
CONFIG_RUSTC_VERSION=0
1515
CONFIG_RUSTC_LLVM_VERSION=0
16+
CONFIG_CC_CAN_LINK=y
17+
CONFIG_CC_CAN_LINK_STATIC=y
1618
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1719
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1820
CONFIG_TOOLS_SUPPORT_RELR=y
@@ -30,6 +32,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
3032
CONFIG_INIT_ENV_ARG_LIMIT=32
3133
# CONFIG_COMPILE_TEST is not set
3234
# CONFIG_WERROR is not set
35+
# CONFIG_UAPI_HEADER_TEST is not set
3336
CONFIG_LOCALVERSION=""
3437
# CONFIG_LOCALVERSION_AUTO is not set
3538
CONFIG_BUILD_SALT=""

compile-kernel/tools/config/config-6.6

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.6.90 Kernel Configuration
3+
# Linux/arm64 6.6.92 Kernel Configuration
44
#
5-
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
5+
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.2.Rel1 (Build arm-14.52)) 14.2.1 20241119"
66
CONFIG_CC_IS_GCC=y
77
CONFIG_GCC_VERSION=140201
88
CONFIG_CLANG_VERSION=0
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24301
1111
CONFIG_LD_IS_BFD=y
1212
CONFIG_LD_VERSION=24301
1313
CONFIG_LLD_VERSION=0
14+
CONFIG_CC_CAN_LINK=y
15+
CONFIG_CC_CAN_LINK_STATIC=y
1416
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1517
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
1618
CONFIG_TOOLS_SUPPORT_RELR=y
@@ -27,6 +29,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2729
CONFIG_INIT_ENV_ARG_LIMIT=32
2830
# CONFIG_COMPILE_TEST is not set
2931
# CONFIG_WERROR is not set
32+
# CONFIG_UAPI_HEADER_TEST is not set
3033
CONFIG_LOCALVERSION=""
3134
# CONFIG_LOCALVERSION_AUTO is not set
3235
CONFIG_BUILD_SALT=""
@@ -2093,6 +2096,7 @@ CONFIG_PROC_EVENTS=y
20932096
#
20942097
CONFIG_ARM_SCMI_PROTOCOL=y
20952098
# CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
2099+
# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
20962100
CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
20972101
CONFIG_ARM_SCMI_HAVE_SHMEM=y
20982102
CONFIG_ARM_SCMI_HAVE_MSG=y

compile-kernel/tools/script/armbian_compile_kernel_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dev_repo="https://github.com/ophub/kernel/releases/download/dev"
8888
gun_file="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
8989
# Set the toolchain path
9090
toolchain_path="/usr/local/toolchain"
91-
# Set the default cross-compilation toolchain: [ clang / gcc / gcc-13.2, etc. ]
91+
# Set the default cross-compilation toolchain: [ clang / gcc / gcc-14.2, etc. ]
9292
toolchain_name="gcc"
9393

9494
# Set font color

0 commit comments

Comments
 (0)