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

Update buildroot configuration method, buildroot+linux+opensbi version, and device trees #1227

Merged
merged 26 commits into from
Jan 7, 2025

Conversation

jordancarlin
Copy link
Member

  • Use defconfig files for main buildroot configuration and linux configuration. These only store any settings that are different from the defaults which makes them easier to maintain across versions and much easier to read
  • Use BR2_EXTERNAL_TREE feature of buildroot to tell it where our configuration files are. This requires a few extra files and a reorganization to match the officially recommended layout for buildroot customization files.
  • Update Linux makefile to use new external tree instead of copying files and to generate the full config from the defconfig.
  • Update buildroot versions
    • Update buildroot itself from 2023.5 to 2024.11 (latest release)
    • Update linux kernel from 6.6 to 6.12.8 (latest release)
    • Update OpenSBI from 1.3 to 1.6 (latest release)
    • Use latest gcc 14.2 and binutils 2.43 for cross compilation
  • Temporarily remove the uemacs package from buildroot because it is not compatible with gcc 14. Issue opened (https://gitlab.com/buildroot.org/buildroot/-/issues/81) and does not seem like an essential package to our buildroot image so probably fine to remove for now.
  • Update linux testvector generation script to launch qemu using fw_jump.bin instead of fw_jump.elf. The fw_jump.elf file does not work with QEMU with newer versions of OpenSBI. See Some ROM regions are overlapping riscv-software-src/opensbi#372
  • Update device trees to include the full list of accepted extensions that wally supports. This reduces the instruction count for a linux boot and means it tests a larger portion of the code base since a wider variety of instructions are being executed. The biggest ones that I noticed it using now were bit manipulation and CMOs.

@davidharrishmc
Copy link
Contributor

davidharrishmc commented Jan 7, 2025

Do you want to remove zicbop since we implement it as nop?

@davidharrishmc
Copy link
Contributor

@rosethompson this looks good to me, but could you review as well?

@davidharrishmc
Copy link
Contributor

Also, is this the time to change the VCU-118 SDC in the device tree?

@jordancarlin
Copy link
Member Author

Removed zicbop

@jordancarlin
Copy link
Member Author

@rosethompson It doesn't necessarily need to happen before we merge, but it would be good to test the new version on an FPGA when you're able to.

@rosethompson
Copy link
Contributor

This looks good to me. I'm not sure it matters to include the cbop size in the device tree since it's not implemented.

@jordancarlin
Copy link
Member Author

This looks good to me. I'm not sure it matters to include the cbop size in the device tree since it's not implemented.

Good point. Forgot to remove that when removing cbop. Gone now.

@davidharrishmc davidharrishmc merged commit 528ecfb into openhwgroup:main Jan 7, 2025
1 check passed
@jordancarlin jordancarlin deleted the device-tree-update branch January 13, 2025 01:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants