April 2024 - U-Boot

[PATCH] clk: zynq: Fix EMIO clock use detection for gem0
by Ondřej Jirman 29 Apr '24

29 Apr '24

From: Ondrej Jirman <megi(a)xff.cz> According to TRM, the bit that differentiates between MIO and EMIO clocks is bit 6. This resolves failure to set clock when using EMIO clock for ethernet. Signed-off-by: Ondrej Jirman <megi(a)xff.cz> --- drivers/clk/clk_zynq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index e3cefe2e0c72..78e6886a000c 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -42,6 +42,8 @@ #define CLK_CTRL_DIV3X_SHIFT 20 #define CLK_CTRL_DIV3X_MASK (ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV3X_SHIFT) +#define CLK_CTRL_GEM_EMIO (1u << 6) + DECLARE_GLOBAL_DATA_PTR; #ifndef CONFIG_SPL_BUILD @@ -161,7 +163,7 @@ static enum zynq_clk_rclk zynq_clk_get_gem_rclk(enum zynq_clk id) else clk_ctrl = readl(&slcr_base->gem1_rclk_ctrl); - srcsel = (clk_ctrl & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT; + srcsel = (clk_ctrl & CLK_CTRL_GEM_EMIO); if (srcsel) return emio_clk; else -- 2.44.0

2 6

How to improve eficonfig menu for users?
by E Shattow 28 Apr '24

28 Apr '24

Hi, I suggest to flatten the eficonfig UI menu so it is easier for users and avoid needing efidebug command for most situations. Flatten the eficonfig menu: Replace the UEFI Maintenance Menu with Change Boot Order as the UEFI Maintenance Menu. Add to UEFI Maintenance Menu a keypress to edit. Add to UEFI Maintenance Menu a keypress to delete. Relocate the Add Boot Option menu invocation into UEFI Maintenance Menu above Save. Relocate and replace the Delete Boot Option menu as a contextual action into Edit Boot Option above "Save". Quality of life for global boot order items: Boot order items not represented by the Boot#### variable could be displayed with some text suffix i.e. "... (EFI global)" to make it clear that trying to edit may be no-op, and action of delete could no-op or deactivate as likely what the user wants for trying to delete an immutable boot option. Avoid need of efidebug command to edit boot variables: Add to UEFI Maintenance Menu a keypress to edit advanced. This would be an alternate version of Edit Boot Option taking user input (as is done for Optional Data) instead of file selection UI. If it is too complicated to try and cross-reference boot order against Boot#### variable then this can simply go to that existing sub-menu for the same overall menu depth. Importantly the UEFI Maintenance Menu would always show the boot order to the user so it will not be overlooked as it is now. Open for comments. -E

1 0

[PATCH v2] cmd: mmc: allow use of hardware partition names for mmc partconf
by Tim Harvey 27 Apr '24

27 Apr '24

eMMC devices have hardware partitions such as user, boot0, and boot1. Allow these names to be displayed when reading the mmc PARTITION_CONFIG field via 'mmc partconf'. Additionally allow a name to be specified when setting the PARTITION_CONFIG. Before: u-boot=> mmc partconf 2 1 1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x2 PARTITION_ACCESS: 0x0 After: u-boot=> mmc partconf 2 1 1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x1 (boot0) PARTITION_ACCESS: 0x0 u-boot=> mmc partconf 2 1 boot1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x2 (boot1) PARTITION_ACCESS: 0x0 Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- v2: - fix typo in subject - add names for gp1..gp4 --- cmd/mmc.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index 2d5430a53079..af9a66cc6df4 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -14,6 +14,18 @@ #include <part.h> #include <sparse_format.h> #include <image-sparse.h> +#include <linux/ctype.h> + +static const char *mmc_partnames[] = { + "user", + "boot0", + "boot1", + "gp1", + "gp2", + "gp3", + "gp4", + "user", +}; static int curr_device = -1; @@ -918,8 +930,8 @@ static int mmc_partconf_print(struct mmc *mmc, const char *varname) printf("EXT_CSD[179], PARTITION_CONFIG:\n" "BOOT_ACK: 0x%x\n" - "BOOT_PARTITION_ENABLE: 0x%x\n" - "PARTITION_ACCESS: 0x%x\n", ack, part, access); + "BOOT_PARTITION_ENABLE: 0x%x (%s)\n" + "PARTITION_ACCESS: 0x%x\n", ack, part, mmc_partnames[part], access); return CMD_RET_SUCCESS; } @@ -949,7 +961,14 @@ static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag, return mmc_partconf_print(mmc, cmd_arg2(argc, argv)); ack = dectoul(argv[2], NULL); - part_num = dectoul(argv[3], NULL); + if (!isdigit(*argv[3])) { + for (part_num = 0; part_num < ARRAY_SIZE(mmc_partnames); part_num++) { + if (!strcmp(argv[3], mmc_partnames[part_num])) + break; + } + } else { + part_num = dectoul(argv[3], NULL); + } access = dectoul(argv[4], NULL); /* acknowledge to be sent during boot operation */ -- 2.25.1

3 5

[PATCH] venice: show emmc boot hardware partition
by Tim Harvey 27 Apr '24

27 Apr '24

To aid in understanding what emmc hardware partition is being used to boot on power-up, display the hardware partition name in the SPL. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/spl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index 3b0f11f2fd0f..531bad260b6d 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -366,9 +366,25 @@ unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long const char *spl_board_loader_name(u32 boot_device) { + struct mmc *mmc; + int part; + switch (boot_device) { /* SDHC2 */ case BOOT_DEVICE_MMC1: + mmc_init_device(0); + mmc = find_mmc_device(0); + mmc_init(mmc); + part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); + switch (part) { + case 1: + return "eMMC boot0"; + case 2: + return "eMMC boot1"; + case 0: + case 7: + return "eMMC user"; + } return "eMMC"; /* SDHC3 */ case BOOT_DEVICE_MMC2: -- 2.25.1

2 2

[PATCH 1/2] binman: Add nxp_imx8mcst etype for i.MX8M flash.bin signing
by Marek Vasut 26 Apr '24

26 Apr '24

Add new binman etype which allows signing both the SPL and fitImage sections of i.MX8M flash.bin using CST. There are multiple DT properties which govern the signing process, nxp,loader-address is the only mandatory one which sets the SPL signature start address without the imx8mimage header, this should be SPL text base. The key material can be configured using optional DT properties nxp,srk-table, nxp,csf-key, nxp,img-key, all of which default the key material names generated by CST tool scripts. The nxp,unlock property can be used to unlock CAAM access in SPL section. Minimal signing description example: diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index c4c1a177102..ccd44bf9d0b 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -86,6 +86,12 @@ section { pad-byte = <0x00>; + nxp-imx8mcst@0 { + filename = "u-boot-spl-mkimage.signed.bin"; + nxp,loader-address = <CONFIG_SPL_TEXT_BASE>; + nxp,unlock; + args; /* Needed by mkimage etype superclass */ + nxp-imx8mimage { filename = "u-boot-spl-mkimage.bin"; nxp,boot-from = "sd"; @@ -129,6 +135,14 @@ }; }; + }; + + nxp-imx8mcst@1 { + filename = "u-boot-fit.signed.bin"; + nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>; + offset = <0x58000>; + args; /* Needed by mkimage etype superclass */ + fit { description = "Configuration to load ATF before U-Boot"; #ifndef CONFIG_IMX_HAB @@ -191,5 +205,6 @@ }; }; }; + }; }; }; 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 --- tools/binman/btool/cst.py | 48 +++++++++++ tools/binman/etype/nxp_imx8mcst.py | 133 +++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 tools/binman/btool/cst.py create mode 100644 tools/binman/etype/nxp_imx8mcst.py diff --git a/tools/binman/btool/cst.py b/tools/binman/btool/cst.py new file mode 100644 index 00000000000..30e78bdbbd9 --- /dev/null +++ b/tools/binman/btool/cst.py @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2024 Marek Vasut <marex(a)denx.de> +# +"""Bintool implementation for cst""" + +import re + +from binman import bintool + +class Bintoolcst(bintool.Bintool): + """Image generation for U-Boot + + This bintool supports running `cst` with some basic parameters as + needed by binman. + """ + def __init__(self, name): + super().__init__(name, 'Sign NXP i.MX image') + + # pylint: disable=R0913 + def run(self, output_fname=None): + """Run cst + + Args: + output_fname: Output filename to write to + """ + args = [] + if output_fname: + args += ['-o', output_fname] + return self.run_cmd(*args) + + def fetch(self, method): + """Fetch handler for cst + + This installs cst using the apt utility. + + Args: + method (FETCH_...): Method to use + + Returns: + True if the file was fetched and now installed, None if a method + other than FETCH_BIN was requested + + Raises: + Valuerror: Fetching could not be completed + """ + if method != bintool.FETCH_BIN: + return None + return self.apt_install('imx-code-signing-tool') diff --git a/tools/binman/etype/nxp_imx8mcst.py b/tools/binman/etype/nxp_imx8mcst.py new file mode 100644 index 00000000000..fb1c3415ca1 --- /dev/null +++ b/tools/binman/etype/nxp_imx8mcst.py @@ -0,0 +1,133 @@ +# 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 code signing tool +# input configuration file and invocation of cst on generated +# input configuration file and input data to be signed. +# + +import struct + +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_imx8mcst(Entry_mkimage): + """NXP i.MX8M CST .cfg file generator and cst invoker + + Properties / Entry arguments: + - nxp,loader-address - loader address (SPL text base) + """ + + def __init__(self, section, etype, node): + super().__init__(section, etype, node) + self.required_props = ['nxp,loader-address'] + + def ReadNode(self): + super().ReadNode() + self.loader_address = fdt_util.GetInt(self._node, 'nxp,loader-address') + self.srk_table = fdt_util.GetString(self._node, 'nxp,srk-table', 'SRK_1_2_3_4_table.bin') + self.csf_key = fdt_util.GetString(self._node, 'nxp,csf-key', 'CSF1_1_sha256_4096_65537_v3_usr_crt.pem') + self.img_key = fdt_util.GetString(self._node, 'nxp,img-key', 'IMG1_1_sha256_4096_65537_v3_usr_crt.pem') + self.unlock = fdt_util.GetBool(self._node, 'nxp,unlock') + self.ReadEntries() + + def BuildSectionData(self, required): + data, input_fname, uniq = self.collect_contents_to_file( + self._entries.values(), 'input') + # Parse the input data and figure out what it is that is being signed. + # - If it is mkimage'd imx8mimage, then extract to be signed data size + # from imx8mimage header, and calculate CSF blob offset right past + # the SPL from this information. + # - If it is fitImage, then pad the image to 4k, add generated IVT and + # sign the whole payload, then append CSF blob at the end right past + # the IVT. + signtype = struct.unpack('<I', data[:4])[0] + signbase = self.loader_address + signsize = 0 + if signtype == 0x412000d1: # SPL/imx8mimage + # Sign the payload including imx8mimage header + # (extra 0x40 bytes before the payload) + signbase -= 0x40 + signsize = struct.unpack('<I', data[24:28])[0] - signbase + # Remove mkimage generated padding from the end of data + data = data[:signsize] + elif signtype == 0xedfe0dd0: # fitImage + # Align fitImage to 4k + signsize = tools.align(len(data), 0x1000) + data += tools.get_bytes(0, signsize - len(data)) + # Add generated IVT + data += struct.pack('<I', 0x412000d1) + data += struct.pack('<I', signbase + signsize) # IVT base + data += struct.pack('<I', 0) + data += struct.pack('<I', 0) + data += struct.pack('<I', 0) + data += struct.pack('<I', signbase + signsize) # IVT base + data += struct.pack('<I', signbase + signsize + 0x20) # CSF base + data += struct.pack('<I', 0) + # Write out customized data to be signed + output_dname = tools.get_output_filename(f'nxp.cst-input-data.{uniq}') + tools.write_file(output_dname, data) + # Generate CST configuration file used to sign payload + cfg_spl_fname = tools.get_output_filename('nxp.csf-config-txt.%s' % uniq) + with open(cfg_spl_fname, 'w') as outf: + print('[Header]', file=outf) + print(' Version = 4.3', file=outf) + print(' Hash Algorithm = sha256', file=outf) + print(' Engine = CAAM', file=outf) + print(' Engine Configuration = 0', file=outf) + print(' Certificate Format = X509', file=outf) + print(' Signature Format = CMS', file=outf) + print('[Install SRK]', file=outf) + print(' File = "%s"' % self.srk_table, file=outf) + print(' Source index = 0', file=outf) + print('[Install CSFK]', file=outf) + print(' File = "%s"' % self.csf_key, file=outf) + print('[Authenticate CSF]', file=outf) + if self.unlock: + print('[Unlock]', file=outf) + print(' Engine = CAAM', file=outf) + print(' Features = MID', file=outf) + print('[Install Key]', file=outf) + print(' Verification index = 0', file=outf) + print(' Target Index = 2', file=outf) + print(' File = "%s"' % self.img_key, file=outf) + print('[Authenticate Data]', file=outf) + print(' Verification index = 2', file=outf) + print(' Blocks = %#x 0 %#x "%s"' % (signbase, len(data), output_dname), file=outf) + + output_fname = tools.get_output_filename(f'nxp.csf-output-blob.{uniq}') + args = ['-i', cfg_spl_fname, '-o', output_fname] + if self.cst.run_cmd(*args) is not None: + outdata = tools.read_file(output_fname) + return data + outdata + else: + # Bintool is missing; just use the input data as the output + self.record_missing_bintool(self.cst) + 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) + + def AddBintools(self, btools): + super().AddBintools(btools) + self.cst = self.AddBintool(btools, 'cst') -- 2.43.0

3 6

Pull request: u-boot-rockchip-20240426
by Kever Yang 26 Apr '24

26 Apr '24

Hi Tom, Please pull the updates for rockchip platform: - dts sync for rk3308; - sdram: Support getting banks from TPL for rk3568 and rk3588; - dts and config clean and sync up for rk3568/rk3588; - Other misc fixes; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/20543 Thanks, - Kever The following changes since commit d097f9e1299a3bdb7de468f0d9bbc63932f461cd: Merge tag 'fsl-qoriq-2024-4-24' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2024-04-23 17:53:06 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20240426 for you to fetch changes up to f6114fb871108eb2bad7393191c9983f0b125dc1: rockchip: rk356x: use DRAM banks from ATAGS (2024-04-26 15:47:06 +0800) ---------------------------------------------------------------- Christopher Obbard (4): rockchip: spl-boot-order: fix typo in comment succes→success rockchip: spl-boot-order: show DT path for missing device arm: rockchip: sync ROCK Pi 4A DTS from Linux rockchip: rock-pi-4-rk3399: enable booting from SPI flash Dragan Simic (1): board: rk3288: simplify the DT file list in MAINTAINERS Finley Xiao (1): clk: rockchip: rk3308: Add support for SCLK_RTC32K clock Jason Zhu (1): rockchip: bootrom: Sync bootsource id enum from bootrom Jonas Karlman (47): rockchip: spl: Cache boot source id for later use rockchip: spl: Add SPI NOR flash to boot_devices array board: rockchip: rk3308: Add device tree files and myself to MAINTAINERS rockchip: rk3308: Sort imply statements alphabetically rockchip: rk3308: Enable ARMv8 crypto and FIT checksum validation rockchip: rk3308: Generate ethaddr based on cpu id rockchip: rk3308: Enable random generator rockchip: rk3308: Fix loading FIT from SD-card when booting from eMMC clk: rockchip: rk3308: Add dummy support for USB480M clock phy: rockchip-inno-usb2: Add support for RK3308 rockchip: rk3308: Sync device tree from linux v6.8 rockchip: rk3308-evb: Update defconfig rockchip: rk3308-roc-cc: Update defconfig rockchip: rk3308-rock-pi-s: Update defconfig rockchip: rk3308: Move cru and grf include files to arch-rockchip clk: rockchip: rk356x: Add CLK_USB3OTGx_REF support clk: rockchip: rk3588: Add REF_CLK_USB3OTGx support clk: rockchip: rk356x: Fix set rate of SCLK_SFC clock rockchip: rk3588: Drop REGULATOR_PWM Kconfig option rockchip: rk3566-anbernic-rgxx3: Remove SPL_ROCKCHIP_BACK_TO_BROM option rockchip: rk35xx: Sort imply statements alphabetically rockchip: rk35xx: Enable random generator rockchip: rk35xx: Imply support for GbE PHY rockchip: rk356x: Imply enhanced features for standard boot rockchip: rk35xx: Sort soc u-boot.dtsi alphabetically rockchip: rk356x: Update bootph props rockchip: rk3588: Update bootph props rockchip: rk3568-evb: Use pinctrl in SPL rockchip: rk3588-evb: Use pinctrl and aliases in SPL rockchip: rk3566-pinetab2: Fix reading FIT from SPI flash rockchip: rk3588-coolpi: Add boards to documentation rockchip: rk3588-coolpi: Fix .dtb-file entries in Makefile rockchip: rk3588-toybrick: Use pinctrl and aliases in SPL rockchip: rk3588-toybrick: Add .dtb-file entry in Makefile rockchip: rk3588-turing-rk1: Use dwc3-generic driver rockchip: rk3588-edgeble-neu6: Enable FIT checksum validation rockchip: rk356x-generic: Fix eMMC and SD-card pinctrl rockchip: rk356x-generic: Add support for SPI flash rockchip: rk356x-generic: Add support for USB OTG rockchip: rk3588-generic: Use M0 iomux for UART2 rockchip: rk3588-generic: Add support for USB OTG rockchip: rk35xx-generic: Disable unused features mmc: rockchip_sdhci: Fix 4 blocks PIO mode read limit for RK35xx rockchip: rk3328: Sort imply statements alphabetically rockchip: rk3328: Enable ARMv8 crypto extensions rockchip: io-domain: Add support for RK3328 rockchip: rk3328: Fix bootph prop for vop node Lukasz Czechowski (1): rockchip: px30-board-tpl: Sync ifdef guards with full TPL Quentin Schulz (12): rockchip: ringneck-px30: put STM32_RST line in input mode instead of output rockchip: sdram: Support getting banks from TPL for rk3568 and rk3588 rockchip: NR_DRAM_BANKS now defaults to 10 when Rockchip TPL blob is used rockchip: nanopc-t6-rk3588: use DRAM banks from ATAGS rockchip: quartzpro64-rk3588: use DRAM banks from ATAGS rockchip: rock5a-rk3588s: use DRAM banks from ATAGS rockchip: rock5b-rk3588: use DRAM banks from ATAGS rockchip: evb_rk3588 et al.: use DRAM banks from ATAGS rockchip: toybrick_rk3588: use DRAM banks from ATAGS rockchip: turing-rk1-rk3588: use DRAM banks from ATAGS rockchip: rk3588: use DRAM banks from ATAGS rockchip: rk356x: use DRAM banks from ATAGS arch/arm/dts/Makefile | 5 +- arch/arm/dts/rk3308-evb-u-boot.dtsi | 11 +- arch/arm/dts/rk3308-evb.dts | 104 +- arch/arm/dts/rk3308-roc-cc-u-boot.dtsi | 30 +- arch/arm/dts/rk3308-roc-cc.dts | 83 +- arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 45 +- arch/arm/dts/rk3308-rock-pi-s.dts | 100 +- arch/arm/dts/rk3308-u-boot.dtsi | 120 +- arch/arm/dts/rk3308.dtsi | 1205 ++++++++++---------- arch/arm/dts/rk3328-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi | 7 + arch/arm/dts/rk3399-rock-pi-4a.dts | 10 + arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 6 - arch/arm/dts/rk3566-pinetab2-u-boot.dtsi | 23 +- arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi | 8 +- arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi | 4 +- arch/arm/dts/rk3568-generic-u-boot.dtsi | 7 + arch/arm/dts/rk3568-generic.dts | 37 +- arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 7 +- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 5 +- arch/arm/dts/rk356x-u-boot.dtsi | 122 +- arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi | 8 +- arch/arm/dts/rk3588-generic-u-boot.dtsi | 22 + arch/arm/dts/rk3588-generic.dts | 3 +- arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 8 +- arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi | 7 +- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 8 +- arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 6 +- arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi | 8 +- arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi | 7 +- arch/arm/dts/rk3588s-u-boot.dtsi | 118 +- arch/arm/include/asm/arch-rockchip/bootrom.h | 3 + .../{arch-rk3308 => arch-rockchip}/cru_rk3308.h | 14 + .../{arch-rk3308 => arch-rockchip}/grf_rk3308.h | 0 arch/arm/mach-rockchip/Kconfig | 65 +- arch/arm/mach-rockchip/px30-board-tpl.c | 4 +- arch/arm/mach-rockchip/px30/px30.c | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 1 + arch/arm/mach-rockchip/rk3308/Kconfig | 3 - arch/arm/mach-rockchip/rk3308/clk_rk3308.c | 2 +- arch/arm/mach-rockchip/rk3308/rk3308.c | 3 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 3 + arch/arm/mach-rockchip/rk3368/rk3368.c | 1 + arch/arm/mach-rockchip/rv1126/rv1126.c | 1 + arch/arm/mach-rockchip/sdram.c | 260 +++++ arch/arm/mach-rockchip/spl-boot-order.c | 6 +- arch/arm/mach-rockchip/spl.c | 14 +- board/firefly/firefly-rk3308/MAINTAINERS | 1 + board/firefly/firefly-rk3308/roc_cc_rk3308.c | 2 +- board/friendlyelec/nanopc-t6-rk3588/Makefile | 6 - .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 39 - board/pine64/quartzpro64-rk3588/Makefile | 3 - .../pine64/quartzpro64-rk3588/quartzpro64-rk3588.c | 39 - board/radxa/rock2/MAINTAINERS | 4 +- board/radxa/rock5a-rk3588s/Makefile | 6 - board/radxa/rock5a-rk3588s/rock5a-rk3588s.c | 39 - board/radxa/rock5b-rk3588/Makefile | 6 - board/radxa/rock5b-rk3588/rock5b-rk3588.c | 39 - board/rockchip/evb_rk3308/MAINTAINERS | 5 +- board/rockchip/evb_rk3588/Makefile | 6 - board/rockchip/evb_rk3588/evb-rk3588.c | 39 - board/rockchip/toybrick_rk3588/Makefile | 6 - board/rockchip/toybrick_rk3588/toybrick-rk3588.c | 39 - .../ringneck_px30/ringneck-px30.c | 4 +- board/turing/turing-rk1-rk3588/Makefile | 6 - board/turing/turing-rk1-rk3588/turing-rk1-rk3588.c | 39 - configs/anbernic-rgxx3-rk3566_defconfig | 5 - configs/bpi-r2-pro-rk3568_defconfig | 2 - configs/coolpi-4b-rk3588s_defconfig | 2 - configs/coolpi-cm5-evb-rk3588_defconfig | 2 - configs/evb-rk3308_defconfig | 40 +- configs/evb-rk3328_defconfig | 1 + configs/evb-rk3568_defconfig | 4 +- configs/evb-rk3588_defconfig | 7 +- configs/generic-rk3568_defconfig | 31 +- configs/generic-rk3588_defconfig | 18 +- configs/jaguar-rk3588_defconfig | 1 - configs/lubancat-2-rk3568_defconfig | 1 - configs/nanopc-t6-rk3588_defconfig | 2 - configs/nanopi-r5c-rk3568_defconfig | 1 - configs/nanopi-r5s-rk3568_defconfig | 1 - configs/neu6a-io-rk3588_defconfig | 9 +- configs/neu6b-io-rk3588_defconfig | 9 +- configs/odroid-m1-rk3568_defconfig | 1 - configs/orangepi-5-plus-rk3588_defconfig | 2 - configs/orangepi-5-rk3588s_defconfig | 2 - configs/pinetab2-rk3566_defconfig | 2 +- configs/quartz64-a-rk3566_defconfig | 1 - configs/quartz64-b-rk3566_defconfig | 1 - configs/quartzpro64-rk3588_defconfig | 3 - configs/radxa-cm3-io-rk3566_defconfig | 1 - configs/radxa-e25-rk3568_defconfig | 1 - configs/roc-cc-rk3308_defconfig | 40 +- configs/rock-3a-rk3568_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig | 17 +- configs/rock-pi-s-rk3308_defconfig | 35 +- configs/rock5a-rk3588s_defconfig | 2 - configs/rock5b-rk3588_defconfig | 3 - configs/soquartz-blade-rk3566_defconfig | 1 - configs/soquartz-cm4-rk3566_defconfig | 1 - configs/soquartz-model-a-rk3566_defconfig | 1 - configs/toybrick-rk3588_defconfig | 7 +- configs/turing-rk1-rk3588_defconfig | 4 - doc/board/rockchip/rockchip.rst | 2 + drivers/clk/rockchip/clk_rk3308.c | 101 +- drivers/clk/rockchip/clk_rk3568.c | 36 +- drivers/clk/rockchip/clk_rk3588.c | 6 + drivers/misc/Kconfig | 2 +- drivers/misc/rockchip-io-domain.c | 38 + drivers/mmc/rockchip_sdhci.c | 26 +- drivers/net/gmac_rockchip.c | 4 +- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 20 + drivers/ram/rockchip/sdram_rk3308.c | 2 +- 113 files changed, 1933 insertions(+), 1411 deletions(-) rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/cru_rk3308.h (95%) rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/grf_rk3308.h (100%) delete mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile delete mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c delete mode 100644 board/pine64/quartzpro64-rk3588/Makefile delete mode 100644 board/pine64/quartzpro64-rk3588/quartzpro64-rk3588.c delete mode 100644 board/radxa/rock5a-rk3588s/Makefile delete mode 100644 board/radxa/rock5a-rk3588s/rock5a-rk3588s.c delete mode 100644 board/radxa/rock5b-rk3588/Makefile delete mode 100644 board/radxa/rock5b-rk3588/rock5b-rk3588.c delete mode 100644 board/rockchip/evb_rk3588/Makefile delete mode 100644 board/rockchip/evb_rk3588/evb-rk3588.c delete mode 100644 board/rockchip/toybrick_rk3588/Makefile delete mode 100644 board/rockchip/toybrick_rk3588/toybrick-rk3588.c delete mode 100644 board/turing/turing-rk1-rk3588/Makefile delete mode 100644 board/turing/turing-rk1-rk3588/turing-rk1-rk3588.c

2 1

Pull request for optee-master-26042024
by Ilias Apalodimas 26 Apr '24

26 Apr '24

Hi Tom The following changes since commit d097f9e1299a3bdb7de468f0d9bbc63932f461cd: Merge tag 'fsl-qoriq-2024-4-24' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2024-04-23 17:53:06 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-tpm/ tags/optee-master-26042024 for you to fetch changes up to 4242b3976fdc5c6e7b90fb5bf38c5c345a0a9d49: MAINTAINERS: add entries for tee-related orphaned files (2024-04-26 08:28:35 +0300) The CI in https://source.denx.de/u-boot/custodians/u-boot-tpm/-/pipelines/20537 had no issues Please pull Thanks /Ilias ---------------------------------------------------------------- Minor changes on this PR. Igor added some orphaned OP-TEE related files on the proper section of MAINTAINERS and fixed a potential buffer overflow in tee-sandbox ---------------------------------------------------------------- Igor Opaniuk (2): tee: sandbox: check for buffer size MAINTAINERS: add entries for tee-related orphaned files MAINTAINERS | 9 +++++++++ drivers/tee/sandbox.c | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)

2 1

[PATCH] cmd: mmc: allow use of hardware parittion names for mmc partconf
by Tim Harvey 26 Apr '24

26 Apr '24

eMMC devices have hardware partitions such as user, boot0, and boot1. Allow these names to be displayed when reading the mmc PARTITION_CONFIG field via 'mmc partconf'. Additionally allow a name to be specified when setting the PARTITION_CONFIG. Before: u-boot=> mmc partconf 2 1 1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x2 PARTITION_ACCESS: 0x0 After: u-boot=> mmc partconf 2 1 1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x1 (boot0) PARTITION_ACCESS: 0x0 u-boot=> mmc partconf 2 1 boot1 0 && mmc partconf 2 EXT_CSD[179], PARTITION_CONFIG: BOOT_ACK: 0x1 BOOT_PARTITION_ENABLE: 0x2 (boot1) PARTITION_ACCESS: 0x0 Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- cmd/mmc.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index 2d5430a53079..26692a8e349b 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -14,6 +14,18 @@ #include <part.h> #include <sparse_format.h> #include <image-sparse.h> +#include <linux/ctype.h> + +static const char *mmc_partnames[] = { + "user", + "boot0", + "boot1", + "", + "", + "", + "", + "user", +}; static int curr_device = -1; @@ -918,8 +930,8 @@ static int mmc_partconf_print(struct mmc *mmc, const char *varname) printf("EXT_CSD[179], PARTITION_CONFIG:\n" "BOOT_ACK: 0x%x\n" - "BOOT_PARTITION_ENABLE: 0x%x\n" - "PARTITION_ACCESS: 0x%x\n", ack, part, access); + "BOOT_PARTITION_ENABLE: 0x%x (%s)\n" + "PARTITION_ACCESS: 0x%x\n", ack, part, mmc_partnames[part], access); return CMD_RET_SUCCESS; } @@ -949,7 +961,14 @@ static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag, return mmc_partconf_print(mmc, cmd_arg2(argc, argv)); ack = dectoul(argv[2], NULL); - part_num = dectoul(argv[3], NULL); + if (!isdigit(*argv[3])) { + for (part_num = 0; part_num < ARRAY_SIZE(mmc_partnames); part_num++) { + if (!strcmp(argv[3], mmc_partnames[part_num])) + break; + } + } else { + part_num = dectoul(argv[3], NULL); + } access = dectoul(argv[4], NULL); /* acknowledge to be sent during boot operation */ -- 2.25.1

3 6

[PATCH] cmd: move ELF load and boot to lib/elf.c
by Maxim Moskalets 26 Apr '24

26 Apr '24

Loading and running the ELF image is the responsibility of the library and should not be associated with the command line interface. It is also required to run ELF images from FIT with the bootm command so as not to depend on the command line interface. Signed-off-by: Maxim Moskalets <maximmosk4(a)gmail.com> --- cmd/elf.c | 49 +++++++++++++++++-------------------------------- include/elf.h | 10 ++++++++++ lib/elf.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 32 deletions(-) diff --git a/cmd/elf.c b/cmd/elf.c index df4354d374..8bbdc67db7 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -20,21 +20,6 @@ #include <linux/linkage.h> #endif -/* Allow ports to override the default behavior */ -static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]), - int argc, char *const argv[]) -{ - unsigned long ret; - - /* - * pass address parameter as argv[0] (aka command name), - * and all remaining args - */ - ret = entry(argc, argv); - - return ret; -} - /* Interpreter command to boot an arbitrary ELF image from memory */ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -44,8 +29,8 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) #endif unsigned long addr; /* Address of the ELF image */ unsigned long rc; /* Return value from user code */ - char *sload = NULL; int rcode = 0; + Bootelf_flags flags = {0}; /* Consume 'bootelf' */ argc--; argv++; @@ -53,7 +38,10 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Check for [-p|-s] flag. */ if (argc >= 1 && (argv[0][0] == '-' && \ (argv[0][1] == 'p' || argv[0][1] == 's'))) { - sload = argv[0]; + if (argv[0][1] == 'p') + flags.phdr = 1; + printf("## Try to elf hdr format %s\n", + flags.phdr ? "phdr" : "shdr"); /* Consume flag. */ argc--; argv++; } @@ -76,14 +64,6 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } else addr = image_load_addr; - if (!valid_elf_image(addr)) - return 1; - - if (sload && sload[1] == 'p') - addr = load_elf_image_phdr(addr); - else - addr = load_elf_image_shdr(addr); - #if CONFIG_IS_ENABLED(CMD_ELF_FDT_SETUP) if (fdt_addr) { printf("## Setting up FDT at 0x%08lx ...\n", fdt_addr); @@ -94,21 +74,26 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } #endif - if (!env_get_autostart()) - return rcode; - - printf("## Starting application at 0x%08lx ...\n", addr); - flush(); + if (env_get_autostart()) { + flags.autostart = 1; + printf("## Starting application at 0x%08lx ...\n", addr); + flush(); + } /* * pass address parameter as argv[0] (aka command name), * and all remaining args */ - rc = do_bootelf_exec((void *)addr, argc, argv); + rc = bootelf(addr, flags, argc, argv); if (rc != 0) rcode = 1; - printf("## Application terminated, rc = 0x%lx\n", rc); + if (flags.autostart) { + if (ENOEXEC == errno) + printf("## Invalid ELF image\n"); + else + printf("## Application terminated, rc = 0x%lx\n", rc); + } return rcode; } diff --git a/include/elf.h b/include/elf.h index a4ba74d8ab..b88e6cf403 100644 --- a/include/elf.h +++ b/include/elf.h @@ -12,6 +12,12 @@ #ifndef __ASSEMBLY__ #include "compiler.h" +/* Flag param bits for bootelf() function */ +typedef struct { + unsigned phdr : 1; /* load via program (not section) headers */ + unsigned autostart : 1; /* Start ELF after loading */ +} Bootelf_flags; + /* This version doesn't work for 64-bit ABIs - Erik */ /* These typedefs need to be handled better */ @@ -700,6 +706,10 @@ unsigned long elf_hash(const unsigned char *name); #define R_RISCV_RELATIVE 3 #ifndef __ASSEMBLY__ +unsigned long bootelf_exec(ulong (*entry)(int, char * const[]), + int argc, char *const argv[]); +unsigned long bootelf(unsigned long addr, Bootelf_flags flags, + int argc, char *const argv[]); int valid_elf_image(unsigned long addr); unsigned long load_elf64_image_phdr(unsigned long addr); unsigned long load_elf64_image_shdr(unsigned long addr); diff --git a/lib/elf.c b/lib/elf.c index 9a794f9cba..0f3d752758 100644 --- a/lib/elf.c +++ b/lib/elf.c @@ -7,6 +7,7 @@ #include <cpu_func.h> #include <elf.h> #include <env.h> +#include <errno.h> #include <net.h> #include <vxworks.h> #ifdef CONFIG_X86 @@ -15,6 +16,41 @@ #include <linux/linkage.h> #endif +/* Allow ports to override the default behavior */ +unsigned long bootelf_exec(ulong (*entry)(int, char * const[]), + int argc, char *const argv[]) +{ + return entry(argc, argv); +} + +/* + * Boot ELF from memory + * + * addr - loading address of ELF in memory + * flags - bits like ELF_PHDR to control boot details + * argc, argv - may be used to pass command line arguments (maybe unused) + * + * Sets errno = ENOEXEC if ELF image is not valid + */ +unsigned long bootelf(unsigned long addr, Bootelf_flags flags, + int argc, char *const argv[]) +{ + unsigned long entry_addr; + + if (!valid_elf_image(addr)) { + errno = ENOEXEC; + return 1; + } + + entry_addr = flags.phdr ? load_elf_image_phdr(addr) + : load_elf_image_shdr(addr); + + if (!flags.autostart) + return 0; + + return bootelf_exec((void *)entry_addr, argc, argv);; +} + /* * A very simple ELF64 loader, assumes the image is valid, returns the * entry point address. -- 2.39.2

3 2

Many USB storage drives fail in latest U-boot
by Chris Ziomkowski 26 Apr '24

26 Apr '24

Hi everyone, The latest version of u-boot seems to have some serious issues with USB drives. More than half of my disks do not work. I have traced the issue down to the following: 1. During a transfer, the XHCI TRB ring buffer reports back an error of type 4. (USB Transaction Error) 2. The COMP_TX_ERR is not matched in 'drivers/usb/host/xhci-ring.c:record_transfer_result()', so the status gets set to the default value in the switch statement: udev->status = 0x80; /* USB_ST_TOO_LAZY_TO_MAKE_A_NEW_MACRO */ 3. 'common/usb.c:usb_bulk_msg()' then incorrectly reports this as a timeout 4. On the next loop, an endpoint reset is attempted, which fails with another completion code 4, and the USB subsystem becomes stuck in an loop trying to reset the drive until it finally gives up. Question: how should this situation be handled? Can we recover from it? It doesn't appear the current logic was designed to handle it (or at least it doesn't handle it). The XHCI documentation lists a code 4 as a result of: "Asserted in the case where the host did not receive a valid response from the device (Timeout, CRC, Bad PID, unexpected NYET, etc.)." Can the individual who is maintaining this section of the code (or anyone knowledgeable about the implementation) offer some advice on how this should be corrected? Best regards, Chris

1 0