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.

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

Jg/wdk2023 tweaks - bring the available features on par with current development #6091

Merged
merged 9 commits into from
Dec 28, 2023

Conversation

jglathe
Copy link
Contributor

@jglathe jglathe commented Dec 25, 2023

Description

This PR adds some tweaks to get the current (and IMO best possible yet) configuration of the WDK.

  • point to latest development branch which appears to be quite stable
  • add package mtools to support mounting the EFI partition, enable mount
  • add tweak to ensure qrtr-ns.service also runs, like protected-domain-mapper
  • add board file with calibration data that work well with the QCNFA765 Wireless Network Adapter

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • built the image with ./compile.sh build BOARD=wdk2023 BUILD_DESKTOP=yes BUILD_MINIMAL=no DESKTOP_APPGROUPS_SELECTED='3dsupport browsers chat desktop_tools editors email internet multimedia office programming remote_desktop' DESKTOP_ENVIRONMENT=gnome DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base KERNEL_CONFIGURE=no RELEASE=mantic
  • written the image to an SSD (with USB-to-SATA adapter) and booted from it, checked for desired operation

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

@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... labels Dec 25, 2023
@rpardini
Copy link
Member

This seems to be

  1. touching an unrelated (x13s's) kernel config
  2. adding more blobs to what should be in armbian-firmware
    Can you please check?

Copy link
Member

@rpardini rpardini left a comment

Choose a reason for hiding this comment

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

Could please address the comment above?

@jglathe
Copy link
Contributor Author

jglathe commented Dec 26, 2023

Hmm. x13s shouldn't be touched by my changes, it has it's own .wip file...? Also, branch and target are separate.

declare -g KERNEL_TARGET="wdk2023"
declare -g BRANCH="wdk2023"

The board-2.bin is hacked up with qca-swiss-army-knife, I added entries with the best matching calibration data and board identifiers as calculated by the ath11k driver. There are calibration data for the WDK in the Windows drivers (I hoped), but wasn't able to extract and make use of them - so I used the ones of the x13s, which appear to be best match after testing all of them (and work well enough). So... this isn't the version that linux-firmware would install, which runs perfectly with my x13s btw... why do you have a separate one in armbian-firmware? This aside, as linux-firmware sometimes is updated and would overwrite the hacked-up file, would be a good idea to put these files into /usr/lib/firmware/updates/... instead. I will try to change the location of board-2.bin to armbian-firmware, no problem.

@rpardini
Copy link
Member

Hmm. x13s shouldn't be touched by my changes, it has it's own .wip file...? Also, branch and target are separate.

declare -g KERNEL_TARGET="wdk2023"
declare -g BRANCH="wdk2023"

But, you're changing linux-arm64-sc8280xp.config -- that file corresponds to sc8280xp which is used by the x13s.

https://github.com/armbian/build/commits/main/config/kernel/linux-arm64-sc8280xp.config

@jglathe
Copy link
Contributor Author

jglathe commented Dec 27, 2023

But, you're changing linux-arm64-sc8280xp.config -- that file corresponds to sc8280xp which is used by the x13s.

https://github.com/armbian/build/commits/main/config/kernel/linux-arm64-sc8280xp.config

Oops, sorry. I will put a separate config file for the wdk, didn't want to change the x13s target. The config should work for both hardwares, though. My branch runs on both just by providing the dtb.

@jglathe
Copy link
Contributor Author

jglathe commented Dec 27, 2023

Should be in shape now, hard to test with firmware in armbian/firmware #73.

Copy link
Member

@rpardini rpardini left a comment

Choose a reason for hiding this comment

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

Yeah, let's merge this. I will soon change the x13s and this wdk2023 into proper family for the sc8280xp's -- that way we can have current/edge for each and try and reuse as much code as possible.
The firmware stuff needs review at the x13s level as well, I guess we can both use the same firmware in the end. I'd also love to not depend on the whole firmware-full if possible.

@igorpecovnik igorpecovnik merged commit e6ca00b into armbian:main Dec 28, 2023
2 checks passed
@jglathe jglathe deleted the jg/wdk2023-tweaks branch December 28, 2023 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like kernel, U-Boot, ... size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

3 participants