Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support for the Orange Pi 5 Max with kernel 6.13-rc1 #7537

Closed
wants to merge 2 commits into from
Closed

support for the Orange Pi 5 Max with kernel 6.13-rc1 #7537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef9e49
add Orange Pi 5 Max support
Dec 3, 2024
5792bbf
Merge branch 'main' of https://github.com/shenmintao/build
Dec 3, 2024
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
33 changes: 17 additions & 16 deletions config/boards/orangepi5-max.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER=""
BOOTCONFIG="orangepi-5-max-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
BOOT_SOC="rk3588"
KERNEL_TARGET="vendor"
KERNEL_TARGET="vendor,edge"
KERNEL_TEST_TARGET="vendor"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
Expand All @@ -13,8 +13,9 @@ BOOT_SCENARIO="spl-blobs"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"
enable_extension "bcmdhd"
BCMDHD_TYPE="sdio"
#enable_extension "bcmdhd"
#BCMDHD_TYPE="sdio"
SKIP_ARMBIAN_REPO="yes"

function post_family_tweaks__orangepi5max_naming_audios() {
display_alert "$BOARD" "Renaming orangepi5max audios" "info"
Expand All @@ -27,22 +28,22 @@ function post_family_tweaks__orangepi5max_naming_audios() {
return 0
}

function post_family_tweaks_bsp__orangepi5max_bluetooth() {
display_alert "$BOARD" "Installing ap6611s-bluetooth.service" "info"
#function post_family_tweaks_bsp__orangepi5max_bluetooth() {
# display_alert "$BOARD" "Installing ap6611s-bluetooth.service" "info"

# Bluetooth on this board is handled by a Broadcom (AP6611S) chip and requires
# a custom brcm_patchram_plus binary, plus a systemd service to run it at boot time
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ap6611s-bluetooth.service
# install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
# cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ap6611s-bluetooth.service

# Reuse the service file, ttyS0 -> ttyS7; BCM4345C5.hcd -> SYN43711A0.hcd
sed -i 's/ttyS0/ttyS7/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
sed -i 's/BCM4345C5.hcd/SYN43711A0.hcd/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
return 0
}
# sed -i 's/ttyS0/ttyS7/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
# sed -i 's/BCM4345C5.hcd/SYN43711A0.hcd/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
# return 0
#}

function post_family_tweaks__orangepi5max_enable_bluetooth_service() {
display_alert "$BOARD" "Enabling ap6611s-bluetooth.service" "info"
chroot_sdcard systemctl enable ap6611s-bluetooth.service
return 0
}
#function post_family_tweaks__orangepi5max_enable_bluetooth_service() {
# display_alert "$BOARD" "Enabling ap6611s-bluetooth.service" "info"
# chroot_sdcard systemctl enable ap6611s-bluetooth.service
# return 0
#}
2 changes: 1 addition & 1 deletion config/sources/families/rockchip-rk3588.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ case $BRANCH in
edge)
# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
LINUXFAMILY=rockchip-rk3588
KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
;;
Expand Down
47 changes: 47 additions & 0 deletions patch/kernel/archive/rockchip-rk3588-6.13/0000.patching_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
config: # This is file 'patch/kernel/rockchip-rk3588-edge/0000.patching_config.yaml'

# PATCH NUMBERING INFO
#
# Patches should be ordered in such a way that general kernel patches are applied first, then SoC-related patches and at last board-specific patches
#
# Patch numbers in this folder are sorted by category:
#
# 000* for general patches
# 01** for GPU/HDMI related patches
# 08** for wireless patches
# 1*** for board specific patches:
# 101* for Rock-5B, 102* for Rock-5A and so on

# Just some info stuff; not used by the patching scripts
name: rockchip-rk3588-edge
kind: kernel
type: mainline # or: vendor
branch: linux-6.13.y
last-known-good-tag: v6.13-rc1
maintainers:
- { github: rpardini, name: Ricardo Pardini, email: [email protected], armbian-forum: rpardini }

# .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