Skip to content

machine: imx8mpsolidrun: copy DTBs to vendor subfolder for generic uboot #36

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

Closed
Josua-SR wants to merge 2 commits into from
Closed

machine: imx8mpsolidrun: copy DTBs to vendor subfolder for generic uboot #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34eed2d
machine: imx8mpsolidrun: copy DTBs to vendor subfolder for generic uboot
Josua-SR Jul 27, 2025
11f7ada
machine: imx8mpsolidrun: update uboot fdtfile vendor prefix
Josua-SR Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions conf/machine/imx8mpsolidrun.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ KERNEL_DEVICETREE ?= " \
freescale/imx8mp-hummingboard-pulse.dtb \
freescale/imx8mp-hummingboard-ripple.dtb \
"
# HACK: place copy of kernel dtb in vendor subfolder as expected by u-boot
IMAGE_BOOT_FILES:append:imx8mp-solidrun = " \
imx8mp-cubox-m.dtb;freescale/imx8mp-cubox-m.dtb \
imx8mp-hummingboard-extended.dtb;freescale/imx8mp-hummingboard-extended.dtb \
imx8mp-hummingboard-iiot-main.dtb;freescale/imx8mp-hummingboard-iiot-main.dtb \
imx8mp-hummingboard-mate.dtb;freescale/imx8mp-hummingboard-mate.dtb \
imx8mp-hummingboard-pro.dtb;freescale/imx8mp-hummingboard-pro.dtb \
imx8mp-hummingboard-pulse.dtb;freescale/imx8mp-hummingboard-pulse.dtb \
imx8mp-hummingboard-ripple.dtb;freescale/imx8mp-hummingboard-ripple.dtb \
"

WKS_FILE_DEPENDS:append:imx8mp-solidrun = " imx-m7-demos"
IMAGE_BOOT_FILES:append:imx8mp-solidrun = " \
Expand Down
32 changes: 32 additions & 0 deletions recipes-bsp/u-boot/u-boot-imx/0035-board-imx8mp-solidrun-re-add-fdtfile-vendor-prefix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 698f2ebcde7fb9f74a0c3bebb6dc84873cd9b22d Mon Sep 17 00:00:00 2001
From: Josua Mayer <[email protected]>
Date: Wed, 13 Dec 2023 11:16:14 +0100
Subject: [PATCH] board: imx8mp-solidrun: re-add fdtfile vendor prefix

It is convention in all mainline distributions to prefix fdtfile
varible with the soc vendor.

Revert "imx8mp-solidrun: For yocto only pass the fdtfile",
which as the commit message suggests was not intended to be merged.

Signed-off-by: Josua Mayer <[email protected]>
---
board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
index 2b5eef0d4c..4c17eea5e4 100644
--- a/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
+++ b/board/solidrun/imx8mp_solidrun/imx8mp_solidrun.c
@@ -616,7 +616,7 @@ int board_late_init(void)

// auto-select device-tree
if (!env_get("fdtfile")) {
- if(snprintf(fdtfile, sizeof(fdtfile), "%s-%s.dtb", board_id.som_name, board_id.carrier_name) >= sizeof(fdtfile)) {
+ if(snprintf(fdtfile, sizeof(fdtfile), "freescale/%s-%s.dtb", board_id.som_name, board_id.carrier_name) >= sizeof(fdtfile)) {
pr_err("%s: buffer too small, fdtfile truncated!\n", __func__);
}
env_set("fdtfile", fdtfile);
--
2.35.3

1 change: 1 addition & 0 deletions recipes-bsp/u-boot/u-boot-imx_2022.04.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ SRC_URI += " \
file://0032-net-phy-genphy_config-disable-BMCR_PDOWN-if-set.patch \
file://0033-board-solidrun-imx8mp-fix-mac-address-calculation.patch \
file://0034-board-solidrun-imx8mp-enable-second-on-soc-ethernet.patch \
file://0035-board-imx8mp-solidrun-re-add-fdtfile-vendor-prefix.patch \
file://0036-configs-imx8mp-solidrun-move-environment-to-fit-with.patch \
file://0037-net-fec_mxc-add-weak-implementation-of-board_get_mac.patch \
file://0038-board-solidrun-imx8mp-Add-HummingBoard-IIOT-tlv-base.patch \
Expand Down
Loading