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

odroidhc4: bump to u-boot v2024.04; drop most defconfig patches in favor of hooks #6710

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Jun 9, 2024

odroidhc4: bump to u-boot v2024.04; drop most defconfig patches in favor of hooks

  • odroidhc4: bump to u-boot v2024.04; drop most defconfig patches in favor of hooks
    • add pre_config_uboot_target hook for switching BOOTCONFIG across the two targets
      • adapt UBOOT_TARGET_MAP to not call the defconfig Makefile targets directly, instead, just do a variable assignment (ignored by Make)
      • otherwise, when using the defconfig directly in the UBOOT_TARGET_MAP, the post_config_uboot_target .config changes are overwritten when Make is called
    • only patch left is boot usb-nvme-scsi/sata first (still done in meson64.h)
    • remove FIP handling from family file meson-sm1.conf into board file hook where it belongs
    • u-boot: enable more compression methods, EFI debugging, i2c, leds, tcp networking
    • use flashcp for mtd writing
    • Unchanged:
      • confirmed as of v2024.04: using the C4 (not HC4) defconfig is still needed to be able to write to mtd when booted from SD
      • also confirmed: one still needs to erase Petitboot using Petitboot, then boot from SD, to be able to flash mainline u-boot to mtd

…vor of hooks

- add `pre_config_uboot_target` hook for switching BOOTCONFIG across the two targets
  - adapt `UBOOT_TARGET_MAP` to not call the defconfig Makefile targets directly, instead, just do a variable assignment (ignored by Make)
  - otherwise, when using the defconfig directly in the `UBOOT_TARGET_MAP`, the `post_config_uboot_target` .config changes are overwritten when Make is called
- only patch left is boot usb-nvme-scsi/sata first (still done in meson64.h)
- remove FIP handling from family file `meson-sm1.conf` into board file hook where it belongs
- u-boot: enable more compression methods, EFI debugging, i2c, leds, tcp networking
- use flashcp for mtd writing

- Unchanged:
  - confirmed as of v2024.04: using the C4 (not HC4) defconfig is still needed to be able to write to mtd when booted from SD
  - also confirmed: one still needs to erase Petitboot using Petitboot, then boot from SD, to be able to flash mainline u-boot to mtd
@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... labels Jun 9, 2024
@rpardini rpardini requested review from a team and lanefu June 9, 2024 09:02
@rpardini rpardini marked this pull request as ready for review June 9, 2024 09:02
@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 08 Milestone: Third quarter release labels Jun 9, 2024
@igorpecovnik igorpecovnik merged commit 3ac7c64 into armbian:main Jun 9, 2024
15 of 16 checks passed
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/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

2 participants