January 2023 - U-Boot

[PATCH 1/1] cmd: move CONFIG_SYS_MEMTEST_START/END to cmd/Kconfig
by Heinrich Schuchardt 27 Jan '23

27 Jan '23

These symbols are not specific to Keymile boards. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- board/keymile/km83xx/Kconfig | 6 ------ cmd/Kconfig | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig index f87a2e6416..014dde37cf 100644 --- a/board/keymile/km83xx/Kconfig +++ b/board/keymile/km83xx/Kconfig @@ -14,12 +14,6 @@ config KM_ENABLE_FULL_DM_DTS_SUPPORT select PHYLIB endmenu -config SYS_MEMTEST_START - default 0x00100000 - -config SYS_MEMTEST_END - default 0x00f00000 - if TARGET_KMETER1 config SYS_BOARD diff --git a/cmd/Kconfig b/cmd/Kconfig index 4fe2c75de2..bffb19924d 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -837,6 +837,14 @@ config CMD_MEMTEST if CMD_MEMTEST +config SYS_MEMTEST_START + default 0x00100000 if SYS_BOARD="km83xx" + default TEXT_BASE + +config SYS_MEMTEST_END + default 0x00f00000 if SYS_BOARD="km83xx" + default TEXT_BASE + config SYS_ALT_MEMTEST bool "Alternative test" help -- 2.38.1

2 1

[PATCH v6 0/3] Timer support for ARM Tegra
by Svyatoslav Ryhel 27 Jan '23

27 Jan '23

- ARM: tegra: remap clock_osc_freq for all Tegra family Enum clock_osc_freq was designed to use only with T20. This patch remaps it to use additional frequencies, added in T30+ SoC while maintaining backwards compatibility with T20. - drivers: timer: add timer driver for ARMv7 based Tegra devices Add timer support for T20/T30/T114 and T124 based devices. Driver is based on DM, has device tree support and can be used on SPL and early boot stage. - ARM: tegra: include timer as default option Enable TIMER as default option for all Tegra devices and enable TEGRA_TIMER for TEGRA_ARMV7_COMMON. Additionally enable SPL_TIMER if build as SPL part and drop deprecated configs from common header. P. S. I have no arm64 Tegra and according to comment in tegra-common.h Use the Tegra US timer on ARMv7, but the architected timer on ARMv8. Svyatoslav Ryhel (3): ARM: tegra: remap clock_osc_freq for all Tegra family drivers: timer: add timer driver for ARMv7 based Tegra devices ARM: tegra: include timer as default option arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-tegra/clock.h | 9 +- arch/arm/mach-tegra/Kconfig | 2 + arch/arm/mach-tegra/clock.c | 17 +++- arch/arm/mach-tegra/cpu.c | 70 ++++++++++--- arch/arm/mach-tegra/tegra114/clock.c | 13 +-- arch/arm/mach-tegra/tegra124/clock.c | 13 +-- arch/arm/mach-tegra/tegra20/clock.c | 4 +- arch/arm/mach-tegra/tegra210/clock.c | 22 +---- arch/arm/mach-tegra/tegra30/clock.c | 10 +- drivers/timer/Kconfig | 8 ++ drivers/timer/Makefile | 1 + drivers/timer/tegra-timer.c | 126 ++++++++++++++++++++++++ drivers/usb/host/ehci-tegra.c | 46 +++++++-- include/configs/tegra-common.h | 6 -- 15 files changed, 269 insertions(+), 79 deletions(-) create mode 100644 drivers/timer/tegra-timer.c -- 2.37.2

4 17

Pull request: u-boot-spi/master
by Jagan Teki 26 Jan '23

26 Jan '23

Hi Tom, Please pull this PR. Summary: - fix return code of sf command (Heinrich) - fix register reads in STIG Mode (Dhruva) - Infineon s25fs256t support (Takahiro) CI: https://source.denx.de/u-boot/custodians/u-boot-spi/-/pipelines/14893 thanks, Jagan. The following changes since commit 17e8e58fe62c019b2cc26af221b6defc3368229f: Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi (2023-01-24 21:07:01 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-spi master for you to fetch changes up to 87a6d86571268be4e354fe030c53745a54f4ed8e: mtd: spi-nor: Add support for Infineon s25fs256t (2023-01-26 21:07:45 +0530) ---------------------------------------------------------------- Dhruva Gole (2): spi: cadence_qspi: setup ADDR Bits in cmd reads spi: cadence_qspi: use STIG mode for small reads Heinrich Schuchardt (3): cmd: fix return code of 'sf write' and 'sf read' cmd: simplify do_spi_flash() cmd: fix return code of 'sf erase' Kunihiko Hayashi (1): spi: Add Socionext F_OSPI SPI flash controller driver Pengfei Fan (2): drivers: spi: fix some typos drivers: spi: sh_qspi.c: Use log_warning() instead of printf() Takahiro Kuwano (4): mtd: spi-nor-core: Consider reserved bits in CFR5 register mtd: spi-nor-core: Make CFRx reg fields generic mtd: spi-nor: Rename s25hx_t prefix mtd: spi-nor: Add support for Infineon s25fs256t cmd/sf.c | 45 ++- drivers/mtd/spi/spi-nor-core.c | 95 ++++-- drivers/mtd/spi/spi-nor-ids.c | 2 + drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/bcm63xx_hsspi.c | 2 +- drivers/spi/cadence_qspi.c | 10 +- drivers/spi/cadence_qspi_apb.c | 13 + drivers/spi/fsl_dspi.c | 4 +- drivers/spi/mtk_snfi_spi.c | 4 +- drivers/spi/mvebu_a3700_spi.c | 2 +- drivers/spi/omap3_spi.c | 2 +- drivers/spi/rk_spi.c | 2 +- drivers/spi/sh_qspi.c | 4 +- drivers/spi/spi-aspeed-smc.c | 4 +- drivers/spi/spi-qup.c | 2 +- drivers/spi/spi-sifive.c | 2 +- drivers/spi/spi-sn-f-ospi.c | 686 +++++++++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 14 +- 19 files changed, 824 insertions(+), 78 deletions(-) create mode 100644 drivers/spi/spi-sn-f-ospi.c

2 1

[PATCH v2 0/1] CMD commands improvements
by Svyatoslav Ryhel 26 Jan '23

26 Jan '23

- add ability for 'ums' command to interrupt run of usb mass storage with any key. This is especially useful on devices with limited input capabilities like tablets and smatphones which have only gpio keys in direct access. Current implementation uses Kconfig entry. Changelog from V1 - 'continue' command commit was dropped as there already exists 'pause' command with same function. - UMS_ABORT_KEYED renamed to CMD_UMS_ABORT_KEYED Svyatoslav Ryhel (1): cmd: ums: abort mounting by pressing any key cmd/Kconfig | 6 ++++++ cmd/usb_mass_storage.c | 9 +++++++++ 2 files changed, 15 insertions(+) -- 2.25.1

1 1

[PATCH 0/4] rockchip: Align FIT images to SD/MMC block length
by Jonas Karlman 26 Jan '23

26 Jan '23

When I was trying to run mainline U-Boot on my new Rockchip RK3568 board I discovered that one segment of vendor TF-A could not successfully be loaded into SRAM, validation of the image sha256 hash failed. The issue with loading the data turned out to be because of how SPL load FIT images. It reads data aligned to block length. Aligned image data is read directly to the load address. Unaligned image data is written to an offset of the load address and then memcpy to the load address. The segment of the TF-A that failed to load is a 8KiB segment that should be loaded into the 8KiB PMU SRAM. Because this segment was unaligned to the SD/MMC block length the segment was written to and memcpy from beyond the SRAM boundary, in the end this results in invalid data in SRAM. Vendor u-boot has worked around this issue by using a bounce buffer for any load address that is not in the gd->ram_base - gd->ram_top range. However, by passing -B 200 to mkimage we can work around this issue becuase the FIT and its external data ends up being aligned to SD/MMC block length. This series adds support for a fit,align property in binman and makes use of this new property in rockchip-u-boot.dtsi. It also adds image hash to the FIT images when configured with CONFIG_SPL_FIT_SIGNATURE=y. This series builds on top of Simon Glass "binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script" v9 series at [1]. [1] https://patchwork.ozlabs.org/project/uboot/list/?series=335487 Jonas Karlman (4): binman: Add support for align argument to mkimage tool rockchip: Align FIT image data to SD/MMC block length binman: Add subnodes to the nodes generated by split-elf rockchip: Add sha256 hash to FIT images arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++++++++++++++++++ tools/binman/btool/mkimage.py | 5 ++++- tools/binman/etype/fit.py | 17 +++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) -- 2.39.0

2 38

[PATCH] dm: core: Use full printf() format when possible
by Samuel Holland 26 Jan '23

26 Jan '23

Use a more accurate check for determining if the full format string will be handled correctly, since SPL_USE_TINY_PRINTF can be disabled. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- drivers/core/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 1c1f7e4d30..4997862478 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -17,7 +17,7 @@ static void show_devices(struct udevice *dev, int depth, int last_flag) u32 flags = dev_get_flags(dev); /* print the first 20 characters to not break the tree-format. */ - printf(IS_ENABLED(CONFIG_SPL_BUILD) ? " %s %d [ %c ] %s " : + printf(CONFIG_IS_ENABLED(USE_TINY_PRINTF) ? " %s %d [ %c ] %s " : " %-10.10s %3d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, dev_get_uclass_index(dev, NULL), flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name); -- 2.37.4

2 2

[PATCH] binman: Fix a test-coverage regression
by Simon Glass 26 Jan '23

26 Jan '23

Unfortunately a recent patch snuck through without the require test coverage. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> Fixes: 571bc4e67d3 ("binman: Support positioning an entry by and ELF symbol") --- tools/binman/elf_test.py | 13 ++++++++++++- tools/binman/entry_test.py | 19 +++++++++++++++++++ tools/binman/test/embed_data.c | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index 082a3e1d28c..8cb55ebb815 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -242,7 +242,7 @@ class TestElf(unittest.TestCase): end = offset['embed_end'].offset data = tools.read_file(fname) embed_data = data[start:end] - expect = struct.pack('<III', 0x1234, 0x5678, 0) + expect = struct.pack('<IIIII', 2, 3, 0x1234, 0x5678, 0) self.assertEqual(expect, embed_data) def testEmbedFail(self): @@ -358,6 +358,17 @@ class TestElf(unittest.TestCase): self.assertEqual(True, elf.is_valid(data)) self.assertEqual(False, elf.is_valid(data[4:])) + def test_get_symbol_offset(self): + fname = self.ElfTestFile('embed_data') + syms = elf.GetSymbols(fname, ['embed_start', 'embed']) + expected = syms['embed'].address - syms['embed_start'].address + val = elf.GetSymbolOffset(fname, 'embed', 'embed_start') + self.assertEqual(expected, val) + + with self.assertRaises(KeyError) as e: + elf.GetSymbolOffset(fname, 'embed') + self.assertIn('__image_copy_start', str(e.exception)) + if __name__ == '__main__': unittest.main() diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index aa470c58163..a6fbf62731f 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -114,6 +114,25 @@ class TestEntry(unittest.TestCase): self.assertEquals(tools.get_bytes(0, 1024), base.CompressData(b'abc')) self.assertEquals(tools.get_bytes(0, 1024), base.DecompressData(b'abc')) + def testLookupOffset(self): + """Test the lookup_offset() method of the base class""" + def MyFindEntryByNode(node): + return self.found + + base = entry.Entry.Create(None, self.GetNode(), 'blob-dtb') + base.FindEntryByNode = MyFindEntryByNode + base.section = base + self.found = None + base.offset_from_elf = [self.GetNode(), 'start', 0] + with self.assertRaises(ValueError) as e: + base.lookup_offset() + self.assertIn("Cannot find entry for node 'u-boot'", str(e.exception)) + + self.found = base + with self.assertRaises(ValueError) as e: + base.lookup_offset() + self.assertIn("Need elf-fname property 'u-boot'", str(e.exception)) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/embed_data.c b/tools/binman/test/embed_data.c index 47d8c38248c..08b68c550f6 100644 --- a/tools/binman/test/embed_data.c +++ b/tools/binman/test/embed_data.c @@ -7,6 +7,7 @@ */ int first[10] = {1}; +int before[2] __attribute__((section(".embed"))) = {2, 3}; int embed[3] __attribute__((section(".embed"))) = {0x1234, 0x5678}; int second[10] = {1}; -- 2.39.0.246.g2a6d74b583-goog

1 1

Please pull u-boot-marvell/master
by Stefan Roese 26 Jan '23

26 Jan '23

Hi Tom, please pull this next batch of mostly Marvell related patches: ---------------------------------------------------------------- - marvell: a38x: Add support for DDR4 (Tony) - kirkwood: Use Kirkwood common early malloc (Tony) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=281&view=results Thanks, Stefan The following changes since commit 17e8e58fe62c019b2cc26af221b6defc3368229f: Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi (2023-01-24 21:07:01 -0500) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 26bc32a8661b6abda3ca4491d27c7de4f648502a: arm: kirkwood: Use Kirkwood common early malloc area for various Kirkwood boards (2023-01-26 07:30:20 +0100) ---------------------------------------------------------------- Tony Dinh (2): ddr: marvell: a38x: Add support for DDR4 from Marvell mv-ddr-marvell repository arm: kirkwood: Use Kirkwood common early malloc area for various Kirkwood boards configs/dockstar_defconfig | 3 - configs/dreamplug_defconfig | 3 - configs/goflexhome_defconfig | 3 - configs/iconnect_defconfig | 3 - configs/nsa310s_defconfig | 3 - configs/pogo_e02_defconfig | 3 - configs/pogo_v4_defconfig | 3 - configs/sheevaplug_defconfig | 3 - drivers/ddr/marvell/a38x/Makefile | 8 + drivers/ddr/marvell/a38x/ddr3_debug.c | 120 + drivers/ddr/marvell/a38x/ddr3_init.c | 25 + drivers/ddr/marvell/a38x/ddr3_init.h | 14 + drivers/ddr/marvell/a38x/ddr3_logging_def.h | 27 + drivers/ddr/marvell/a38x/ddr3_training.c | 131 ++ drivers/ddr/marvell/a38x/ddr3_training_bist.c | 12 + .../marvell/a38x/ddr3_training_centralization.c | 4 + drivers/ddr/marvell/a38x/ddr3_training_db.c | 212 ++ drivers/ddr/marvell/a38x/ddr3_training_ip.h | 17 + drivers/ddr/marvell/a38x/ddr3_training_ip_db.h | 61 + drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 145 ++ drivers/ddr/marvell/a38x/ddr3_training_ip_flow.h | 5 + drivers/ddr/marvell/a38x/ddr3_training_leveling.c | 135 ++ drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.c | 674 ++++++ drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.h | 59 + drivers/ddr/marvell/a38x/mv_ddr4_training.c | 565 +++++ drivers/ddr/marvell/a38x/mv_ddr4_training.h | 32 + .../marvell/a38x/mv_ddr4_training_calibration.c | 2336 ++++++++++++++++++++ .../marvell/a38x/mv_ddr4_training_calibration.h | 26 + drivers/ddr/marvell/a38x/mv_ddr4_training_db.c | 545 +++++ .../ddr/marvell/a38x/mv_ddr4_training_leveling.c | 441 ++++ .../ddr/marvell/a38x/mv_ddr4_training_leveling.h | 11 + drivers/ddr/marvell/a38x/mv_ddr_plat.c | 244 ++ drivers/ddr/marvell/a38x/mv_ddr_plat.h | 11 + drivers/ddr/marvell/a38x/mv_ddr_regs.h | 59 + drivers/ddr/marvell/a38x/mv_ddr_topology.h | 72 + 35 files changed, 5991 insertions(+), 24 deletions(-) create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_calibration.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_calibration.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_db.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_leveling.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_leveling.h

2 1

Failed to build u-boot.itb on RK3568
by Jagan Teki 26 Jan '23

26 Jan '23

Hi, The master branch seems broken with recent changes on binman, I found that u-boot.itb is not creating for evb-rk3568 boards. HEAD commit 17e8e58fe62c019b2cc26af221b6defc3368229f Merge: 4e1ab2065e cd108f2795 Author: Tom Rini <trini(a)konsulko.com> Date: Tue Jan 24 21:07:01 2023 -0500 Any insight? Jagan.

6 10

[PATCH] imx: kontron-sl-mx8mm: Fix SD card IO voltage level
by Frieder Schrempf 26 Jan '23

26 Jan '23

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> The LDO5 of the PCA9450 PMIC can be switched between two different voltage settings (defaulting to 1.8V and 3.3V) using an external signal SD_VSEL that is connected to the VSELECT signal of the SD card interface. As the regulator driver can't deal with both LDO registers (LDO5CTRL_H and LDO5CTRL_L) it only uses one of them, which means reading the voltage from the regulator can potentially return a value that does not reflect the actual state of the LDO5 output. In our case, after booting U-Boot we read 1.8V from the regulator while in fact as the VSELECT signal is still low the regulator outputs 3.3V. This confusion causes the MMC driver to think it is dealing with a 1.8V-only device. This in turn leads to SD cards being addressed with 1.8V IO levels even if UHS support is not available or disabled. Some cards with UHS support still work even if they are addressed with 1.8V levels in non-UHS modes, but a lot of cards also fail with timeout errors like: Card did not respond to voltage select! : -110 As a workaorund we disable the vqmmc regulator for now so we can make sure no wrong values are read from the regulator. The switching between 1.8V and 3.3V still works as the ESDHC driver sets the VSELECT signal accordingly. Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- By the way: I suspect that other boards using the PCA9450 might also be affected by this. I didn't find a nice generic solution so far. It would be possible to patch the pca9450 driver to use the PCA9450_LDO5CTRL_L instead of the PCA9450_LDO5CTRL_H register for LDO5. This would fix this particular case, but still not the root problem of the regulator driver returning wrong values. So if anyone got some idea how to properly handle this, let me know. The same issue is also present in Linux. While I didn't notice any problems with the SD card being addressed with incorrect voltage levels so far, reading the regulator doesn't return the correct value if VSELECT is low. --- --- arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi index 5b8b472159..8321424649 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi @@ -137,6 +137,12 @@ &usdhc2 { u-boot,dm-spl; + /* + * Delete the reference to the IO voltage regulator in order to prevent + * wrong information being passed to the MMC driver by reading the current + * voltage of the PCA9450 LDO5. + */ + /delete-property/ vqmmc-supply; }; &wdog1 { -- 2.39.1

3 4