Skip to content
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8bb4621
set new version, copy patches
EvilOlaf Dec 14, 2025
12aeef4
remove partially upstreamed patches
EvilOlaf Dec 14, 2025
4fdf09b
disable remaining broken, rewrite for first alignment, fix rt5651 aptch
EvilOlaf Dec 14, 2025
04e5201
that one is still broken
EvilOlaf Dec 14, 2025
d39fafa
rk3308-acodec is a shitload of work to align again and fix two more p…
EvilOlaf Dec 14, 2025
5e88fca
fix another patch
EvilOlaf Dec 14, 2025
9670a67
Revert repository hack
EvilOlaf Dec 14, 2025
6ebc8c4
rockpro64: IEP driver
fwolter Dec 20, 2025
c539e37
Merge pull request #18 from fwolter/fix-iep-6.19
EvilOlaf Dec 20, 2025
1277e57
rockchip64-6.19: add rkvdec v7 patches
amazingfate Dec 21, 2025
a7242e0
Update patch/kernel/archive/rockchip64-6.19/dt/rk3399-orangepi-4-lts.dts
EvilOlaf Dec 21, 2025
02e6832
Update patch/kernel/archive/rockchip64-6.19/dt/rk3328-nanopi-neo3-rev…
EvilOlaf Dec 21, 2025
d13f24d
Update patch/kernel/archive/rockchip64-6.19/dt/rk3399-orangepi-4-lts.dts
EvilOlaf Dec 21, 2025
16aa61b
bump to rc2, rewrite patches
EvilOlaf Dec 22, 2025
bf9d333
orangepi-4-lts: dts - fix disabled status of various nodes
EvilOlaf Dec 23, 2025
efefc55
Revert "orangepi-4-lts: dts - fix disabled status of various nodes"
EvilOlaf Dec 23, 2025
20a5a6d
dts: orangepi-4-lts: fix mispelled disable properites
EvilOlaf Dec 23, 2025
71d8fea
fix typo in patch file name
EvilOlaf Dec 28, 2025
9833296
rock-3a: fix wrong gpio description
EvilOlaf Dec 28, 2025
42d55a8
rock-3a: fix another wrong gpio description
EvilOlaf Dec 28, 2025
f46fef5
rock-s0: fix typo in patch subject
EvilOlaf Dec 28, 2025
4068de5
rk3399-am40: fix typo in dts
EvilOlaf Dec 28, 2025
4346b02
rk3328-dusun-dsom-010r: fix typo in dts
EvilOlaf Dec 28, 2025
377609d
rk3399-fine3399: remove duplicate `&gpu` node from dts
EvilOlaf Dec 28, 2025
d5e78e0
update patching-config for 6.19
EvilOlaf Dec 28, 2025
1e028d6
fix opp-microvolt settings
EvilOlaf Dec 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/sources/families/include/rockchip64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ case $BRANCH in
;;

edge)
declare -g KERNEL_MAJOR_MINOR="6.18"
declare -g KERNEL_MAJOR_MINOR="6.19"
declare -g LINUXFAMILY=rockchip64
declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
;;
Expand Down
16 changes: 8 additions & 8 deletions config/sources/mainline-kernel.conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
function mainline_kernel_decide_version__upstream_release_candidate_number() {
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
if [[ "${KERNEL_MAJOR_MINOR}" == "6.19" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
declare -g KERNELBRANCH="tag:v6.19-rc1"
declare -g KERNELBRANCH="tag:v6.19-rc2"
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
fi
}
Expand All @@ -26,13 +26,13 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() {

# # Example: 6.7-rc7 was released by Linus, but kernel.org git and google git mirrors took a while to catch up; change the source to pull directly from Linus.
# # This was necessary for a few days in late December 2023, but no longer; tag was pushed on 28/Dec/2023.
# function mainline_kernel_decide_version__750_use_torvalds_for_6.7-rc7() {
# if [[ "${KERNELBRANCH}" == 'tag:v6.7-rc7' ]]; then
# display_alert "Using Linus kernel repo for 6.7-rc7" "${KERNELBRANCH}" "warn"
# declare -g KERNELSOURCE="https://github.com/torvalds/linux.git"
# display_alert "mainline-kernel: missing torvalds tag on 6.7-rc7" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
# fi
# }
function mainline_kernel_decide_version__750_use_torvalds_for_6.7-rc7() {
if [[ "${KERNELBRANCH}" == 'tag:v6.19-rc2' ]]; then
display_alert "Using Linus kernel repo for 6.19-rc2" "${KERNELBRANCH}" "warn"
declare -g KERNELSOURCE="https://github.com/torvalds/linux.git"
display_alert "mainline-kernel: missing torvalds tag on 6.19-rc2" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
fi
}

### Last hooks, defaults to branch if not set by previous hooks. Use mainline_kernel_decide_version__900 or higher.
function mainline_kernel_decide_version__900_defaults() {
Expand Down
37 changes: 37 additions & 0 deletions patch/kernel/archive/rockchip64-6.19/0000.patching_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
config: # This is file 'patch/kernel/archive/rockchip64-6.13/0000.patching_config.yaml'

# Just some info stuff; not used by the patching scripts
name: rockchip64-6.14
kind: kernel
type: mainline # or: vendor
branch: linux-6.14.y
last-known-good-tag: v6.14-rc2
maintainers:
- { github: rpardini, name: Ricardo Pardini, email: [email protected], armbian-forum: rpardini }
- { github: paolosabatino, name: Paolo Sabatino, email: [email protected], armbian-forum: jock }

# .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
# This is meant to provide a way to "add a board DTS" without having to null-patch them in.
dts-directories:
- { source: "dt", target: "arch/arm64/boot/dts/rockchip" }

# every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
# This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
# @TODO need a solution to auto-Makefile the overlays as well
overlay-directories:
- { source: "overlay", target: "arch/arm64/boot/dts/rockchip/overlay" }

# the Makefile in each of these directories will be magically patched to include the dts files copied
# or patched-in; overlay subdir will be included "-y" if it exists.
# No more Makefile patching needed, yay!
auto-patch-dt-makefile:
- { directory: "arch/arm64/boot/dts/rockchip", config-var: "CONFIG_ARCH_ROCKCHIP" }

# configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
patches-to-git:
do-not-commit-files:
- "MAINTAINERS" # constant churn, drop them. sorry.
- "Documentation/devicetree/bindings/arm/rockchip.yaml" # constant churn, conflicts on every bump, drop it. sorry.
do-not-commit-regexes: # Python-style regexes
- "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now

Loading
Loading