September 2022 - U-Boot

[PATCH 1/2] Makefile: Fix dependency for u-boot-with-dtb.bin
by Pali Rohár 07 Sep '22

07 Sep '22

Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it takes DTB file and u-boot binary without DTB, which is stored in file u-boot-nodtb.bin. So fix target dependency. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff25f9297486..dcfcd7ebd5d2 100644 --- a/Makefile +++ b/Makefile @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE endif ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE $(call if_changed,binman) -- 2.20.1

3 15

[PATCH v2 1/4] cmd: add temperature command
by Robert Marko 07 Sep '22

07 Sep '22

Currently, there is no way for users to check the readings from thermal sensors from U-boot console, only some boards print it during boot. So, lets add a simple "temperature" command that allows listing thermal uclass devices and getting their value. Note that the thermal devices are intenionally probed if list is used as almost always they will not get probed otherwise and there is no way for users to manually call probe on a certain device from console. Assumption is made that temperature is returned in degrees C and not milidegrees like in Linux as this is what most drivers seem to return. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> --- Changes in v2: * Drop <dm/uclass-internal.h> by using uclass_get_device_by_name() * Make the unit clear in help * Expand Kconfig boolean and help * Drop degree symbol as test doesnt work with it. --- cmd/Kconfig | 6 ++++ cmd/Makefile | 1 + cmd/temperature.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 cmd/temperature.c diff --git a/cmd/Kconfig b/cmd/Kconfig index 3625ff2a50..ffbfed1f38 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1435,6 +1435,12 @@ config DEFAULT_SPI_MODE depends on CMD_SPI default 0 +config CMD_TEMPERATURE + bool "temperature - display the temperature from thermal sensors" + depends on DM_THERMAL + help + Provides a way to list thermal sensors and to get their readings. + config CMD_TSI148 bool "tsi148 - Command to access tsi148 device" help diff --git a/cmd/Makefile b/cmd/Makefile index 5e43a1e022..8874462f1a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -152,6 +152,7 @@ obj-$(CONFIG_CMD_STRINGS) += strings.o obj-$(CONFIG_CMD_SMC) += smccc.o obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o obj-$(CONFIG_CMD_STACKPROTECTOR_TEST) += stackprot_test.o +obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o obj-$(CONFIG_CMD_TERMINAL) += terminal.o obj-$(CONFIG_CMD_TIME) += time.o obj-$(CONFIG_CMD_TIMER) += timer.o diff --git a/cmd/temperature.c b/cmd/temperature.c new file mode 100644 index 0000000000..420965de14 --- /dev/null +++ b/cmd/temperature.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* + * Copyright (c) 2022 Sartura Ltd. + * Written by Robert Marko <robert.marko(a)sartura.hr> + */ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <thermal.h> + +#define LIMIT_DEVNAME 30 + +static int do_get(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct udevice *dev; + int ret, temp; + + if (argc < 2) { + printf("thermal device not selected\n"); + return CMD_RET_FAILURE; + } + + ret = uclass_get_device_by_name(UCLASS_THERMAL, argv[1], &dev); + if (ret) { + printf("thermal device not found\n"); + return CMD_RET_FAILURE; + } + + ret = thermal_get_temp(dev, &temp); + if (ret) + return CMD_RET_FAILURE; + + printf("%s: %d C\n", dev->name, temp); + + return CMD_RET_SUCCESS; +} + +static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct udevice *dev; + + printf("| %-*.*s| %-*.*s| %s\n", + LIMIT_DEVNAME, LIMIT_DEVNAME, "Device", + LIMIT_DEVNAME, LIMIT_DEVNAME, "Driver", + "Parent"); + + uclass_foreach_dev_probe(UCLASS_THERMAL, dev) { + printf("| %-*.*s| %-*.*s| %s\n", + LIMIT_DEVNAME, LIMIT_DEVNAME, dev->name, + LIMIT_DEVNAME, LIMIT_DEVNAME, dev->driver->name, + dev->parent->name); + } + + return CMD_RET_SUCCESS; +} + +static struct cmd_tbl temperature_subcmd[] = { + U_BOOT_CMD_MKENT(list, 1, 1, do_list, "", ""), + U_BOOT_CMD_MKENT(get, 2, 1, do_get, "", ""), +}; + +static int do_temperature(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct cmd_tbl *cmd; + + argc--; + argv++; + + cmd = find_cmd_tbl(argv[0], temperature_subcmd, ARRAY_SIZE(temperature_subcmd)); + if (!cmd || argc > cmd->maxargs) + return CMD_RET_USAGE; + + return cmd->cmd(cmdtp, flag, argc, argv); +} + +U_BOOT_CMD(temperature, CONFIG_SYS_MAXARGS, 1, do_temperature, + "thermal sensor temperature", + "list\t\tshow list of temperature sensors\n" + "get [thermal device name]\tprint temperature in degrees C" +); -- 2.37.1

3 11

[PATCH v2 0/6] net: fm: Verify Fman microcode
by Sean Anderson 07 Sep '22

07 Sep '22

Surprisingly, Fman microcode does not seem to be verified. This series aims to rectify this by introducing an optional FIT wrapper. This wrapper is made mandatory if FIT_SIGNATURE is enabled. NXP boards do not use this config, so the microcode will remain unverified for them. This is OK, since we do not want to break existing systems. This series depends on [1]. There is no logical dependency, but they modify adjacent #includes, so the past patch will not apply cleanly unless that series is applied. [1] https://lore.kernel.org/u-boot/20220422173032.2259019-1-sean.anderson@seco.… Changes in v2: - Document helpers - Split off Fman microcode verification patches into their own series - Split helper refactoring into a patch adding the helpers and one patch per subsystem. Sean Anderson (6): ARMv8/sec_firmware: Remove SEC_FIRMWARE_FIT_CNF_NAME image: fit: Add some helpers for getting data ARMv8/sec_firmware: Convert to use fit_get_data_conf_prop cmd: fpga: Convert to use fit_get_data_node net: Convert fit verification to use fit_get_data_* net: fm: Add support for FIT firmware arch/arm/cpu/armv8/sec_firmware.c | 52 ++-------------------- boot/image-fit.c | 37 ++++++++++++++++ cmd/fpga.c | 24 +++------- drivers/net/fm/fm.c | 18 ++++++++ drivers/net/fsl-mc/mc.c | 30 ++----------- drivers/net/pfe_eth/pfe_firmware.c | 40 +---------------- include/image.h | 70 ++++++++++++++++++++++++++++++ 7 files changed, 139 insertions(+), 132 deletions(-) -- 2.35.1.1320.gc452695387.dirty

2 13

[PATCH v3 0/5] board: sl28: various updates
by Michael Walle 07 Sep '22

07 Sep '22

This is a resend of the original v1 series. It was just rebased. Apparently not all patches made it into u-boot. Unfortunately, there was no feedback at all. This is an update for the sl28 board which adds support for - 8 GiB memory variant - different boot sources, like eMMC, SD-card - dynamic prompts - various cleanups changes since v2: - only mark secure ram on layerscape SoCs which actually have it. changes since v1: - rebased onto the latest master Michael Walle (5): armv8: layerscape: spl: mark OCRAM as non-secure board: sl28: implement additional bootsources board: sl28: add user friendly names for the boot sources board: sl28: support dynamic prompts board: sl28: remove COUNTER_FREQUENCY_REAL arch/arm/cpu/armv8/fsl-layerscape/spl.c | 13 ++++++ board/kontron/sl28/common.c | 22 ++++++++++ board/kontron/sl28/sl28.c | 43 ++++++++++++++++++++ board/kontron/sl28/sl28.h | 16 ++++++++ board/kontron/sl28/spl.c | 54 ++++++++++++++++++++++++- configs/kontron_sl28_defconfig | 6 ++- include/configs/kontron_sl28.h | 2 - 7 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 board/kontron/sl28/sl28.h -- 2.30.2

2 6

[PATCH] board: freescale: p1_p2_rdb_pc: Delete watchdog max6370 node in load_default mode
by Pali Rohár 07 Sep '22

07 Sep '22

CPLD in load_default mode ignores watchdog reset signal. It does not reset board when watchdog triggers reset signal. Detect load_default mode by GPIO7 - LOAD_DEFAULT_N and delete watchdog max6370 node from device to prevent registering driver for non-working watchdog. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index a71952dcf399..06cab729e4ab 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -368,6 +368,24 @@ int board_eth_init(struct bd_info *bis) } #endif +#if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP) +static void fix_max6370_watchdog(void *blob) +{ + int off = fdt_node_offset_by_compatible(blob, -1, "maxim,max6370"); + ccsr_gpio_t *pgpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR); + u32 gpioval = in_be32(&pgpio->gpdat); + + /* + * Delete watchdog max6370 node in load_default mode (detected by + * GPIO7 - LOAD_DEFAULT_N) because CPLD in load_default mode ignores + * watchdog reset signal. CPLD in load_default mode does not reset + * board when watchdog triggers reset signal. + */ + if (!(gpioval & BIT(31-7)) && off >= 0) + fdt_del_node(blob, off); +} +#endif + #ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { @@ -393,6 +411,8 @@ int ft_board_setup(void *blob, struct bd_info *bd) sizeof("okay"), 0); #endif + fix_max6370_watchdog(blob); + #if defined(CONFIG_HAS_FSL_DR_USB) fsl_fdt_fixup_dr_usb(blob, bd); #endif @@ -444,3 +464,11 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } #endif + +#ifdef CONFIG_OF_BOARD_FIXUP +int board_fix_fdt(void *blob) +{ + fix_max6370_watchdog(blob); + return 0; +} +#endif -- 2.20.1

2 4

[PATCH 0/2] powerpc: mpc85xx: Add support for generating QorIQ pre-PBL eSDHC boot sector
by Pali Rohár 07 Sep '22

07 Sep '22

With this patch series, U-Boot binary u-boot.bin (or u-boot-with-spl.bin when SPL is used) for QorIQ pre-PBL platforms can be directly copied to SD card without need to process binary via external formatting tools. Tested on P2020 based board with SPL booting and also direct U-Boot booting without SPL. Depends on other powerpc mpc85xx patches: http://patchwork.ozlabs.org/project/uboot/list/?series=293592&state=* When using SPL, also following mmc fsl_esdhc_spl patches are required: http://patchwork.ozlabs.org/project/uboot/list/?series=293276&state=* And when using SPL and u-boot-with-spl.bin is stored on non-zero sector then also following patch is required: http://patchwork.ozlabs.org/project/uboot/patch/20220404163311.5853-1-pali@… Pali Rohár (2): powerpc: mpc85xx: Add support for generating QorIQ pre-PBL eSDHC boot sector board: freescale: p1_p2_rdb_pc: Calculate offsets for eSDHC boot sector arch/powerpc/cpu/mpc85xx/Kconfig | 53 +++++++++++++++ arch/powerpc/cpu/mpc85xx/start.S | 86 +++++++++++++++++++++++++ arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 5 ++ arch/powerpc/cpu/mpc85xx/u-boot.lds | 5 ++ include/configs/p1_p2_rdb_pc.h | 7 +- 5 files changed, 155 insertions(+), 1 deletion(-) -- 2.20.1

4 16

[PATCH v2 00/45] dm: core: Support multiple device trees in ofnode
by Simon Glass 07 Sep '22

07 Sep '22

At present the ofnode interface is somewhat limited, in that it cannot access the device tree provided by the OS, only the one used by U-Boot itself (assuming these are separate). This prevents using ofnode functions to handle device tree fixups, i.e. ft_board_setup() and the like. The ofnode interface was introduced to allow a consistent API to access the device tree, whether a flat tree or a live tree (OF_LIVE) is in use. With the flat tree, adding nodes and properties at the start of the tree (as often happens when writing to the /chosen node) requires copying a lot of data for each operation. With live tree, such operations are quite a bit faster, since there is no memory copying required. This has to be weighed against the required memory allocation with OF_LIVE, as well as the cost of unflattening and flattening the device tree which U-Boot is running. This series enables support for access to multiple device trees with the ofnode interface. This is already available to some extent with OF_LIVE, but some of the ofnode functions need changes to allow the tree to be specified. The mechanism works by using the top 1-4 bits of the device tree offset. The sign bit is not affected, since negative values must be supported. With this implemented, it becomes possible to use the ofnode interface to do device tree fixups. The only current user is the EVT_FT_FIXUP event. This has two main benefits: - ofnode can now be used everywhere, in preference to the libfdt calls - live tree can eventually be used everywhere, with potential speed improvements when larger number of fixups are used This series is only a step along the way. Firstly, while it is possible to access the 'fix-up' tree using OF_LIVE, most of the fixup functions use flat tree directly, rather than the ofnode interface. These need to be updated. Also the tree must be flattened again before it is passed to the OS. This is not currently implemented. With OFNODE_MULTI_TREE disabled this has almost no effect on code size: around 4 bytes if EVENT is enabled, 0 if not. With the feature enabled, the increase is around 700 bytes, e.g. on venice2: $ buildman -b ofn2a venice2 -sS --step 0 Summary of 2 commits for 1 boards (1 thread, 64 jobs per thread) 01: image: Drop some other #ifdefs in image-board.c arm: w+ venice2 48: wip arm: (for 1/1 boards) all +668.0 text +668.0 This size increase is not too bad, considering the extra functionality, but is too large to enable everywhere. So for now this features needs to be opt-in only, based on EVENT. Changes in v2: - Return the existing node with -EEXIST - Allow len to be passed in as -1 - Add a comment as to why strncmp() is not enough - Add a comment why the len parameter is needed - Add a comment why the new_name variable is used - Add tests for the memory checks in of_add_subnode() - Fix memory checks - Fix 'property' comment - Add lots more tests and a few other fixes - Gosh that code was a mess - Add new patch to rename ofnode_get_property_by_prop() - Substantially expanded to improve the ofnode implementation/interface - Added more ofnode tests - Minor reworks of the ofnode internals, using oftree - Added testing of memory-allocation failures Simon Glass (45): image: Fix BOOTM_STATE values treewide: Drop bootm_headers_t typedef treewide: Drop image_info_t typedef treewide: Drop image_header_t typedef log: update the comment for log_msg_ret() sandbox: power: Update PMIC driver to use log event: Fix a typo in the EVENT help event: Allow multiple spy declarations for each event dm: core: Pass a root node to of_find_node_by_phandle() event: Pass the images to EVT_FT_FIXUP test: Fix missing livetree test runs test: Support testing malloc() failures dm: core: Document the livetree structures properly dm: core: Allow adding ofnode subnodes dm: core: Support writing a property to an empty node dm: core: Drop the const from ofnode test: Make a copy of the device tree before running a test test: Detect a change in the device tree test: Drop the UT_TESTF_LIVE_OR_FLAT flag sandbox: Add a function to load a relative file path sandbox: Support loading the other FDT sandbox: Support setting up the other FDT for testing sandbox: test: Provide an easy way to use the other FDT dm: core: Reduce code size with dev_of_offset() dm: core: Rename ofnode_get_first/next_property() dm: core: Rename ofnode_get_property_by_prop() dm: core: Avoid creating a name property when unflattening dm: core: Add a macro to iterate through properties dm: core: Drop ofnode_is_available() dm: core: Expand integer-reading tests dm: core: Provide a way to reset the device tree dm: core: Add an ofnode function to obtain the flat tree dm: core: Add ofnode functions to obtain an oftree dm: core: Add a way to look up a phandle in an oftree dm: core: Allow obtaining a node offset in the same tree dm: core: Split ofnode_path_root() into two functions dm: core: Add definitions for multiple ofnode trees dm: core: Add the ofnode multi-tree implementation dm: core: Complete phandle implementation using the other FDT dm: core: Update comments for default-FDT ofnode functions dm: core: Create a function to get a live tree in a test dm: core: Expand ofnode tests vbe: Allow test to run with live/flat tree dm: core: Allow copying ofnode property data when writing dm: core: Support copying properties with ofnode arch/arc/lib/bootm.c | 8 +- arch/arm/lib/bootm.c | 13 +- arch/arm/mach-aspeed/ast2600/spl.c | 4 +- arch/arm/mach-imx/hab.c | 2 +- arch/arm/mach-imx/spl_imx_romapi.c | 6 +- arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-k3/sysfw-loader.c | 6 +- arch/arm/mach-keystone/cmd_mon.c | 6 +- arch/arm/mach-socfpga/board.c | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 4 +- arch/arm/mach-tegra/xusb-padctl-common.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 6 +- arch/mips/lib/bootm.c | 16 +- arch/mips/mach-jz47xx/jz4780/jz4780.c | 6 +- arch/mips/mach-mtmips/mt7621/spl/spl.c | 4 +- arch/mips/mach-mtmips/mt7621/tpl/tpl.c | 4 +- arch/nios2/lib/bootm.c | 2 +- arch/powerpc/lib/bootm.c | 16 +- arch/riscv/lib/andes_plic.c | 2 +- arch/riscv/lib/bootm.c | 8 +- arch/riscv/lib/smp.c | 2 +- arch/sandbox/cpu/cpu.c | 34 +- arch/sandbox/cpu/start.c | 16 +- arch/sandbox/cpu/state.c | 48 ++ arch/sandbox/dts/Makefile | 2 +- arch/sandbox/dts/other.dts | 35 ++ arch/sandbox/include/asm/malloc.h | 1 + arch/sandbox/include/asm/state.h | 30 + arch/sandbox/include/asm/test.h | 19 + arch/sandbox/lib/bootm.c | 2 +- arch/sh/lib/bootm.c | 2 +- arch/x86/lib/bootm.c | 8 +- arch/xtensa/lib/bootm.c | 2 +- board/synopsys/hsdk/hsdk.c | 2 +- board/ti/ks2_evm/board.c | 4 +- boot/boot_fit.c | 4 +- boot/bootm.c | 26 +- boot/bootm_os.c | 35 +- boot/image-android.c | 6 +- boot/image-board.c | 26 +- boot/image-fdt.c | 13 +- boot/image-fit.c | 16 +- boot/image.c | 14 +- boot/vbe_simple.c | 2 +- cmd/bootefi.c | 2 +- cmd/booti.c | 2 +- cmd/bootm.c | 4 +- cmd/bootz.c | 2 +- cmd/disk.c | 4 +- cmd/fpga.c | 2 +- cmd/nand.c | 4 +- cmd/source.c | 2 +- cmd/ximg.c | 4 +- common/Kconfig | 2 +- common/board_r.c | 2 + common/dlmalloc.c | 19 + common/spl/spl.c | 10 +- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 6 +- common/spl/spl_legacy.c | 8 +- common/spl/spl_mmc.c | 4 +- common/spl/spl_nand.c | 4 +- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 8 +- common/spl/spl_onenand.c | 2 +- common/spl/spl_ram.c | 8 +- common/spl/spl_sata.c | 2 +- common/spl/spl_semihosting.c | 4 +- common/spl/spl_spi.c | 6 +- common/spl/spl_ubi.c | 4 +- common/spl/spl_xip.c | 2 +- common/spl/spl_ymodem.c | 14 +- common/splash_source.c | 6 +- doc/develop/driver-model/livetree.rst | 37 +- doc/uImage.FIT/source_file_format.txt | 2 +- drivers/core/Kconfig | 24 + drivers/core/fdtaddr.c | 18 +- drivers/core/of_access.c | 83 ++- drivers/core/ofnode.c | 442 +++++++++++--- drivers/core/read.c | 6 +- drivers/cpu/imx8_cpu.c | 2 +- drivers/cpu/riscv_cpu.c | 2 +- drivers/crypto/fsl/jr.c | 2 +- drivers/firmware/scmi/scmi_agent-uclass.c | 2 +- drivers/fpga/socfpga_arria10.c | 4 +- drivers/mtd/mtdpart.c | 4 +- drivers/mtd/nand/raw/zynq_nand.c | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 2 +- drivers/net/sja1105.c | 2 +- drivers/net/ti/am65-cpsw-nuss.c | 2 +- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_mvebu.c | 2 +- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_mediatek.c | 4 +- drivers/power/pmic/sandbox.c | 10 +- drivers/usb/gadget/f_sdp.c | 2 +- env/common.c | 6 +- include/asm-generic/global_data.h | 4 + include/bootm.h | 6 +- include/configs/uniphier.h | 2 +- include/dm/device.h | 6 +- include/dm/of.h | 15 +- include/dm/of_access.h | 29 +- include/dm/ofnode.h | 345 +++++++++-- include/dm/ofnode_decl.h | 37 +- include/dm/read.h | 8 +- include/event.h | 6 +- include/image.h | 118 ++-- include/log.h | 5 +- include/malloc.h | 12 + include/spl.h | 8 +- include/tee/optee.h | 4 +- include/test/test.h | 30 +- include/test/ut.h | 5 + lib/efi_loader/efi_dt_fixup.c | 2 +- lib/fdtdec.c | 7 +- lib/of_live.c | 7 +- net/dsa-uclass.c | 2 +- scripts/event_dump.py | 4 +- test/boot/vbe_simple.c | 25 +- test/dm/ofnode.c | 696 +++++++++++++++++++++- test/dm/ofread.c | 11 +- test/image/spl_load.c | 4 +- test/test-main.c | 136 ++++- tools/binman/ftest.py | 4 +- tools/default_image.c | 31 +- tools/fit_image.c | 4 +- tools/imx8mimage.c | 8 +- tools/mkimage.c | 2 +- tools/mtk_image.c | 10 +- 133 files changed, 2253 insertions(+), 621 deletions(-) create mode 100644 arch/sandbox/dts/other.dts -- 2.37.2.789.g6183377224-goog

1 0

[PATCH v2 1/5] imx8m: USDHC3 base address definition for i.MX8MP
by Martyn Welch 06 Sep '22

06 Sep '22

From: Martyn Welch <martyn.welch(a)collabora.com> The i.MX8MP also has USDHC3, allow access to the relvant base address definition. Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- Changes in v2: - None arch/arm/include/asm/arch-imx8m/imx-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index 6969cde26c..d8952342e0 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -46,7 +46,7 @@ #define USDHC1_BASE_ADDR 0x30B40000 #define USDHC2_BASE_ADDR 0x30B50000 #define QSPI0_AMBA_BASE 0x08000000 -#ifdef CONFIG_IMX8MM +#if defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MP) #define USDHC3_BASE_ADDR 0x30B60000 #endif #define UART_BASE_ADDR(n) ( \ -- 2.35.1

2 5

[PATCH 1/1] cmd: correct short text for tftpboot
by Heinrich Schuchardt 06 Sep '22

06 Sep '22

The command's name is a misnomer. The command loads a file but does not run (boot) it. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 2 +- cmd/net.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 8ea064b8d2..0e0be94f41 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1719,7 +1719,7 @@ config CMD_TFTPBOOT bool "tftpboot" default y help - tftpboot - boot image via network using TFTP protocol + tftpboot - load file via network using TFTP protocol config CMD_TFTPPUT bool "tftp put" diff --git a/cmd/net.c b/cmd/net.c index 18627de16c..683d0966b0 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -46,7 +46,7 @@ int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD( tftpboot, 3, 1, do_tftpb, - "boot image via network using TFTP protocol", + "load file via network using TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]" ); #endif -- 2.37.2

2 1

[PATCH v2 1/1] cmd: fix tftpput command
by Heinrich Schuchardt 06 Sep '22

06 Sep '22

From: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Calling tftpput with less than 2 arguments must lead to a failure. If tftpput is called with two arguments, these are the address and the size of the file to be transferred. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: carve out function parse_args() --- cmd/net.c | 90 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/cmd/net.c b/cmd/net.c index 3619c843d8..18627de16c 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -189,30 +189,49 @@ static void netboot_update_env(void) #endif } -static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, - char *const argv[]) +/** + * parse_addr_size() - parse address and size arguments for tftpput + * + * @argv: command line arguments + * Return: 0 on success + */ +static int parse_addr_size(char * const argv[]) { - char *s; - char *end; - int rcode = 0; - int size; - ulong addr; - - net_boot_file_name_explicit = false; + if (strict_strtoul(argv[1], 16, &image_save_addr) < 0 || + strict_strtoul(argv[2], 16, &image_save_size) < 0) { + printf("Invalid address/size\n"); + return CMD_RET_USAGE; + } + return 0; +} - /* pre-set image_load_addr */ - s = env_get("loadaddr"); - if (s != NULL) - image_load_addr = hextoul(s, NULL); +/** + * parse_args() - parse command line arguments + * + * @proto: command prototype + * @argc: number of arguments + * @argv: command line arguments + * Return: 0 on success + */ +int parse_args(enum proto_t proto, int argc, char *const argv[]) +{ + ulong addr; + char *end; switch (argc) { case 1: + if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + return 1; + /* refresh bootfile name from env */ copy_filename(net_boot_file_name, env_get("bootfile"), sizeof(net_boot_file_name)); break; - case 2: /* + case 2: + if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + return 1; + /* * Only one arg - accept two forms: * Just load address, or just boot file name. The latter * form must be written in a format which can not be @@ -232,29 +251,52 @@ static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, break; case 3: - image_load_addr = hextoul(argv[1], NULL); - net_boot_file_name_explicit = true; - copy_filename(net_boot_file_name, argv[2], - sizeof(net_boot_file_name)); - + if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) { + if (parse_addr_size(argv)) + return 1; + } else { + image_load_addr = hextoul(argv[1], NULL); + net_boot_file_name_explicit = true; + copy_filename(net_boot_file_name, argv[2], + sizeof(net_boot_file_name)); + } break; #ifdef CONFIG_CMD_TFTPPUT case 4: - if (strict_strtoul(argv[1], 16, &image_save_addr) < 0 || - strict_strtoul(argv[2], 16, &image_save_size) < 0) { - printf("Invalid address/size\n"); - return CMD_RET_USAGE; - } + if (parse_addr_size(argv)) + return 1; net_boot_file_name_explicit = true; copy_filename(net_boot_file_name, argv[3], sizeof(net_boot_file_name)); break; #endif default: + return 1; + } + return 0; +} + +static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc, + char *const argv[]) +{ + char *s; + int rcode = 0; + int size; + + net_boot_file_name_explicit = false; + *net_boot_file_name = '\0'; + + /* pre-set image_load_addr */ + s = env_get("loadaddr"); + if (s != NULL) + image_load_addr = hextoul(s, NULL); + + if (parse_args(proto, argc, argv)) { bootstage_error(BOOTSTAGE_ID_NET_START); return CMD_RET_USAGE; } + bootstage_mark(BOOTSTAGE_ID_NET_START); size = net_loop(proto); -- 2.37.2

2 1