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

Jump to bottom

u-boot: update to 2023.10 #7365

Merged
merged 19 commits into from
Nov 5, 2023
Merged

u-boot: update to 2023.10 #7365

merged 19 commits into from
Nov 5, 2023

Conversation

heitbaum
Copy link
Contributor

@heitbaum heitbaum commented Jan 10, 2023 •
edited
Loading

[ANN] U-Boot v2023.01 released

[ANN] U-Boot v2023.04 released

[ANN] U-Boot v2023.07 released

[ANN] U-Boot v2023.10 released

Releases

  • U-Boot v2023.01 was released on Mon 9 January 2023.
  • U-Boot v2023.04 was released on Mon 3 April 2023.
  • U-Boot v2023.07 was released on Mon 10 July 2023.
  • U-Boot v2023.10 was released on Mon 2 October 2023.

Update u-boot (for all)

  • u-boot-tools: use u-boot download and version
  • u-boot: update to 2023.01
    • rebase Rockchip patch
    • drop upstreamed amlogic patches
    • Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
    • Rename CONFIG_DM_VIDEO to CONFIG_VIDEO
  • u-boot: update to 2023.04
    • rebase Allwinner patches
    • Add pyelftools
    • Drop upstream rockchip patches
    • Rebase rockchip patches
  • u-boot: update to 2023.10
    • rebase Allwinner patches
    • rebase Rockchip patch
    • Drop upstream Allwinner patch
    • Drop upstream Amlogic patches

Fixed

  • Rockchip rock-pi-4 and rock-pi-4-plus both fail with
    • HOSTCC tools/mkeficapsule
    • tools/mkeficapsule.c:21:10: fatal error: gnutls/gnutls.h: No such file or directory
    • 21 | #include <gnutls/gnutls.h>
    • | ^~~~~~~~~~~~~~~~~
    • compilation terminated.
  • Dragonboard build error with compiler flags
  • Amlogic ffmpeg build failing
  • iMX8 kernel build failing due to hdmi-dp changes

  • LibreELEC.tv/projects/Rockchip/bootloader/install

    Line 24 in b827992

    PKG_LOAD_ADDR=$(sed -n "/SYS_TEXT_BASE/s/#define CONFIG_SYS_TEXT_BASE //p" u-boot.cfg)
  • Rockchip - Wrote map file './simple-bin.map' to show errors
    binman: Node '/binman/simple-bin/fit': subnode 'images/@atf-SEQ': Failed to read ELF file: Python: No module named 'elftools'
  • Dragonboard build error occurs between 2022.07 and 2022.10-rc1 - still need to investigate.
  • update binman Allwinner patch

Issues

Build tested - 6.6-rc6 + u-boot 2023.10

PROJECT=Allwinner ARCH=aarch64 DEVICE=A64 make image
PROJECT=Allwinner ARCH=arm DEVICE=H3 make image
PROJECT=Allwinner ARCH=aarch64 DEVICE=H5 make image
PROJECT=Allwinner ARCH=aarch64 DEVICE=H6 make image
PROJECT=Allwinner ARCH=arm DEVICE=R40 make image
PROJECT=Amlogic ARCH=aarch64 DEVICE=AMLGX make image
PROJECT=NXP ARCH=arm DEVICE=iMX6 make image
PROJECT=NXP ARCH=aarch64 DEVICE=iMX8 make image
PROJECT=Qualcomm ARCH=aarch64 DEVICE=Dragonboard make image
PROJECT=Samsung ARCH=arm DEVICE=Exynos make image
PROJECT=Rockchip ARCH=arm DEVICE=RK3288 make image
PROJECT=Rockchip ARCH=arm DEVICE=RK3328 make image
PROJECT=Rockchip ARCH=arm DEVICE=RK3399 make image

Run testing - 6.6-rc6 + u-boot 2023.10

  • Allwinner all - tested - with H616 - jernejsk
  • Allwinner H6 (Tanix TX6) - TBA - heitbaum
  • Amlogic all - tested - 2023.10 - chewitt
  • NXP iMX6 (Cubox-i4Pro) - TBA - heitbaum
  • Samsung Exynos (Hardkernel ODROID XU4) - TBA - heitbaum

Images built @ Oct 22 2023

$ ls -1 target/*.img.gz

target/LibreELEC-A64.aarch64-12.0-devel-20231021123702-d93b153-orangepi-win.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021123702-d93b153-pine64.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021123702-d93b153-pine64-lts.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021123702-d93b153-pine64-plus.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-bananapi-m2-pro.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-bananapi-m2s.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-bananapi-m5.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-box.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-khadas-vim2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-khadas-vim3.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-khadas-vim3l.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-khadas-vim.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-lafrite.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-lepotato.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-nanopi-k2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-odroid-c2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-odroid-c4.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-odroid-hc4.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-odroid-n2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-radxa-zero2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-radxa-zero.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-wetek-core2.img.gz
target/LibreELEC-AMLGX.aarch64-12.0-devel-20231021124641-d93b153-wetek-play2.img.gz
target/LibreELEC-Dragonboard.aarch64-12.0-devel-20231021125922-d93b153-410c.img.gz
target/LibreELEC-Exynos.arm-12.0-devel-20231021130238-d93b153-odroid-xu3.img.gz
target/LibreELEC-Exynos.arm-12.0-devel-20231021130238-d93b153-odroid-xu4.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-bananapi-m2p.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-beelink-x2.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-libretech-h3.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-nanopi-m1.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-orangepi-2.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-orangepi-pc.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-orangepi-pc-plus.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-orangepi-plus2e.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021113946-d93b153-orangepi-plus.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021123423-d93b153-orangepi-pc2.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021123423-d93b153-tritium-h5.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021123555-d93b153-orangepi-pc2.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021123555-d93b153-tritium-h5.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-beelink-gs1.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-orangepi-3.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-orangepi-3-lts.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-orangepi-lite2.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-orangepi-one-plus.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-pine-h64.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-pine-h64-model-b.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021124026-d93b153-tanix-tx6.img.gz
target/LibreELEC-iMX6.arm-12.0-devel-20231021125252-d93b153-cubox.img.gz
target/LibreELEC-iMX6.arm-12.0-devel-20231021125252-d93b153-udoo.img.gz
target/LibreELEC-iMX6.arm-12.0-devel-20231021125252-d93b153-wandboard.img.gz
target/LibreELEC-iMX8.aarch64-12.0-devel-20231021125628-d93b153-mq-evk.img.gz
target/LibreELEC-iMX8.aarch64-12.0-devel-20231021125628-d93b153-pico-mq.img.gz
target/LibreELEC-R40.arm-12.0-devel-20231021124140-d93b153-bananapi-m2u.img.gz
target/LibreELEC-RK3288.arm-12.0-devel-20231021130645-d93b153-miqi.img.gz
target/LibreELEC-RK3288.arm-12.0-devel-20231021130645-d93b153-tinker.img.gz
target/LibreELEC-RK3328.arm-12.0-devel-20231021134957-10121dd-a1.img.gz
target/LibreELEC-RK3328.arm-12.0-devel-20231021134957-10121dd-roc-cc.img.gz
target/LibreELEC-RK3328.arm-12.0-devel-20231021134957-10121dd-rock64.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-hugsun-x99.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-khadas-edge.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-nanopc-t4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-nanopi-m4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-orangepi.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-rock960.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-rock-pi-4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-rock-pi-4-plus.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-rock-pi-n10.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-rockpro64.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-roc-pc.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-roc-pc-plus.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021135000-10121dd-sapphire.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-hugsun-x99.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-khadas-edge.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-nanopc-t4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-nanopi-m4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-orangepi.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-rock960.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-rock-pi-4.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-rock-pi-4-plus.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-rock-pi-n10.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-rockpro64.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-roc-pc.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-roc-pc-plus.img.gz
target/LibreELEC-RK3399.arm-12.0-devel-20231021203203-10121dd-sapphire.img.gz

=== tested on ===

@knaerzche
Copy link
Contributor

Rockchip rock-pi-4 and rock-pi-4-plus both fail with
HOSTCC tools/mkeficapsule
tools/mkeficapsule.c:21:10: fatal error: gnutls/gnutls.h: No such file or directory
21 | #include <gnutls/gnutls.h>
| ^~~~~~~~~~~~~~~~~
compilation terminated.

Since don't use / want uefi support, adding

# CONFIG_TOOLS_MKEFICAPSULE is not set

to projects/Rockchip/bootloader/config should fix it.

@heitbaum
Copy link
Contributor Author

Rockchip rock-pi-4 and rock-pi-4-plus both fail with
HOSTCC tools/mkeficapsule
tools/mkeficapsule.c:21:10: fatal error: gnutls/gnutls.h: No such file or directory
21 | #include <gnutls/gnutls.h>
| ^~~~~~~~~~~~~~~~~
compilation terminated.

Since don't use / want uefi support, adding

# CONFIG_TOOLS_MKEFICAPSULE is not set

to projects/Rockchip/bootloader/config should fix it.

Thank you. Added the commit.

@heitbaum
Copy link
Contributor Author

@knaerzche - any guidance on what this needs to be updated with:

LibreELEC.tv/projects/Rockchip/bootloader/install

Line 24 in b827992

PKG_LOAD_ADDR=$(sed -n "/SYS_TEXT_BASE/s/#define CONFIG_SYS_TEXT_BASE //p" u-boot.cfg)

@knaerzche
Copy link
Contributor

knaerzche commented Jan 20, 2023 •
edited
Loading

@knaerzche - any guidance on what this needs to be updated with:

LibreELEC.tv/projects/Rockchip/bootloader/install

Line 24 in b827992

PKG_LOAD_ADDR=$(sed -n "/SYS_TEXT_BASE/s/#define CONFIG_SYS_TEXT_BASE //p" u-boot.cfg)

These have been replaced in u-boot-2023-01 - as you wrote, so this should get

PKG_LOAD_ADDR=$(sed -n "/CONFIG_TEXT_BASE/s/#define CONFIG_TEXT_BASE //p" u-boot.cfg)

pls remember also #7365 (comment)

@heitbaum heitbaum changed the title u-boot: update to 2023.01 u-boot: update to 2023.04 Apr 4, 2023
@antonlacon
Copy link
Contributor

Rockchip - Wrote map file './simple-bin.map' to show errors
binman: Node '/binman/simple-bin/fit': subnode 'images/@atf-SEQ': Failed to read ELF file: Python: No module named 'elftools'

First commit of https://github.com/antonlacon/LibreELEC.tv/commits/pyelftools should add pyelftools resolving that. Last two commits add pyelftools:host to uboot depends, and drops what I believe are upstreamed rockchip patches, respectively.

Built test Rockchip/RK3399/arm make image. No hardware to run test.

@Kwiboo
Copy link
Member

Kwiboo commented Apr 29, 2023

My PR heitbaum#26 to this PR should fix Rockchip issues, please pick my or @antonlacon commits

@CvH
Copy link
Member

CvH commented Apr 29, 2023

@heitbaum pls pick antonlacon@d9cdf3b
that includes the licence stuff and has the LE licence header correct

@Kwiboo Kwiboo mentioned this pull request May 21, 2023
Draft
@heitbaum heitbaum force-pushed the u-boot branch 2 times, most recently from ee88830 to 6e3ecc3 Compare October 21, 2023 09:56
@heitbaum heitbaum changed the title u-boot: update to 2023.04 u-boot: update to 2023.10 Oct 21, 2023
@jernejsk
Copy link
Member

Please reinstate patch for AW, this is new version: http://ix.io/4JAV

antonlacon and others added 3 commits October 21, 2023 21:04
@antonlacon @heitbaum
pyelftools: initial commit
e2275e9 
Signed-off-by: Ian Leonard <[email protected]>
@Kwiboo @heitbaum
u-boot: depend on pyelftools
a5a6a9f
@heitbaum
u-boot: Rename CONFIG_DM_VIDEO to CONFIG_VIDEO
60bbff0 
As part of v2023.01 CONFIG_DM_VIDEO has been renamed to CONFIG_VIDEO
- u-boot/u-boot@b86986c
@heitbaum
u-boot: Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
8f1fac6 
As part of v2023.01 CONFIG_SYS_TEXT_BASE has been renamed to CONFIG_TEXT_BASE
- u-boot/u-boot@9846390
jernejsk and others added 15 commits October 21, 2023 21:25
@jernejsk @heitbaum
u-boot (Allwinner): update binman patch
c4fa4d8 
u-boot/u-boot@571bc4e
u-boot/u-boot@9766f69
@heitbaum
u-boot (Allwinner): rebase patches for 2023.04
0e11663
@heitbaum
u-boot (Allwinner): drop upstreamed patches in 2023.10
2046873
@heitbaum
u-boot (Allwinner): rebase patches for 2023.10
026b0ce 
ref:
- u-boot/u-boot@9a4aa31
@heitbaum
u-boot (Amlogic): drop upstreamed patches in 2023.04
b09b8d8
@heitbaum
u-boot (Amlogic): documentation only patches dont apply cleanly - dro…
2ffa89b 
…p them
@heitbaum
u-boot (Amlogic): drop upstreamed patches for 2023.10
0779a1f
@heitbaum
u-boot (NXP iMX8): rebase for 2023.04
bfc92ad
@heitbaum
u-boot (Rockchip): rebase patches for 2023.01
bcef4bf
@knaerzche @heitbaum
u-boot (Rockchip): do not build TOOLS_MKEFICAPSULE
a34e611
@Kwiboo @heitbaum
u-boot (Rockchip): drop upstreamed patches in 2023.04
d16106b
@Kwiboo @heitbaum
u-boot (Rockchip): do not build EFI_LOADER
cfc97dc
@heitbaum
u-boot (Rockchip): rebase patch for 2023.10
0e14168
@heitbaum
bootloader/install (Rockchip): update PKG_LOAD_ADDR to match u-boot 2…
5818da3 
…023.01
@heitbaum
u-boot: update to 2023.10
36506ed
@heitbaum heitbaum marked this pull request as ready for review October 21, 2023 21:32
@heitbaum
Copy link
Contributor Author

Please reinstate patch for AW, this is new version: http://ix.io/4JAV

Done, and reran the Allwinner build test.

$ ls -1 target/*.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021211139-e3f5873-orangepi-win.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021211139-e3f5873-pine64.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021211139-e3f5873-pine64-lts.img.gz
target/LibreELEC-A64.aarch64-12.0-devel-20231021211139-e3f5873-pine64-plus.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-bananapi-m2p.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-beelink-x2.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-libretech-h3.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-nanopi-m1.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-orangepi-2.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-orangepi-pc.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-orangepi-pc-plus.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-orangepi-plus2e.img.gz
target/LibreELEC-H3.arm-12.0-devel-20231021211458-e3f5873-orangepi-plus.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021211405-e3f5873-orangepi-pc2.img.gz
target/LibreELEC-H5.aarch64-12.0-devel-20231021211405-e3f5873-tritium-h5.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-beelink-gs1.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-orangepi-3.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-orangepi-3-lts.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-orangepi-lite2.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-orangepi-one-plus.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-pine-h64.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-pine-h64-model-b.img.gz
target/LibreELEC-H6.aarch64-12.0-devel-20231021211419-e3f5873-tanix-tx6.img.gz
target/LibreELEC-R40.arm-12.0-devel-20231021211517-e3f5873-bananapi-m2u.img.gz

I have cleaned up the commit comments and reordered them logically. So setting the PR as ready for review. I’ll leave it Merge Blocked till testing results come in.

@jernejsk
Copy link
Member

I tested this on H616, when working on new SoC support, and looks good.

@jernejsk jernejsk merged commit 4bb1203 into LibreELEC:master Nov 5, 2023
@heitbaum heitbaum deleted the u-boot branch November 5, 2023 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jernejsk jernejsk jernejsk approved these changes

Assignees
No one assigned
Labels
ALLWINNER AMLOGIC LE 12.0 MERGE BLOCKED NXP PACKAGE ROCKCHIP SAMSUNG UPDATE
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@heitbaum @knaerzche @antonlacon @Kwiboo @CvH @jernejsk @chewitt