Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

rockchip64 & meson64: bump edge to stable 7.1 - #9980

#9980
Merged
igorpecovnik merged 3 commits into
armbian:mainarmbian/build:mainfrom
EvilOlaf:7.1-stableEvilOlaf/build:7.1-stableCopy head branch name to clipboard
Jun 15, 2026
Merged

rockchip64 & meson64: bump edge to stable 7.1#9980
igorpecovnik merged 3 commits into
armbian:mainarmbian/build:mainfrom
EvilOlaf:7.1-stableEvilOlaf/build:7.1-stableCopy head branch name to clipboard

Conversation

@EvilOlaf

@EvilOlaf EvilOlaf commented Jun 15, 2026

Copy link
Copy Markdown
Member

Description

How Has This Been Tested?

  • build rockchip64 edge 7.1
  • build meson64 edge 7.1

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • Chores
    • Updated kernel versions (7.1 and 7.2) for edge and development release branches
    • Modernized kernel configurations by removing deprecated components and improving hardware driver support
    • Enhanced system security through updated cryptographic configurations and networking optimizations

EvilOlaf added 3 commits June 15, 2026 16:23
CONFIG_POWER_RESET_MESON64 has a pending PR
rtl8723ds via patch is only needed for rockchip64 family other can use mainline driver
other changes are automated
…d 7.2

RTL8192EU still needs attention for 7.1
@coderabbitai

coderabbitai Bot commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Bumps KERNEL_MAJOR_MINOR for meson64 and rockchip64 edge branches from 7.0 to 7.1 and bleedingedge from 7.1 to 7.2. Updates the mainline RC selector to target v7.2-rc1 via the Torvalds repo. Regenerates both edge defconfigs: removes legacy ATM, Hamradio, and select crypto options; adjusts Wi-Fi entries; adds CONFIG_GPIO_CDEV_V1=y.

Changes

Kernel 7.1/7.2 Bump for meson64 and rockchip64

Layer / File(s) Summary
KERNEL_MAJOR_MINOR and RC branch-selection updates
config/sources/families/include/meson64_common.inc, config/sources/families/include/rockchip64_common.inc, config/sources/mainline-kernel.conf.sh
KERNEL_MAJOR_MINOR for edge updated to 7.1 and bleedingedge to 7.2 in both family includes. mainline-kernel.conf.sh maps 7.2 to tag:v7.2-rc1 and replaces the 7.1-rc7 Torvalds hook with a 7.2-rc1-specific override.
meson64-edge defconfig regeneration
config/kernel/linux-meson64-edge.config
Header bumped to 7.1. Removes CONFIG_IPV6_SIT, ATM clip/lane/mpoa/dummy/tcp/lanai/eni/nicstar/ia/fore200e/he entries, Hamradio module block, CONFIG_RTL8723DS, and CONFIG_POWER_RESET_MESON64. Replaces MICHAEL_MIC/DRBG/SM3 crypto block with RMD160, WP512, XCBC, DEFLATE, 842, LZ4HC, USER_API_* options and CONFIG_CRYPTO_GHASH_ARM64_CE=y. Adds CONFIG_GPIO_CDEV_V1=y.
rockchip64-edge defconfig regeneration
config/kernel/linux-rockchip64-edge.config
Header bumped to 7.1. Removes CONFIG_IPV6_SIT, ATM and Hamradio option blocks. Wi-Fi block updated with RTL8189ES/AW/Unisoc/WCN entries, CONFIG_AW_BIND_VERIFY=y added, CONFIG_TTY_OVERY_SDIO=m removed. Removes MICHAEL_MIC, DRBG hash/CTR, and SM3 NEON/ARM64 CE crypto options.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • armbian/build#9979: Enables CONFIG_GPIO_CDEV_V1=y in the meson64-bleedingedge defconfig — the same Kconfig option added in this PR for the meson64-edge defconfig.
  • armbian/build#9950: Modifies the same mainline_kernel_decide_version__upstream_release_candidate_number hook in mainline-kernel.conf.sh, previously mapping 7.1 to v7.1-rc7.
  • armbian/build#9896: Re-enables CONFIG_RTL8723DS in the rockchip64 defconfig for kernels >= 7.1, directly related to the removal of that option in this PR.

Suggested labels

Ready to merge, size/small, Patches

Suggested reviewers

  • igorpecovnik
  • rpardini
  • teknoid

🐇 The kernel hops from seven-point-oh to one,
Old ATM and ham-radio configs — gone!
Crypto reshuffled, the GPIO cdev free,
v7.2-rc1 branches now point to Torvalds' tree.
A tidy little diff, and the build hops on! 🌱

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely summarizes the main change: bumping kernel versions for rockchip64 and meson64 platforms' edge branches to stable 7.1.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions Bot added 08 Milestone: Third quarter release size/medium PR with more then 50 and less then 250 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Jun 15, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
config/kernel/linux-rockchip64-edge.config (1)

3430-3432: ⚠️ Potential issue | 🟠 Major

Add CONFIG_GPIO_CDEV_V1=y to align with meson64-edge kernel 7.1 configuration.

Both rockchip64-edge and meson64-edge target Linux kernel 7.1, but rockchip64-edge is missing CONFIG_GPIO_CDEV_V1=y which is present in meson64-edge. This inconsistency should be resolved.

Add to config/kernel/linux-rockchip64-edge.config
 CONFIG_MEMTEST=y
+CONFIG_GPIO_CDEV_V1=y
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@config/kernel/linux-rockchip64-edge.config` around lines 3430 - 3432, The
rockchip64-edge kernel configuration is missing the CONFIG_GPIO_CDEV_V1=y option
that is present in the meson64-edge configuration, causing an inconsistency
between the two kernel 7.1 target configurations. Add the line
CONFIG_GPIO_CDEV_V1=y to the rockchip64-edge config file to align with the
meson64-edge kernel 7.1 configuration and ensure consistency across both
targets.

Source: Learnings

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@config/kernel/linux-rockchip64-edge.config`:
- Around line 3430-3432: The rockchip64-edge kernel configuration is missing the
CONFIG_GPIO_CDEV_V1=y option that is present in the meson64-edge configuration,
causing an inconsistency between the two kernel 7.1 target configurations. Add
the line CONFIG_GPIO_CDEV_V1=y to the rockchip64-edge config file to align with
the meson64-edge kernel 7.1 configuration and ensure consistency across both
targets.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: f0065901-4bc5-4cac-9f4a-cb9bbc2f4034

📥 Commits

Reviewing files that changed from the base of the PR and between 6082f86 and a77d212.

📒 Files selected for processing (5)
  • config/kernel/linux-meson64-edge.config
  • config/kernel/linux-rockchip64-edge.config
  • config/sources/families/include/meson64_common.inc
  • config/sources/families/include/rockchip64_common.inc
  • config/sources/mainline-kernel.conf.sh

@github-actions github-actions Bot added the Ready to merge Reviewed, tested and ready for merge label Jun 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions Bot removed the Needs review Seeking for review label Jun 15, 2026
@igorpecovnik
igorpecovnik merged commit fffd2ce into armbian:main Jun 15, 2026
14 checks passed
@EvilOlaf
EvilOlaf deleted the 7.1-stable branch June 16, 2026 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

08 Milestone: Third quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.