April 2024 - U-Boot

[PATCH 1/1] Makefile: don't add -Wno-maybe-uninitialized twice
by Heinrich Schuchardt 30 Apr '24

30 Apr '24

Avoid adding the same flag to KBUILD_CFLAGS twice. Fixes: 8602d97ca2cf ("Makefile: avoid false positive -Wmaybe-uninitialized") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7321fe1499e..47f3ec82b87 100644 --- a/Makefile +++ b/Makefile @@ -717,7 +717,7 @@ KBUILD_CFLAGS += -O2 endif ifdef CONFIG_CC_OPTIMIZE_FOR_DEBUG -KBUILD_CFLAGS += -Og -Wno-maybe-uninitialized +KBUILD_CFLAGS += -Og # Avoid false positives -Wmaybe-uninitialized # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394 KBUILD_CFLAGS += -Wno-maybe-uninitialized -- 2.43.0

3 2

[PATCH v1] arm: dts: k3-am625-verdin: add tifsstub to tispl.bin
by Francesco Dolcini 30 Apr '24

30 Apr '24

From: Parth Pancholi <parth.pancholi(a)toradex.com> Adds tifsstub binaries, this is required for deepsleep functionality. This implements the same change as commit 128f81290b7d ("arm: dts: k3: binman: am625: add support for signing TIFSSTUB Images") did for TI AM62 SK board. Signed-off-by: Parth Pancholi <parth.pancholi(a)toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 140 +++++++++++++++++- 1 file changed, 138 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index 6f5845024f27..a9b86b61e53e 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -150,12 +150,107 @@ filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; }; }; + + tifsstub-hs { + filename = "tifsstub.bin_hs"; + ti-secure-rom { + content = <&tifsstub_hs_cert>; + core = "secure"; + load = <0x40000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "custMpk.pem"; + countersign; + tifsstub; + }; + tifsstub_hs_cert: tifsstub-hs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_hs_enc: tifsstub-hs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + }; + + tifsstub-fs { + filename = "tifsstub.bin_fs"; + tifsstub_fs_cert: tifsstub-fs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_fs_enc: tifsstub-fs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + + }; + + tifsstub-gp { + filename = "tifsstub.bin_gp"; + ti-secure-rom { + content = <&tifsstub_gp>; + core = "secure"; + load = <0x60000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "ti-degenerate-key.pem"; + tifsstub; + }; + tifsstub_gp: tifsstub-gp.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; + type = "blob-ext"; + optional; + }; + }; + ti-spl { insert-template = <&ti_spl_template>; fit { images { + tifsstub-hs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + + tifsstub-fs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + + tifsstub-gp { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { ti-secure { content = <&dm>; @@ -187,7 +282,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf"; - loadables = "tee", "dm", "spl"; + loadables = "tee", "tifsstub-hs", "tifsstub-fs", + "tifsstub-gp", "dm", "spl"; fdt = "fdt-0"; }; }; @@ -243,6 +339,45 @@ fit { images { + tifsstub-hs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + + tifsstub-fs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + + tifsstub-gp { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { ti-dm { filename = "ti-dm.bin"; @@ -266,7 +401,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf"; - loadables = "tee", "dm", "spl"; + loadables = "tee", "tifsstub-hs", "tifsstub-fs", + "tifsstub-gp", "dm", "spl"; fdt = "fdt-0"; }; }; -- 2.39.2

3 2

[GIT PULL] Please pull u-boot-pmic master
by Jaehoon Chung 29 Apr '24

29 Apr '24

Dear Tom, Please pull u-boot-pmic master into u-boot master branch. If there is a problem, let me know, plz Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-pmic/-/pipelines/20569 The following changes since commit 174ac987655c888017c82df1883c0c2ea0dc2495: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-mmc (2024-04-26 07:39:18 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-pmic.git master for you to fetch changes up to 17fd67aedde714556895a0d39431f482accd0cc3: power: pmic: tps65941: Update compatible to aling with kernel DT (2024-04-29 09:20:51 +0900) ---------------------------------------------------------------- Bhargav Raviprakash (5): power: tps65941: Add macros of TPS65224 PMIC power: pmic: tps65941: Add TI TPS65224 PMIC power: regulator: tps65941: Added macros for BUCK ID power: regulator: tps65941: use function callbacks for conversion ops power: regulator: tps65941: Add TPS65224 PMIC regulator support Udit Kumar (1): power: pmic: tps65941: Update compatible to aling with kernel DT drivers/power/pmic/tps65941.c | 4 + drivers/power/regulator/tps65941_regulator.c | 381 ++++++++++++++++++++++++--- include/power/tps65941.h | 30 +++ 3 files changed, 384 insertions(+), 31 deletions(-)

2 1

[GIT PULL] Please pull u-boot-imx-master-20240429
by Fabio Estevam 29 Apr '24

29 Apr '24

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 174ac987655c888017c82df1883c0c2ea0dc2495: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-mmc (2024-04-26 07:39:18 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20240429 for you to fetch changes up to 37e50627efacd8dae18b564e9d8886a033e181bc: ARM: dts: imx: Convert i.MX8M flash.bin image generation to binman (2024-04-28 12:10:13 -0300) u-boot-imx-master-20240429 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20563 - Fix missing fdt_fixup on colibri-imx(6ull|imx7). - Enable PCIe and NVMe on DH i.MX8M Plus DHCOM PDK3. - Convert i.MX8M flash.bin image generation to binman - Convert imx93-11x11-evk to OF_UPSTREAM. ---------------------------------------------------------------- Francesco Dolcini (1): board: toradex: colibri-imx(6ull|imx7): Fix missing fdt_fixup boot error Marek Vasut (4): ARM: dts: imx: Enable PCIe and NVMe on DH i.MX8M Plus DHCOM PDK3 binman: Add nxp_imx8mimage etype ARM: dts: imx: Switch Ronetix iMX8MQ-CM to imx8mq-u-boot.dtsi ARM: dts: imx: Convert i.MX8M flash.bin image generation to binman Peng Fan (2): dt-bindings: imx93: sync clock header imx: imx93-11x11-evk: convert to OF_UPSTREAM arch/arm/dts/Makefile | 1 - arch/arm/dts/imx8mm-u-boot.dtsi | 126 ++++------ arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi | 8 +- arch/arm/dts/imx8mn-u-boot.dtsi | 147 +++++------ arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi | 12 + arch/arm/dts/imx8mp-dhcom-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-u-boot.dtsi | 96 +++---- arch/arm/dts/imx8mq-cm-u-boot.dtsi | 111 +------- arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi | 15 +- arch/arm/dts/imx8mq-u-boot.dtsi | 109 ++++---- arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 +++++++++ arch/arm/dts/imx93-11x11-evk.dts | 322 ------------------------ arch/arm/dts/imx93-u-boot.dtsi | 15 ++ arch/arm/mach-imx/imx9/Kconfig | 1 + configs/colibri-imx6ull_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/imx8mp_dhcom_pdk3_defconfig | 5 + configs/imx93_11x11_evk_defconfig | 2 +- configs/imx93_11x11_evk_ld_defconfig | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/dt-bindings/clock/imx93-clock.h | 3 +- tools/binman/etype/nxp_imx8mimage.py | 74 ++++++ 24 files changed, 437 insertions(+), 740 deletions(-) delete mode 100644 arch/arm/dts/imx93-11x11-evk.dts create mode 100644 tools/binman/etype/nxp_imx8mimage.py

2 1

[PATCH v2 0/6] mtd: Make sure UBIFS does not do multi-pass page programming on flashes that don't support it
by tkuw584924＠gmail.com 29 Apr '24

29 Apr '24

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> This series is equivalent to the one for Linux MTD submitted by Pratyush Yadav. https://patchwork.ozlabs.org/project/linux-mtd/list/?series=217759&state=* Changes in v2: - Fix an issue in setting macronix_octal_fixups - Rework fixup hooks Takahiro Kuwano (6): mtd: ubi: Do not zero out EC and VID on ECC-ed NOR flashes mtd: spi-nor: Allow flashes to specify MTD writesize mtd: spi-nor: Check nor->info before setting macronix_octal_fixups mtd: spi-nor: Replace default_init() hook with late_init() mtd: spi-nor: Call spi_nor_post_sfdp_fixups() only after spi_nor_parse_sfdp() mtd: spi-nor: Set ECC unit size to MTD writesize in Infineon SEMPER flashes drivers/mtd/spi/spi-nor-core.c | 88 +++++++++++++++++++++------------- drivers/mtd/ubi/build.c | 4 +- drivers/mtd/ubi/io.c | 9 +++- include/linux/mtd/spi-nor.h | 1 + 4 files changed, 65 insertions(+), 37 deletions(-) -- 2.34.1

3 12

Usage of fdt_addr vs fdt_addr_r
by Wadim Egorov 29 Apr '24

29 Apr '24

Hi, there are multiple definitions of fdt_addr and fdt_addr_r: usage/environment.rst: Tells us fdt_addr is in flash location and _r in RAM develop/distro.rst: fdt_addr -> Mandatory for any system that provides the DTB in HW (e.g. ROM) I also noticed that bootmeth_efi.c/distro_efi_try_bootflow_files() will copy the dtb it has found into fdt_addr_r. But efi_install_fdt() try to load first from fdt_addr. Shouldn't they use the same environment variable? Doing so would allow efiboot to use the dtb it has detected using bootflow. Right now it seems to fallback to fdtcontroladdr. Regards, Wadim

1 0

[PATCH v2 1/3] binman: Add nxp_imx8mimage etype
by Marek Vasut 29 Apr '24

29 Apr '24

Add new binman etype derived from mkimage etype which generates configuration input file for mkimage -T imx8mimage, and runs the mkimage on input data. The mkimage -T imx8mimage is used to generate combined image with SPL and DDR PHY blobs which is bootable on i.MX8M. The configuration file generated here is equivalent of imx8mimage.cfg, which is the file passed to '$ mkimage -T imx8mimage -n imx8mimage.cfg ...' . The settings generated into the imx8mimage.cfg file are configured via supported binman DT properties, nxp,boot-from, nxp,loader-address, nxp,rom-version. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Adam Ford <aford173(a)gmail.com> Cc: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> Cc: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> Cc: Angus Ainslie <angus(a)akkea.ca> Cc: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Francesco Dolcini <francesco.dolcini(a)toradex.com> Cc: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Eichenberger <stefan.eichenberger(a)toradex.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: kernel(a)puri.sm Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- V2: Fix pylint errors --- tools/binman/etype/nxp_imx8mimage.py | 74 ++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 tools/binman/etype/nxp_imx8mimage.py diff --git a/tools/binman/etype/nxp_imx8mimage.py b/tools/binman/etype/nxp_imx8mimage.py new file mode 100644 index 00000000000..3585120b79b --- /dev/null +++ b/tools/binman/etype/nxp_imx8mimage.py @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2023-2024 Marek Vasut <marex(a)denx.de> +# Written with much help from Simon Glass <sjg(a)chromium.org> +# +# Entry-type module for generating the i.MX8M mkimage -T imx8mimage +# configuration file and invocation of mkimage -T imx8mimage on the +# configuration file and input data. +# + +from collections import OrderedDict + +from binman.entry import Entry +from binman.etype.mkimage import Entry_mkimage +from binman.etype.section import Entry_section +from binman import elf +from dtoc import fdt_util +from u_boot_pylib import tools + +class Entry_nxp_imx8mimage(Entry_mkimage): + """NXP i.MX8M imx8mimage .cfg file generator and mkimage invoker + + Properties / Entry arguments: + - nxp,boot-from - device to boot from (e.g. 'sd') + - nxp,loader-address - loader address (SPL text base) + - nxp,rom-version - BootROM version ('2' for i.MX8M Nano and Plus) + """ + + def __init__(self, section, etype, node): + super().__init__(section, etype, node) + self.required_props = ['nxp,boot-from', 'nxp,rom-version', 'nxp,loader-address'] + + def ReadNode(self): + super().ReadNode() + self.boot_from = fdt_util.GetString(self._node, 'nxp,boot-from') + self.loader_address = fdt_util.GetInt(self._node, 'nxp,loader-address') + self.rom_version = fdt_util.GetInt(self._node, 'nxp,rom-version') + self.ReadEntries() + + def BuildSectionData(self, required): + data, input_fname, uniq = self.collect_contents_to_file( + self._entries.values(), 'input') + # Generate mkimage configuration file similar to imx8mimage.cfg + # and pass it to mkimage to generate SPL image for us here. + cfg_fname = tools.get_output_filename('nxp.imx8mimage.cfg.%s' % uniq) + with open(cfg_fname, 'w') as outf: + print('ROM_VERSION v%d' % self.rom_version, file=outf) + print('BOOT_FROM %s' % self.boot_from, file=outf) + print('LOADER %s %#x' % (input_fname, self.loader_address), file=outf) + + output_fname = tools.get_output_filename(f'cfg-out.{uniq}') + args = ['-d', input_fname, '-n', cfg_fname, '-T', 'imx8mimage', + output_fname] + if self.mkimage.run_cmd(*args) is not None: + return tools.read_file(output_fname) + else: + # Bintool is missing; just use the input data as the output + self.record_missing_bintool(self.mkimage) + return data + + def SetImagePos(self, image_pos): + # Customized SoC specific SetImagePos which skips the mkimage etype + # implementation and removes the 0x48 offset introduced there. That + # offset is only used for uImage/fitImage, which is not the case in + # here. + upto = 0x00 + for entry in super().GetEntries().values(): + entry.SetOffsetSize(upto, None) + + # Give up if any entries lack a size + if entry.size is None: + return + upto += entry.size + + Entry_section.SetImagePos(self, image_pos) -- 2.43.0

2 3

[PATCH 0/2] imx93-11x11-evk: Convert to OF_UPSTREAM
by Peng Fan (OSS) 29 Apr '24

29 Apr '24

From: Peng Fan <peng.fan(a)nxp.com> patch 1 is to avoid build break when using upstream dts Patch 2 is moving to OF_UPSTREAM This is a resend of V3 imx93: Conver to OF_UPSTREAM patch 5,6 Peng Fan (2): dt-bindings: imx93: sync clock header imx: imx93-11x11-evk: convert to OF_UPSTREAM arch/arm/dts/Makefile | 1 - arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 +++++++++ arch/arm/dts/imx93-11x11-evk.dts | 322 ----------------------- arch/arm/dts/imx93-u-boot.dtsi | 15 ++ arch/arm/mach-imx/imx9/Kconfig | 1 + configs/imx93_11x11_evk_defconfig | 2 +- configs/imx93_11x11_evk_ld_defconfig | 2 +- include/dt-bindings/clock/imx93-clock.h | 3 +- 8 files changed, 138 insertions(+), 326 deletions(-) delete mode 100644 arch/arm/dts/imx93-11x11-evk.dts -- 2.35.3

2 3

[PATCH] ARM: dts: imx: Enable PCIe and NVMe on DH i.MX8M Plus DHCOM PDK3
by Marek Vasut 29 Apr '24

29 Apr '24

Enable PCIe/NVMe support on DH i.MX8M Plus DHCOM PDK3. Except for the configuration options which are enabled, add slight adjustment to board u-boot.dtsi, which is necessary as there is currently no driver for the I2C PCIe clock generator. Since the generator is strapped to be always on, it is possible to supplant the generator functionality by fixed-clock. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi | 12 ++++++++++++ configs/imx8mp_dhcom_pdk3_defconfig | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi index 040f333c52d..b0b99d51856 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi @@ -4,3 +4,15 @@ */ #include "imx8mp-dhcom-u-boot.dtsi" + +/ { + clk_pcie100: clk-pcie100 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; +}; + +&pcie_phy { + clocks = <&clk_pcie100>; +}; diff --git a/configs/imx8mp_dhcom_pdk3_defconfig b/configs/imx8mp_dhcom_pdk3_defconfig index a42dc27aff8..019595edda8 100644 --- a/configs/imx8mp_dhcom_pdk3_defconfig +++ b/configs/imx8mp_dhcom_pdk3_defconfig @@ -31,6 +31,7 @@ CONFIG_ENV_OFFSET_REDUND=0xFF0000 CONFIG_IMX_BOOTAUX=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y @@ -104,6 +105,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_BKOPS_ENABLE=y CONFIG_CMD_MTD=y CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y CONFIG_CMD_READ=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -218,7 +220,10 @@ CONFIG_DWC_ETH_QOS_IMX=y CONFIG_FEC_MXC=y CONFIG_RGMII=y CONFIG_MII=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_IMX=y CONFIG_PHY_IMX8MQ_USB=y +CONFIG_PHY_IMX8M_PCIE=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_IMX8M=y -- 2.43.0

2 1

[PATCH v1] board: toradex: colibri-imx(6ull|imx7): Fix missing fdt_fixup boot error
by Francesco Dolcini 29 Apr '24

29 Apr '24

From: Francesco Dolcini <francesco.dolcini(a)toradex.com> In commit 51aaaf5e7975 ("board: toradex: imx: Remove not needed env variables") the empty definition of fdt_fixup variable was removed, however this was still referenced from the boot command leading to boot failures: ## Error: \"fdt_fixup\" not defined` Fix this by removing "run fdt_fixup" from the boot command and instead enable CONFIG_OF_ENV_SETUP in the defconfig that would achieve the same but in a more robust way (it works fine even if the variable is not defined). Fixes: 51aaaf5e7975 ("board: toradex: imx: Remove not needed env variables") Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- configs/colibri-imx6ull_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx7.h | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index fc10d7f66a60..4a0ff029ac75 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -18,6 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 +CONFIG_OF_ENV_SETUP=y CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb" diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 16f923b07c22..f2802b10fa8a 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 +CONFIG_OF_ENV_SETUP=y CONFIG_BOOTCOMMAND="run ubiboot ; echo ; echo ubiboot failed ; run distro_bootcmd;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb " diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7c9d633b68d9..8860ceec1a0a 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -53,7 +53,7 @@ "ubi part ubi &&" \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_NAND) /* Run Distro Boot script if ubiboot fails */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index c34f1f903df6..33133a0b96e1 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -94,7 +94,7 @@ "ubi part ubi && run m4boot && " \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) #define MODULE_EXTRA_ENV_SETTINGS \ -- 2.39.2

2 1