Skip to content

Commit 729bccc

Browse files
authored
Merge branch 'main' into main
2 parents d6974a3 + b8977ce commit 729bccc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+14204
-12
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ config/boards/orangepizero3.csc @alexl83 @chraac
120120
config/boards/orangepizeroplus.csc @schwar3kat
121121
config/boards/phytiumpi.conf @chainsx
122122
config/boards/pine64.conf @PanderMusubi
123+
config/boards/pinebook-a64.csc @Qvy-png
123124
config/boards/pinebook-pro.csc @TRSx80 @ahoneybun
124125
config/boards/pocketbeagle2.conf @Grippy98
125126
config/boards/pocketchip-sd.csc @TheSnowfield
@@ -196,7 +197,7 @@ config/kernel/linux-spacemit-*.config @pyavitz
196197
config/kernel/linux-starfive2-*.config @libiunc
197198
config/kernel/linux-sun55iw3-syterkit-*.config @chainsx
198199
config/kernel/linux-sunxi-*.config @1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
199-
config/kernel/linux-sunxi64-*.config @AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
200+
config/kernel/linux-sunxi64-*.config @AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
200201
config/kernel/linux-thead-*.config @chainsx
201202
config/kernel/linux-tqma-*.config @schmiedelm
202203
config/kernel/linux-uefi-arm64-*.config @rpardini
@@ -215,7 +216,7 @@ patch/atf/atf-sm8250/ @FantasyGmm @amazingfate
215216
patch/atf/atf-sm8550/ @FantasyGmm
216217
patch/atf/atf-spacemit/ @pyavitz
217218
patch/atf/atf-sun55iw3-syterkit/ @chainsx
218-
patch/atf/atf-sunxi64/ @AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
219+
patch/atf/atf-sunxi64/ @AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
219220
patch/atf/atf-wsl2-arm64/ @rpardini
220221
patch/kernel/archive/bcm2711-*/ @PanderMusubi @teknoid
221222
patch/kernel/archive/imx8m-*/ @schmiedelm
@@ -231,7 +232,7 @@ patch/kernel/archive/rockchip64-*/ @150balbes @ColorfulRhino @HeyMeco @JohnTheC
231232
patch/kernel/archive/sm8250-*/ @FantasyGmm @amazingfate
232233
patch/kernel/archive/sm8550-*/ @FantasyGmm
233234
patch/kernel/archive/spacemit-*/ @pyavitz
234-
patch/kernel/archive/sunxi-*/ @1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
235+
patch/kernel/archive/sunxi-*/ @1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
235236
patch/kernel/archive/uefi-arm64-*/ @PeterChrz @rpardini
236237
patch/kernel/archive/uefi-x86-*/ @davidandreoletti @rpardini
237238
patch/kernel/archive/wsl2-arm64-*/ @rpardini
@@ -257,8 +258,8 @@ patch/u-boot/u-boot-qemu-arm64/ @rpardini
257258
patch/u-boot/u-boot-qemu-x86/ @rpardini
258259
patch/u-boot/u-boot-rockchip64-v2022.04/ @TRSx80 @ahoneybun @paolosabatino
259260
patch/u-boot/u-boot-rockchip64/ @Tonymac32 @andyshrk @clee @igorpecovnik @prahal @redrathnure @sicXnull
260-
patch/u-boot/u-boot-sunxi-crust/ @AGM1968 @Kreyren @PanderMusubi @Tonymac32 @devdotnetorg @igorpecovnik @schwar3kat @spendist @teknoid
261-
patch/u-boot/u-boot-sunxi/ @1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
261+
patch/u-boot/u-boot-sunxi-crust/ @AGM1968 @Kreyren @PanderMusubi @Qvy-png @Tonymac32 @devdotnetorg @igorpecovnik @schwar3kat @spendist @teknoid
262+
patch/u-boot/u-boot-sunxi/ @1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
262263
patch/u-boot/u-boot-sunxi/board_bananapim3/ @AaronNGray
263264
patch/u-boot/u-boot-tqma/ @schmiedelm
264265
patch/u-boot/v2022.01/ @teknoid
@@ -305,7 +306,7 @@ sources/families/sm8250.conf @FantasyGmm @amazingfate
305306
sources/families/sm8550.conf @FantasyGmm
306307
sources/families/spacemit.conf @pyavitz
307308
sources/families/starfive2.conf @libiunc
308-
sources/families/sun50iw1.conf @Kreyren @PanderMusubi @devdotnetorg @eliasbakken
309+
sources/families/sun50iw1.conf @Kreyren @PanderMusubi @Qvy-png @devdotnetorg @eliasbakken
309310
sources/families/sun50iw2.conf @AGM1968 @Tonymac32 @schwar3kat @spendist @teknoid
310311
sources/families/sun50iw6.conf @igorpecovnik
311312
sources/families/sun50iw9-bpi.conf @The-going @pyavitz

.github/workflows/pr-kernel-security-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Get changed files
3636
id: changed-files
37-
uses: tj-actions/changed-files@f963b3f3562b00b6d2dd25efc390eb04e51ef6c6 # v46.0.3
37+
uses: tj-actions/changed-files@2036da178f85576f1940fedb74bb93a36cd89ab7 # v46.0.3
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v5

.github/workflows/pr-lint-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Get changed files
3232
id: changed-files
33-
uses: tj-actions/changed-files@f963b3f3562b00b6d2dd25efc390eb04e51ef6c6 # v46.0.3
33+
uses: tj-actions/changed-files@2036da178f85576f1940fedb74bb93a36cd89ab7 # v46.0.3
3434

3535
- name: List all changed files
3636
run: |

config/boards/pinebook-a64.csc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Allwinner A64 quad core 2GB RAM SoC WiFi/BT
22
BOARD_NAME="Pinebook A64"
33
BOARDFAMILY="sun50iw1"
4-
BOARD_MAINTAINER=""
4+
BOARD_MAINTAINER="Qvy-png"
55
BOOTCONFIG="pinebook_defconfig"
66
KERNEL_TARGET="legacy,current,edge"
77
KERNEL_TEST_TARGET="current"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb [signed-by=/usr/share/keyrings/neon.gpg] http://archive.neon.kde.org/testing noble main
1+
deb [signed-by=/usr/share/keyrings/neon.gpg] http://archive.neon.kde.org/stable noble main
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eos
1+
csc

config/kernel/linux-rockchip64-edge.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,6 +3114,7 @@ CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
31143114
CONFIG_PHY_ROCKCHIP_EMMC=y
31153115
CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
31163116
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
3117+
CONFIG_PHY_ROCKCHIP_INNO_USB3=y
31173118
CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
31183119
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
31193120
CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y

config/sources/families/sun55iw3.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ declare -g BOOTBRANCH="${BOOTBRANCH:-"branch:master"}"
1919
declare -g BOOTENV_FILE='sunxi.txt'
2020
declare -g UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}"
2121
declare -g OVERLAY_DIR="/boot/dtb/allwinner/overlay"
22-
declare -g LINUXFAMILY="sunxi64"
22+
declare -g LINUXFAMILY="sun55iw3"
23+
declare -g LINUXCONFIG="linux-sunxi64-${BRANCH}"
2324

2425
case "${BRANCH}" in
2526

patch/kernel/archive/odroidxu4-6.6/patch-6.6.68-69.patch renamed to patch/kernel/archive/odroidxu4-6.6/patch-6.6.068-069.patch

File renamed without changes.

patch/kernel/archive/odroidxu4-6.6/patch-6.6.69-70.patch renamed to patch/kernel/archive/odroidxu4-6.6/patch-6.6.069-070.patch

File renamed without changes.

0 commit comments

Comments
 (0)