March 2022 - U-Boot

[ANN] U-Boot v2022.04-rc1 released
by Tom Rini 30 Mar '22

30 Mar '22

Hey all, It's release day and so here's v2022.04-rc1. While there's much in here that needed to come in, there's a few big things outstanding, including but not limited to i.MX and layerscape syncs and further sunxi changes. In terms of a changelog, git log --merges v2022.01..v2022.04-rc1 contains what I've pulled but as always, better PR messages and tags will provide better results here. So we're now looking at regular releases every other Monday, and with final release on April 4th, 2022. Thanks all! -- Tom

5 13

[PATCH 1/2] net: phy: marvell: Support reg config via "marvell, reg-init" DT property
by Stefan Roese 30 Mar '22

30 Mar '22

This patch adds support for the "marvell,reg-init" DT property, which is used to describe board specific Marvell PHY register configurations in the board dts file. This DT property is supported in the Linux Kernel since a longer time. Adding it to U-Boot now, enables the boards which describe the register settings in their DT files here as well. I've included calling this marvell_of_reg_init() to all foo_config() functions in this patch as well. If CONFIG_DM_ETH is not set, there is no ofnode, or no "marvell,reg-init" property, the PHY initialization is unchanged. The function marvell_of_reg_init() is a port of the Linux version. Please note that I explicitly did not add error checking and handling to the U-Boot version, as this is basically not done for phy_read/write in this Marvell PHY code. This will be used by the upcoming ethernet support on the MIPS Octeon EBB 7304 board. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Aaron Williams <awilliams(a)marvell.com> Cc: Chandrakala Chavva <cchavva(a)marvell.com> --- drivers/net/phy/marvell.c | 100 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index a62c695c5c84..41520c6d392a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -104,6 +104,88 @@ #define MIIM_88E151x_MODE_SGMII 1 #define MIIM_88E151x_RESET_OFFS 15 +static int marvell_read_page(struct phy_device *phydev) +{ + return phy_read(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE); +} + +static int marvell_write_page(struct phy_device *phydev, int page) +{ + return phy_write(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE, page); +} + +#if IS_ENABLED(CONFIG_DM_ETH) +/* Set and/or override some configuration registers based on the + * marvell,reg-init property stored in the of_node for the phydev. + * + * marvell,reg-init = <reg-page reg mask value>,...; + * + * There may be one or more sets of <reg-page reg mask value>: + * + * reg-page: which register bank to use. + * reg: the register. + * mask: if non-zero, ANDed with existing register value. + * value: ORed with the masked value and written to the regiser. + * + */ +static int marvell_of_reg_init(struct phy_device *phydev) +{ + const __be32 *prop; + int len, i, saved_page, current_page, ret = 0; + + if (!ofnode_valid(phydev->node)) + return 0; + + prop = ofnode_get_property(phydev->node, "marvell,reg-init", &len); + if (!prop) + return 0; + + saved_page = marvell_read_page(phydev); + if (saved_page < 0) + goto err; + current_page = saved_page; + + len /= sizeof(*prop); + for (i = 0; i < len - 3; i += 4) { + u16 page = be32_to_cpup(prop + i); + u16 reg = be32_to_cpup(prop + i + 1); + u16 mask = be32_to_cpup(prop + i + 2); + u16 val_bits = be32_to_cpup(prop + i + 3); + int val; + + if (page != current_page) { + current_page = page; + ret = marvell_write_page(phydev, page); + if (ret < 0) + goto err; + } + + val = 0; + if (mask) { + val = phy_read(phydev, MDIO_DEVAD_NONE, reg); + if (val < 0) { + ret = val; + goto err; + } + val &= mask; + } + val |= val_bits; + + ret = phy_write(phydev, MDIO_DEVAD_NONE, reg, val); + if (ret < 0) + goto err; + } + +err: + return marvell_write_page(phydev, saved_page); +} +#else +static int marvell_of_reg_init(struct phy_device *phydev) +{ + return 0; +} +#endif /* CONFIG_DM_ETH */ + static int m88e1xxx_phy_extread(struct phy_device *phydev, int addr, int devaddr, int regnum) { @@ -143,6 +225,8 @@ static int m88e1011s_config(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET); + marvell_of_reg_init(phydev); + genphy_config_aneg(phydev); return 0; @@ -298,6 +382,8 @@ static int m88e1111s_config(struct phy_device *phydev) /* soft reset */ phy_reset(phydev); + marvell_of_reg_init(phydev); + genphy_config_aneg(phydev); genphy_restart_aneg(phydev); @@ -397,6 +483,8 @@ static int m88e151x_config(struct phy_device *phydev) /* soft reset */ phy_reset(phydev); + marvell_of_reg_init(phydev); + genphy_config_aneg(phydev); genphy_restart_aneg(phydev); @@ -417,6 +505,8 @@ static int m88e1118_config(struct phy_device *phydev) /* Change Page Number */ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000); + marvell_of_reg_init(phydev); + return genphy_config_aneg(phydev); } @@ -439,6 +529,8 @@ static int m88e1121_config(struct phy_device *phydev) { int pg; + marvell_of_reg_init(phydev); + /* Configure the PHY */ genphy_config_aneg(phydev); @@ -479,6 +571,8 @@ static int m88e1145_config(struct phy_device *phydev) MIIM_M88E1145_RGMII_TX_DELAY; phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1145_PHY_EXT_CR, reg); + marvell_of_reg_init(phydev); + genphy_config_aneg(phydev); /* soft reset */ @@ -511,6 +605,8 @@ static int m88e1149_config(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x0); phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x100); + marvell_of_reg_init(phydev); + genphy_config_aneg(phydev); phy_reset(phydev); @@ -544,6 +640,8 @@ static int m88e1310_config(struct phy_device *phydev) /* Ensure to return to page 0 */ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000); + marvell_of_reg_init(phydev); + return genphy_config_aneg(phydev); } @@ -578,6 +676,8 @@ static int m88e1680_config(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000); phy_write(phydev, MDIO_DEVAD_NONE, 0, 0x9140); + marvell_of_reg_init(phydev); + res = genphy_config_aneg(phydev); if (res < 0) return res; -- 2.35.1

2 4

[PATCH v4 1/4] dm: core: Bind another driver with the same compatible string
by Michal Simek 30 Mar '22

30 Mar '22

When one IP can have multiple configurations (like timer and PWM) covered by multiple drivers. Because it is the same IP it should also have the same compatible string. Current code look for the first driver which matches compatible string and call bind function. If this is not the right driver which is express by returning -ENODEV ("Driver XYZ refuses to bind") there is no reason not to continue over compatible list to try to find out different driver with the same compatible string which match it. When the first compatible string is found core looks for driver bind() function. If if assigned driver refuse to bind, core continue in a loop to check if there is another driver which match compatible string. This driver is going to be used with cdnc,ttc driver which has driver as timer and also can be used as PWM. The difference is done via #pwm-cells property in DT. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v4: - Remove goto from code - Also continue on prereloc case Changes in v3: - New patch in series When this is acked I will spent my time on writing test for it. --- drivers/core/lists.c | 84 +++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 5d4f2ea0e3ad..8b655db68edb 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -221,45 +221,65 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp, compat = compat_list + i; log_debug(" - attempt to match compatible string '%s'\n", compat); - - for (entry = driver; entry != driver + n_ents; entry++) { - ret = driver_check_compatible(entry->of_match, &id, - compat); - if ((drv) && (drv == entry)) - break; - if (!ret) + entry = driver; + + while (1) { + for (; entry != driver + n_ents; entry++) { + ret = driver_check_compatible(entry->of_match, + &id, compat); + if (drv && drv == entry) + break; + if (!ret) + break; + } + /* + * Reach the last entry - time to look at next + * compatible string. + */ + if (entry == driver + n_ents) break; - } - if (entry == driver + n_ents) - continue; - - if (pre_reloc_only) { - if (!ofnode_pre_reloc(node) && - !(entry->flags & DM_FLAG_PRE_RELOC)) { - log_debug("Skipping device pre-relocation\n"); - return 0; + + if (pre_reloc_only) { + if (!ofnode_pre_reloc(node) && + !(entry->flags & DM_FLAG_PRE_RELOC)) { + log_debug("Skipping device pre-relocation\n"); + entry++; + continue; + } } - } - log_debug(" - found match at '%s': '%s' matches '%s'\n", - entry->name, entry->of_match->compatible, - id->compatible); - ret = device_bind_with_driver_data(parent, entry, name, - id->data, node, &dev); - if (ret == -ENODEV) { - log_debug("Driver '%s' refuses to bind\n", entry->name); - continue; - } - if (ret) { - dm_warn("Error binding driver '%s': %d\n", entry->name, - ret); - return log_msg_ret("bind", ret); - } else { + log_debug(" - found match at '%s': '%s' matches '%s'\n", + entry->name, entry->of_match->compatible, + id->compatible); + ret = device_bind_with_driver_data(parent, entry, name, + id->data, node, + &dev); + /* + * Driver found but didn't bind properly try another one + */ + if (ret == -ENODEV) { + log_debug("Driver '%s' refuses to bind\n", + entry->name); + entry++; + continue; + } + + /* Error in binding driver */ + if (ret) { + dm_warn("Error binding driver '%s': %d\n", + entry->name, ret); + return log_msg_ret("bind", ret); + } + + /* Properly binded driver */ found = true; if (devp) *devp = dev; + break; } - break; + + if (found) + break; } if (!found && !result && ret != -ENODEV) -- 2.33.1

3 8

Broken P2020 board since commit be7dbb60c5bf ("Convert CONFIG_SYS_IMMR to Kconfig")
by Pali Rohár 30 Mar '22

30 Mar '22

Hello! In current master branch is U-Boot for P2020 board (powerpc mpc85xx based) built by P2020RDB-PC_SDCARD_defconfig completely broken. U-Boot does not work at all and on UART is nothing printed. I run git bisect and it found commit which broke this P2020 board: be7dbb60c5bfa38ea444fe7de1dca8bd35f83f5b is the first bad commit commit be7dbb60c5bfa38ea444fe7de1dca8bd35f83f5b Author: Tom Rini <trini(a)konsulko.com> Date: Sun Dec 12 22:12:30 2021 -0500 Convert CONFIG_SYS_IMMR to Kconfig This converts the following to Kconfig: CONFIG_SYS_IMMR We do this by consolidating the SYS_IMMR options we have and providing defaults. We also, in the few places where M68K was also sharing code with these platforms, define it within the file to CONFIG_SYS_MBAR to match usage. This should be cleaned up longer term. Signed-off-by: Tom Rini <trini(a)konsulko.com> :040000 040000 12f819284e85d64b7df5da65476038a542e587f5 ea3da4aefeee93f1566be6b7f85a43846f29aa8b M arch :040000 040000 afe083b1f22b57470532d2a2c3c37b6a5d4a68d4 302d04810c9449622ce43982f562d2e8400086ec M configs :040000 040000 411b7912fc83c8aaf25adf5647400625793cee38 0eff4a6f6e7b5f21bc3d533e1c5bc1cd2a5ed86b M drivers :040000 040000 b7d8b45f803b3619f76be355193d5c5645e76782 be2ac1c8506e99d1f9c615ad09477884f5ce1231 M include So it is relatively new change (Dec 2021). Tom, any idea how this commit could broke P2020 board which is mpc85xx platform? I do not see nothing suspicious in this commit. Before this commit BootROM can successfully boot SPL without any issues and SPL prints info on UART. This board use include/configs/p1_p2_rdb_pc.h config file and it was not touched at all. Priyanka, Wolfgang, you are marked as maintainers, do you know how to debug this issue? Or do you have some P2020 board or other mpc85xx based, so you could test if U-Boot is working on this platform? For reference I built U-Boot SPL by these commands: make CROSS_COMPILE=powerpc-linux-gnuspe- P2020RDB-PC_SDCARD_defconfig spl/u-boot-spl.bin boot_format config_sram_p2020rdb.dat spl/u-boot-spl.bin -spi u-boot.sdcard.bin boot_format and config_sram_p2020rdb.dat are taken from the upstream git repo from the latest branch nxp/sdk-v2.0.x: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format u-boot.sdcard.bin is then copied to SD card (starting from sector zero).

2 4

[ANN] U-Boot v2022.04-rc5 released
by Tom Rini 30 Mar '22

30 Mar '22

Hey all, It's release day and so here's v2022.04-rc5. The release itself is next week and the next branch is open. I've merged all regression and critical fixes I know of so if something else is missing please speak up as soon as possible. In terms of a changelog, git log --merges v2022.04-rc4..v2022.04-rc5 contains what I've pulled but as always, better PR messages and tags will provide better results here. The next release will be the final one in this cycle, April 4th 2022. Thanks all! -- Tom

5 12

[PATCH] doc: mmc dev
by Patrick Delaunay 30 Mar '22

30 Mar '22

Provide human readable descriptions of the speed nodes instead of the name of constants from the code as it is already done for 'mmc rescan' command in commit 212f078496e4 ("doc: mmc rescan speed mode"). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- doc/usage/mmc.rst | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/doc/usage/mmc.rst b/doc/usage/mmc.rst index 02b5d7b1c7..55e3f9cf98 100644 --- a/doc/usage/mmc.rst +++ b/doc/usage/mmc.rst @@ -85,22 +85,26 @@ The 'mmc dev' command shows or set current mmc device. mode speed mode to set. - CONFIG_MMC_SPEED_MODE_SET should be enabled. The required speed mode is - passed as the index from the following list. - - 0 - MMC_LEGACY - 1 - MMC_HS - 2 - SD_HS - 3 - MMC_HS_52 - 4 - MMC_DDR_52 - 5 - UHS_SDR12 - 6 - UHS_SDR25 - 7 - UHS_SDR50 - 8 - UHS_DDR50 - 9 - UHS_SDR104 - 10 - MMC_HS_200 - 11 - MMC_HS_400 - 12 - MMC_HS_400_ES + CONFIG_MMC_SPEED_MODE_SET should be enabled. The requested speed mode is + passed as a decimal number according to the following table: + + ========== ========================== + Speed mode Description + ========== ========================== + 0 MMC legacy + 1 MMC High Speed (26MHz) + 2 SD High Speed (50MHz) + 3 MMC High Speed (52MHz) + 4 MMC DDR52 (52MHz) + 5 UHS SDR12 (25MHz) + 6 UHS SDR25 (50MHz) + 7 UHS SDR50 (100MHz) + 8 UHS DDR50 (50MHz) + 9 UHS SDR104 (208MHz) + 10 HS200 (200MHz) + 11 HS400 (200MHz) + 12 HS400ES (200MHz) + ========== ========================== A speed mode can be set only if it has already been enabled in the device tree -- 2.25.1

4 3

[PATCH] armv8/fsl-lsch3: Suppress spurious warning on Layerscape CPUs
by stcarlso＠linux.microsoft.com 29 Mar '22

29 Mar '22

From: Stephen Carlson <stcarlso(a)linux.microsoft.com> NXP/Freescale Layerscape CPUs support high-speed serial interfaces (SERDES) that can be configured for the application. Interfaces not used by the application can be set to protocol 0 to turn them off and save power, but U-Boot would emit a warning that 0 was invalid for a SERDES protocol on boot. Replace the warning text with a notice that the SERDES is disabled. Signed-off-by: Stephen Carlson <stcarlso(a)linux.microsoft.com> Cc: Priyanka Jain <priyanka.jain(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index fad7a93566..181bd9c1b4 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -147,10 +147,14 @@ void serdes_init(u32 sd, u32 sd_addr, u32 rcwsr, u32 sd_prctl_mask, cfg >>= sd_prctl_shift; cfg = serdes_get_number(sd, cfg); - printf("Using SERDES%d Protocol: %d (0x%x)\n", sd + 1, cfg, cfg); + if (cfg == 0) { + printf("SERDES%d is disabled\n", sd + 1); + } else { + printf("Using SERDES%d Protocol: %d (0x%x)\n", sd + 1, cfg, cfg); - if (!is_serdes_prtcl_valid(sd, cfg)) - printf("SERDES%d[PRTCL] = 0x%x is not valid\n", sd + 1, cfg); + if (!is_serdes_prtcl_valid(sd, cfg)) + printf("SERDES%d[PRTCL] = 0x%x is not valid\n", sd + 1, cfg); + } for (lane = 0; lane < SRDS_MAX_LANES; lane++) { enum srds_prtcl lane_prtcl = serdes_get_prtcl(sd, cfg, lane); -- 2.17.1

1 0

[PATCH 0/2] DSA switch fixes
by Vladimir Oltean 29 Mar '22

29 Mar '22

This small patch set contains some bug fixes. The first is for the recently introduced ->port_probe() DSA switch method, and the second is for the recently introduced SJA1105 driver. Vladimir Oltean (2): net: dsa: fix phydev->speed being uninitialized for the CPU port fixed PHY net: dsa: sja1105: fix device id detection drivers/net/sja1105.c | 6 ------ net/dsa-uclass.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) -- 2.25.1

3 13

[PATCH] doc: usage: Group all shell command docs into cmd/ sub-direcotry
by Bin Meng 29 Mar '22

29 Mar '22

Currently all shell command docs are put in the doc/usage root. Let's group them into cmd/ sub-direcotry. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- doc/usage/{ => cmd}/acpi.rst | 0 doc/usage/{ => cmd}/addrmap.rst | 0 doc/usage/{ => cmd}/askenv.rst | 0 doc/usage/{ => cmd}/base.rst | 0 doc/usage/{ => cmd}/bootefi.rst | 0 doc/usage/{ => cmd}/booti.rst | 0 doc/usage/{ => cmd}/bootmenu.rst | 0 doc/usage/{ => cmd}/button.rst | 0 doc/usage/{x86 => cmd}/cbsysinfo.rst | 0 doc/usage/{ => cmd}/conitrace.rst | 0 doc/usage/{ => cmd}/echo.rst | 0 doc/usage/{ => cmd}/exception.rst | 0 doc/usage/{ => cmd}/exit.rst | 0 doc/usage/{ => cmd}/extension.rst | 0 doc/usage/{ => cmd}/false.rst | 0 doc/usage/{ => cmd}/fatinfo.rst | 0 doc/usage/{ => cmd}/fatload.rst | 0 doc/usage/{ => cmd}/for.rst | 0 doc/usage/{ => cmd}/load.rst | 0 doc/usage/{ => cmd}/loady.rst | 0 doc/usage/{ => cmd}/mbr.rst | 0 doc/usage/{ => cmd}/md.rst | 0 doc/usage/{ => cmd}/mmc.rst | 0 doc/usage/{ => cmd}/pinmux.rst | 0 doc/usage/{ => cmd}/pstore.rst | 0 doc/usage/{ => cmd}/qfw.rst | 0 doc/usage/{ => cmd}/reset.rst | 0 doc/usage/{ => cmd}/sbi.rst | 0 doc/usage/{ => cmd}/scp03.rst | 0 doc/usage/{ => cmd}/setexpr.rst | 0 doc/usage/{ => cmd}/sf.rst | 0 doc/usage/{ => cmd}/size.rst | 0 doc/usage/{ => cmd}/true.rst | 0 doc/usage/{ => cmd}/ums.rst | 0 doc/usage/index.rst | 68 ++++++++++++++-------------- 35 files changed, 34 insertions(+), 34 deletions(-) rename doc/usage/{ => cmd}/acpi.rst (100%) rename doc/usage/{ => cmd}/addrmap.rst (100%) rename doc/usage/{ => cmd}/askenv.rst (100%) rename doc/usage/{ => cmd}/base.rst (100%) rename doc/usage/{ => cmd}/bootefi.rst (100%) rename doc/usage/{ => cmd}/booti.rst (100%) rename doc/usage/{ => cmd}/bootmenu.rst (100%) rename doc/usage/{ => cmd}/button.rst (100%) rename doc/usage/{x86 => cmd}/cbsysinfo.rst (100%) rename doc/usage/{ => cmd}/conitrace.rst (100%) rename doc/usage/{ => cmd}/echo.rst (100%) rename doc/usage/{ => cmd}/exception.rst (100%) rename doc/usage/{ => cmd}/exit.rst (100%) rename doc/usage/{ => cmd}/extension.rst (100%) rename doc/usage/{ => cmd}/false.rst (100%) rename doc/usage/{ => cmd}/fatinfo.rst (100%) rename doc/usage/{ => cmd}/fatload.rst (100%) rename doc/usage/{ => cmd}/for.rst (100%) rename doc/usage/{ => cmd}/load.rst (100%) rename doc/usage/{ => cmd}/loady.rst (100%) rename doc/usage/{ => cmd}/mbr.rst (100%) rename doc/usage/{ => cmd}/md.rst (100%) rename doc/usage/{ => cmd}/mmc.rst (100%) rename doc/usage/{ => cmd}/pinmux.rst (100%) rename doc/usage/{ => cmd}/pstore.rst (100%) rename doc/usage/{ => cmd}/qfw.rst (100%) rename doc/usage/{ => cmd}/reset.rst (100%) rename doc/usage/{ => cmd}/sbi.rst (100%) rename doc/usage/{ => cmd}/scp03.rst (100%) rename doc/usage/{ => cmd}/setexpr.rst (100%) rename doc/usage/{ => cmd}/sf.rst (100%) rename doc/usage/{ => cmd}/size.rst (100%) rename doc/usage/{ => cmd}/true.rst (100%) rename doc/usage/{ => cmd}/ums.rst (100%) diff --git a/doc/usage/acpi.rst b/doc/usage/cmd/acpi.rst similarity index 100% rename from doc/usage/acpi.rst rename to doc/usage/cmd/acpi.rst diff --git a/doc/usage/addrmap.rst b/doc/usage/cmd/addrmap.rst similarity index 100% rename from doc/usage/addrmap.rst rename to doc/usage/cmd/addrmap.rst diff --git a/doc/usage/askenv.rst b/doc/usage/cmd/askenv.rst similarity index 100% rename from doc/usage/askenv.rst rename to doc/usage/cmd/askenv.rst diff --git a/doc/usage/base.rst b/doc/usage/cmd/base.rst similarity index 100% rename from doc/usage/base.rst rename to doc/usage/cmd/base.rst diff --git a/doc/usage/bootefi.rst b/doc/usage/cmd/bootefi.rst similarity index 100% rename from doc/usage/bootefi.rst rename to doc/usage/cmd/bootefi.rst diff --git a/doc/usage/booti.rst b/doc/usage/cmd/booti.rst similarity index 100% rename from doc/usage/booti.rst rename to doc/usage/cmd/booti.rst diff --git a/doc/usage/bootmenu.rst b/doc/usage/cmd/bootmenu.rst similarity index 100% rename from doc/usage/bootmenu.rst rename to doc/usage/cmd/bootmenu.rst diff --git a/doc/usage/button.rst b/doc/usage/cmd/button.rst similarity index 100% rename from doc/usage/button.rst rename to doc/usage/cmd/button.rst diff --git a/doc/usage/x86/cbsysinfo.rst b/doc/usage/cmd/cbsysinfo.rst similarity index 100% rename from doc/usage/x86/cbsysinfo.rst rename to doc/usage/cmd/cbsysinfo.rst diff --git a/doc/usage/conitrace.rst b/doc/usage/cmd/conitrace.rst similarity index 100% rename from doc/usage/conitrace.rst rename to doc/usage/cmd/conitrace.rst diff --git a/doc/usage/echo.rst b/doc/usage/cmd/echo.rst similarity index 100% rename from doc/usage/echo.rst rename to doc/usage/cmd/echo.rst diff --git a/doc/usage/exception.rst b/doc/usage/cmd/exception.rst similarity index 100% rename from doc/usage/exception.rst rename to doc/usage/cmd/exception.rst diff --git a/doc/usage/exit.rst b/doc/usage/cmd/exit.rst similarity index 100% rename from doc/usage/exit.rst rename to doc/usage/cmd/exit.rst diff --git a/doc/usage/extension.rst b/doc/usage/cmd/extension.rst similarity index 100% rename from doc/usage/extension.rst rename to doc/usage/cmd/extension.rst diff --git a/doc/usage/false.rst b/doc/usage/cmd/false.rst similarity index 100% rename from doc/usage/false.rst rename to doc/usage/cmd/false.rst diff --git a/doc/usage/fatinfo.rst b/doc/usage/cmd/fatinfo.rst similarity index 100% rename from doc/usage/fatinfo.rst rename to doc/usage/cmd/fatinfo.rst diff --git a/doc/usage/fatload.rst b/doc/usage/cmd/fatload.rst similarity index 100% rename from doc/usage/fatload.rst rename to doc/usage/cmd/fatload.rst diff --git a/doc/usage/for.rst b/doc/usage/cmd/for.rst similarity index 100% rename from doc/usage/for.rst rename to doc/usage/cmd/for.rst diff --git a/doc/usage/load.rst b/doc/usage/cmd/load.rst similarity index 100% rename from doc/usage/load.rst rename to doc/usage/cmd/load.rst diff --git a/doc/usage/loady.rst b/doc/usage/cmd/loady.rst similarity index 100% rename from doc/usage/loady.rst rename to doc/usage/cmd/loady.rst diff --git a/doc/usage/mbr.rst b/doc/usage/cmd/mbr.rst similarity index 100% rename from doc/usage/mbr.rst rename to doc/usage/cmd/mbr.rst diff --git a/doc/usage/md.rst b/doc/usage/cmd/md.rst similarity index 100% rename from doc/usage/md.rst rename to doc/usage/cmd/md.rst diff --git a/doc/usage/mmc.rst b/doc/usage/cmd/mmc.rst similarity index 100% rename from doc/usage/mmc.rst rename to doc/usage/cmd/mmc.rst diff --git a/doc/usage/pinmux.rst b/doc/usage/cmd/pinmux.rst similarity index 100% rename from doc/usage/pinmux.rst rename to doc/usage/cmd/pinmux.rst diff --git a/doc/usage/pstore.rst b/doc/usage/cmd/pstore.rst similarity index 100% rename from doc/usage/pstore.rst rename to doc/usage/cmd/pstore.rst diff --git a/doc/usage/qfw.rst b/doc/usage/cmd/qfw.rst similarity index 100% rename from doc/usage/qfw.rst rename to doc/usage/cmd/qfw.rst diff --git a/doc/usage/reset.rst b/doc/usage/cmd/reset.rst similarity index 100% rename from doc/usage/reset.rst rename to doc/usage/cmd/reset.rst diff --git a/doc/usage/sbi.rst b/doc/usage/cmd/sbi.rst similarity index 100% rename from doc/usage/sbi.rst rename to doc/usage/cmd/sbi.rst diff --git a/doc/usage/scp03.rst b/doc/usage/cmd/scp03.rst similarity index 100% rename from doc/usage/scp03.rst rename to doc/usage/cmd/scp03.rst diff --git a/doc/usage/setexpr.rst b/doc/usage/cmd/setexpr.rst similarity index 100% rename from doc/usage/setexpr.rst rename to doc/usage/cmd/setexpr.rst diff --git a/doc/usage/sf.rst b/doc/usage/cmd/sf.rst similarity index 100% rename from doc/usage/sf.rst rename to doc/usage/cmd/sf.rst diff --git a/doc/usage/size.rst b/doc/usage/cmd/size.rst similarity index 100% rename from doc/usage/size.rst rename to doc/usage/cmd/size.rst diff --git a/doc/usage/true.rst b/doc/usage/cmd/true.rst similarity index 100% rename from doc/usage/true.rst rename to doc/usage/cmd/true.rst diff --git a/doc/usage/ums.rst b/doc/usage/cmd/ums.rst similarity index 100% rename from doc/usage/ums.rst rename to doc/usage/cmd/ums.rst diff --git a/doc/usage/index.rst b/doc/usage/index.rst index ecb4908fd1..5c5fbf51b8 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -18,40 +18,40 @@ Shell commands .. toctree:: :maxdepth: 1 - acpi - addrmap - askenv - base - bootefi - booti - bootmenu - button - x86/cbsysinfo - conitrace - echo - exception - extension - exit - false - fatinfo - fatload - for - load - loady - mbr - md - mmc - pinmux - pstore - qfw - reset - sbi - sf - scp03 - setexpr - size - true - ums + cmd/acpi + cmd/addrmap + cmd/askenv + cmd/base + cmd/bootefi + cmd/booti + cmd/bootmenu + cmd/button + cmd/cbsysinfo + cmd/conitrace + cmd/echo + cmd/exception + cmd/extension + cmd/exit + cmd/false + cmd/fatinfo + cmd/fatload + cmd/for + cmd/load + cmd/loady + cmd/mbr + cmd/md + cmd/mmc + cmd/pinmux + cmd/pstore + cmd/qfw + cmd/reset + cmd/sbi + cmd/sf + cmd/scp03 + cmd/setexpr + cmd/size + cmd/true + cmd/ums Booting OS ---------- -- 2.25.1

2 1

[PATCH] mtd: rawnand: mxs_nand: Fix use_minimum_ecc for spl driver
by Ye Li 29 Mar '22

29 Mar '22

Because mxs_nand_spl driver does not support DM, to use the minimum ECC layout, it needs to handle the CONFIG_NAND_MXS_USE_MINIMUM_ECC. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- drivers/mtd/nand/raw/mxs_nand.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index ee5d7fd..28e189a 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -1380,6 +1380,10 @@ int mxs_nand_init_spl(struct nand_chip *nand) else nand_info->max_ecc_strength_supported = 40; +#ifdef CONFIG_NAND_MXS_USE_MINIMUM_ECC + nand_info->use_minimum_ecc = true; +#endif + err = mxs_nand_alloc_buffers(nand_info); if (err) return err; -- 2.7.4

3 2