December 2020 - U-Boot

[GIT PULL] Pull request: u-boot-imx u-boot-imx-20201208
by Stefano Babic 09 Dec '20

09 Dec '20

Hi Tom, please pull from u-boot-imx, thanks ! Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/748076494 The following changes since commit ee1e04558ff8c8ed812b986939447f129bb0b0bb: Merge branch '2020-12-02-master-imports' (2020-12-03 09:43:47 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git for you to fetch changes up to 8c5ea5361c1728c162dd5ce796654c5aef77420e: configs: migrate CONFIG_IMX_THERMAL to defconfigs (2020-12-07 08:54:29 +0100) ---------------------------------------------------------------- Baruch Siach (1): imx8mp_evk: README instruction fixes Haibo Chen (2): mmc: fsl_esdhc_imx: add wait_dat0() support mmc: fsl_esdhc_imx: optimize the timing setting Heiko Schocher (4): imx6: remove not longer supported aristainetos boards imx6: add support for aristainetos2c_cslb board variant arm: dts: aristainetos: sync with changes in linux imx: aristainetos: enable U-Boot Environment variables protection Ian Ray (3): board: ge: bx50v3: correct CONFIG_CMD_NFS board: ge: reduce VPD EEPROM partition size board: ge: bx50v3: check b850v3 power management watchdog Igor Opaniuk (7): power: pmic: add SPL_DM_PMIC_PCA9450 symbol to Kconfig ARM: dts: fsl-imx8qxp-apalis: add initial device tree board: toradex: add apalis-imx8x 2gb wb it v1.1a module support doc: board: apalis-imx8x: add documentation apalis-imx8: add implementation for board_mem_get_layout apalis-imx8x: add implementation for board_mem_get_layout colibri-imx8x: add implementation for board_mem_get_layout Marcel Ziswiler (4): toradex: tdx-cfg-clock: add new i.mx 8m mini/plus skus toradex: tdx-cfg-clock: fix i.mx 8m mini interactive verdin-imx8mm: automatic ram size detection imx8: allow overriding memory layout Max Krummenacher (5): pca9450a: fix i2c address ARM: dts: imx8mm-verdin: follow changed pmic verdin-imx8mm: spl: switch to pca9450 pmic verdin-imx8mm: implement hardware version detection verdin-imx8mm: spl: enable pca9450 i2c level translator Oliver Graute (6): imx: clk: added IPG Clock for I2C on imx8qm imx: ahab: Fix compiler warnings in printf imx: ahab: fix compiler warnings in debug imx: ahab: fix implicit declaration warning imx: imx8qm_rom7720_a1: add missing DTS to the MAINTAINERS doc: board: imx8qm-rom7720-a1.rst: convert readme to reST Sebastian Reichel (3): board: ge: common: vpd: fix name board: ge: bx50v3: drop unused pinmux defines board: ge: bx50v3: reduce magic numbers Tim Harvey (1): imx8m: fix cache setup for dynamic sdram size Tom Rini (1): configs: migrate CONFIG_IMX_THERMAL to defconfigs arch/arm/dts/Makefile | 9 +---- arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/fsl-imx8qxp-apalis.dts | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx53-ppd-uboot.dtsi | 2 +- arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi | 13 ------ arch/arm/dts/imx6dl-aristainetos2_4.dts | 51 ----------------------- arch/arm/dts/imx6dl-aristainetos2_4.dtsi | 84 -------------------------------------- arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi | 19 --------- arch/arm/dts/imx6dl-aristainetos2_7.dts | 16 -------- arch/arm/dts/imx6dl-aristainetos2_7.dtsi | 11 +---- arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi | 13 ------ arch/arm/dts/imx6dl-aristainetos2b_4.dts | 50 ----------------------- arch/arm/dts/imx6dl-aristainetos2b_7.dts | 16 -------- arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi | 13 ------ arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts | 50 ----------------------- arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi | 19 --------- arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts | 16 -------- arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi | 13 ------ arch/arm/dts/imx6dl-aristainetos2c_4.dts | 50 ----------------------- arch/arm/dts/imx6dl-aristainetos2c_7.dts | 4 +- arch/arm/dts/{imx6dl-aristainetos2b_7-u-boot.dtsi => imx6dl-aristainetos2c_cslb_7-u-boot.dtsi} | 2 +- arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts | 16 ++++++++ arch/arm/dts/imx6q-bx50v3-uboot.dtsi | 2 +- arch/arm/dts/imx6qdl-aristainetos2-common.dtsi | 23 ++++++++++- arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi | 22 ---------- arch/arm/dts/imx6qdl-aristainetos2.dtsi | 244 ------------------------------------------------------------------------------------------------------------- arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi | 77 ----------------------------------- arch/arm/dts/imx6qdl-aristainetos2b.dtsi | 266 ----------------------------------------------------------------------------------------------------------------------- arch/arm/dts/imx6qdl-aristainetos2c.dtsi | 12 +++++- arch/arm/dts/{imx6qdl-aristainetos2b_csl-u-boot.dtsi => imx6qdl-aristainetos2c_cslb-u-boot.dtsi} | 0 arch/arm/dts/{imx6qdl-aristainetos2b_csl.dtsi => imx6qdl-aristainetos2c_cslb.dtsi} | 54 +++++++++---------------- arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 5 +-- arch/arm/dts/imx8mm-verdin.dts | 154 +++++++++++++++++++++++++++++++++++---------------------------------- arch/arm/include/asm/mach-imx/sys_proto.h | 5 +++ arch/arm/mach-imx/imx8/Kconfig | 6 +++ arch/arm/mach-imx/imx8/ahab.c | 5 ++- arch/arm/mach-imx/imx8/cpu.c | 96 ++++++++++++++++++++++++++++++------------- arch/arm/mach-imx/imx8m/soc.c | 3 ++ arch/arm/mach-imx/mx6/Kconfig | 30 ++------------ board/advantech/imx8qm_rom7720_a1/MAINTAINERS | 1 + board/advantech/imx8qm_rom7720_a1/README | 61 ---------------------------- board/aristainetos/Kconfig | 32 ++------------- board/aristainetos/MAINTAINERS | 34 ++++------------ board/aristainetos/aristainetos.c | 283 ++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------- board/aristainetos/common/Kconfig | 6 +-- board/ge/bx50v3/bx50v3.c | 60 +++++++++++---------------- board/ge/common/vpd_reader.c | 2 +- board/toradex/apalis-imx8/apalis-imx8.c | 23 +++++++++++ board/toradex/apalis-imx8x/Kconfig | 30 ++++++++++++++ board/toradex/apalis-imx8x/MAINTAINERS | 10 +++++ board/toradex/apalis-imx8x/Makefile | 6 +++ board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg | 24 +++++++++++ board/toradex/apalis-imx8x/apalis-imx8x.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/toradex/colibri-imx8x/colibri-imx8x.c | 23 +++++++++++ board/toradex/common/tdx-cfg-block.c | 44 ++++++++++++-------- board/toradex/common/tdx-cfg-block.h | 8 +++- board/toradex/verdin-imx8mm/spl.c | 42 +++++++++---------- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 81 +++++++++++++++++++++++++++++++++++++ configs/apalis-imx8x_defconfig | 77 +++++++++++++++++++++++++++++++++++ configs/aristainetos2b_defconfig | 115 ---------------------------------------------------- configs/aristainetos2bcsl_defconfig | 115 ---------------------------------------------------- configs/aristainetos2c_defconfig | 13 ++++-- configs/{aristainetos2_defconfig => aristainetos2ccslb_defconfig} | 27 ++++++++----- configs/cgtqmx6eval_defconfig | 1 + configs/colibri-imx6ull_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/colibri_imx7_emmc_defconfig | 1 + configs/gwventana_emmc_defconfig | 2 + configs/gwventana_gw5904_defconfig | 2 + configs/gwventana_nand_defconfig | 2 + configs/liteboard_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spinor_defconfig | 1 + configs/mx6slevk_spl_defconfig | 1 + configs/mx6sllevk_defconfig | 1 + configs/mx6sllevk_plugin_defconfig | 1 + configs/mx6sxsabreauto_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/mx6ull_14x14_evk_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 1 + configs/mx6ulz_14x14_evk_defconfig | 1 + configs/mx7dsabresd_defconfig | 1 + configs/mx7dsabresd_qspi_defconfig | 1 + configs/myir_mys_6ulx_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/pfla02_defconfig | 1 + configs/phycore_pcl063_defconfig | 1 + configs/phycore_pcl063_ull_defconfig | 1 + configs/pico-dwarf-imx7d_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/riotboard_spl_defconfig | 1 + configs/sksimx6_defconfig | 1 + configs/somlabs_visionsom_6ull_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/udoo_neo_defconfig | 1 + configs/variscite_dart6ul_defconfig | 1 + configs/verdin-imx8mm_defconfig | 2 +- configs/vining_2000_defconfig | 1 + configs/warp7_bl33_defconfig | 1 + configs/warp7_defconfig | 1 + configs/xpress_defconfig | 1 + configs/xpress_spl_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + doc/board/advantech/imx8qm-rom7720-a1.rst | 75 ++++++++++++++++++++++++++++++++++ doc/board/advantech/index.rst | 9 +++++ doc/board/freescale/imx8mp_evk.rst | 12 +++--- doc/board/index.rst | 1 + doc/board/toradex/apalix-imx8x.rst | 74 ++++++++++++++++++++++++++++++++++ doc/board/toradex/index.rst | 1 + drivers/clk/imx/clk-imx8qm.c | 24 +++++++++++ drivers/mmc/fsl_esdhc_imx.c | 47 +++++++++++++++++---- drivers/power/pmic/Kconfig | 7 ++++ drivers/power/pmic/pca9450.c | 2 +- include/configs/apalis-imx8x.h | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/aristainetos2.h | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------- include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-imx7.h | 3 -- include/configs/colibri-imx6ull.h | 2 - include/configs/colibri_imx7.h | 2 - include/configs/dart_6ul.h | 2 - include/configs/el6x_common.h | 2 - include/configs/embestmx6boards.h | 2 - include/configs/ge_bx50v3.h | 8 ++-- include/configs/gw_ventana.h | 10 ----- include/configs/liteboard.h | 2 - include/configs/mx6cuboxi.h | 2 - include/configs/mx6sabre_common.h | 2 - include/configs/mx6slevk.h | 2 - include/configs/mx6sllevk.h | 2 - include/configs/mx6sxsabreauto.h | 2 - include/configs/mx6sxsabresd.h | 2 - include/configs/mx6ul_14x14_evk.h | 2 - include/configs/mx6ullevk.h | 2 - include/configs/mx7dsabresd.h | 2 - include/configs/mys_6ulx.h | 2 - include/configs/ot1200.h | 3 -- include/configs/pcl063.h | 2 - include/configs/pcl063_ull.h | 2 - include/configs/pfla02.h | 3 -- include/configs/pico-imx7d.h | 2 - include/configs/sksimx6.h | 3 -- include/configs/somlabs_visionsom_6ull.h | 2 - include/configs/tbs2910.h | 2 - include/configs/udoo_neo.h | 4 -- include/configs/vining_2000.h | 2 - include/configs/warp7.h | 2 - include/configs/xpress.h | 2 - 160 files changed, 1891 insertions(+), 2145 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4.dts rename arch/arm/dts/{imx6dl-aristainetos2b_7-u-boot.dtsi => imx6dl-aristainetos2c_cslb_7-u-boot.dtsi} (87%) create mode 100644 arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b.dtsi rename arch/arm/dts/{imx6qdl-aristainetos2b_csl-u-boot.dtsi => imx6qdl-aristainetos2c_cslb-u-boot.dtsi} (100%) rename arch/arm/dts/{imx6qdl-aristainetos2b_csl.dtsi => imx6qdl-aristainetos2c_cslb.dtsi} (80%) delete mode 100644 board/advantech/imx8qm_rom7720_a1/README create mode 100644 board/toradex/apalis-imx8x/Kconfig create mode 100644 board/toradex/apalis-imx8x/MAINTAINERS create mode 100644 board/toradex/apalis-imx8x/Makefile create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c create mode 100644 configs/apalis-imx8x_defconfig delete mode 100644 configs/aristainetos2b_defconfig delete mode 100644 configs/aristainetos2bcsl_defconfig rename configs/{aristainetos2_defconfig => aristainetos2ccslb_defconfig} (84%) create mode 100644 doc/board/advantech/imx8qm-rom7720-a1.rst create mode 100644 doc/board/advantech/index.rst create mode 100644 doc/board/toradex/apalix-imx8x.rst create mode 100644 include/configs/apalis-imx8x.h Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

Facing issues in travis build due to migration to travis-ci.com
by Priyanka Jain 09 Dec '20

09 Dec '20

Hello, I have been using travis-ci.org for build test "https://travis-ci.org/github/p-priyanka-jain/u-boot/builds" . Last month, I faced issue in syncing the git and got message regarding migration to travis-ci.com for open-source projects as well. https://blog.travis-ci.com/oss-announcement I then used travis-ci.com for build for my last pull-request. Now its saying that free credits in travis-ci.com are exhausted. Can anyone please guide me which site to use for travis build and how to get credit points to build open source projects. Thanks Priyanka

2 1

[RFC PATCH v1 0/1] mmc: fix response timeout after switch command
by Stefan Bosch 09 Dec '20

09 Dec '20

Currently I am implementing SPL for frienlyARM's NanoPC-T2 board (SoC S5P4418). Loading of U-Boot from SD-card fails if CONFIG_SPL_MMC_TINY=y. I.e. mmc_set_blocklen() inside mmc_bread() fails (Response Timeout), caused by the previous call of __mmc_switch() in drivers/mmc/mmc.c: Here the 'current state' of the card status keeps 'data' for several 100ms after issuing the switch command. Because of this state the next command issued fails (in this case CMD16 = SET_BLOCKLEN). Patch: Wait for 'current state' = 'tran' in __mmc_switch(). Stefan Bosch (1): mmc: fix response timeout after switch command drivers/mmc/mmc.c | 3 ++- include/mmc.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.17.1

1 1

Re: [PATCH] ARM: dts: stm32: Consistently enable internal pull-ups for SD bus
by Patrick DELAUNAY 09 Dec '20

09 Dec '20

Hi Marek, On 12/9/20 11:11 AM, Patrick DELAUNAY wrote: > From: Marek Vasut <marex(a)denx.de> > Sent: vendredi 9 octobre 2020 23:08 > > The default state of SD bus and clock line is logical HI. SD card IO is open-drain and pulls the bus lines LO. Always enable the SD bus pull ups to guarantee this behavior. Note that on systems with bus voltage level shifter on the SD bus, the pull ups might also be built into the level shifter, however that should have no negative impact. > > Signed-off-by: Marek Vasut <marex(a)denx.de> > Cc: Patrice Chotard <patrice.chotard(a)st.com> > Cc: Patrick Delaunay <patrick.delaunay(a)st.com> > --- > arch/arm/dts/stm32mp15-pinctrl.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/dts/stm32mp15-pinctrl.dtsi b/arch/arm/dts/stm32mp15-pinctrl.dtsi > index 154832983c..2f8ff44a7a 100644 > --- a/arch/arm/dts/stm32mp15-pinctrl.dtsi > +++ b/arch/arm/dts/stm32mp15-pinctrl.dtsi > @@ -1184,13 +1184,13 @@ > <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */ > slew-rate = <1>; > drive-push-pull; > - bias-disable; > + bias-pull-up; > }; > pins2 { > pinmux = <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */ > slew-rate = <2>; > drive-push-pull; > - bias-disable; > + bias-pull-up; > }; > }; > > @@ -1340,13 +1340,13 @@ > <STM32_PINMUX('G', 6, AF10)>; /* SDMMC2_CMD */ > slew-rate = <1>; > drive-push-pull; > - bias-disable; > + bias-pull-up; > }; > pins2 { > pinmux = <STM32_PINMUX('E', 3, AF9)>; /* SDMMC2_CK */ > slew-rate = <2>; > drive-push-pull; > - bias-disable; > + bias-pull-up; > }; > }; > > -- > 2.28.0 > I don't see consensus on this device tree modification in Linux kernel side [1]. And for the DH board the modification is now done in SOM dtsi files after [2]. So can I close this patchset in patchwork ? And if the modification is accepted in kernel device tree , I will get it with my next device tree alignment... [1] https://st-md-mailman.stormreply.com/pipermail/linux-stm32/2020-October/008… [2] "ARM: dts: stm32: Enable internal pull-ups for SDMMC1 on DHCOM SoM <http://patchwork.ozlabs.org/project/uboot/list/?series=217761>" http://patchwork.ozlabs.org/project/uboot/list/?series=217761&state=* Regards Patrick

2 1

[PATCH] net: memac_phy: add a timeout to MDIO operations
by Ioana Ciornei 09 Dec '20

09 Dec '20

We have encountered circumstances when a board design does not include pull-up resistors on the external MDIO buses which are not used. This leads to the MDIO data line not being pulled-up, thus the MDIO controller will always see the line as busy. Without a timeout in the MDIO bus driver, the execution is stuck in an infinite loop when any access is initiated on that external bus. Add a timeout in the driver so that we are protected in this circumstance. This is similar to what is being done in the Linux xgmac_mdio driver. Signed-off-by: Ioana Ciornei <ioana.ciornei(a)nxp.com> --- drivers/net/fm/memac_phy.c | 76 +++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index c2ef1b4e737e..b92a012ce79f 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -22,6 +22,8 @@ #define memac_setbits_32(a, v) setbits_be32(a, v) #endif +#define MAX_NUM_RETRIES 1000 + static u32 memac_in_32(u32 *reg) { #ifdef CONFIG_SYS_MEMAC_LITTLE_ENDIAN @@ -31,6 +33,42 @@ static u32 memac_in_32(u32 *reg) #endif } +/* + * Wait until the MDIO bus is free + */ +static int memac_wait_until_free(struct memac_mdio_controller *regs) +{ + unsigned int timeout = MAX_NUM_RETRIES; + + while ((memac_in_32(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout--) + ; + + if (!timeout) { + printf("timeout waiting for MDIO bus to be free\n"); + return -ETIMEDOUT; + } + + return 0; +} + +/* + * Wait till the MDIO read or write operation is complete + */ +static int memac_wait_until_done(struct memac_mdio_controller *regs) +{ + unsigned int timeout = MAX_NUM_RETRIES; + + while ((memac_in_32(&regs->mdio_data) & MDIO_DATA_BSY) && timeout--) + ; + + if (!timeout) { + printf("timeout waiting for MDIO operation to complete\n"); + return -ETIMEDOUT; + } + + return 0; +} + /* * Write value to the PHY for this device to the register at regnum, waiting * until the write is done before it returns. All PHY configuration has to be @@ -42,6 +80,7 @@ int memac_mdio_write(struct mii_dev *bus, int port_addr, int dev_addr, u32 mdio_ctl; struct memac_mdio_controller *regs = bus->priv; u32 c45 = 1; /* Default to 10G interface */ + int err; if (dev_addr == MDIO_DEVAD_NONE) { c45 = 0; /* clause 22 */ @@ -50,9 +89,9 @@ int memac_mdio_write(struct mii_dev *bus, int port_addr, int dev_addr, } else memac_setbits_32(&regs->mdio_stat, MDIO_STAT_ENC); - /* Wait till the bus is free */ - while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY) - ; + err = memac_wait_until_free(regs); + if (err) + return err; /* Set the port and dev addr */ mdio_ctl = MDIO_CTL_PORT_ADDR(port_addr) | MDIO_CTL_DEV_ADDR(dev_addr); @@ -62,16 +101,16 @@ int memac_mdio_write(struct mii_dev *bus, int port_addr, int dev_addr, if (c45) memac_out_32(&regs->mdio_addr, regnum & 0xffff); - /* Wait till the bus is free */ - while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY) - ; + err = memac_wait_until_free(regs); + if (err) + return err; /* Write the value to the register */ memac_out_32(&regs->mdio_data, MDIO_DATA(value)); - /* Wait till the MDIO write is complete */ - while ((memac_in_32(&regs->mdio_data)) & MDIO_DATA_BSY) - ; + err = memac_wait_until_done(regs); + if (err) + return err; return 0; } @@ -87,6 +126,7 @@ int memac_mdio_read(struct mii_dev *bus, int port_addr, int dev_addr, u32 mdio_ctl; struct memac_mdio_controller *regs = bus->priv; u32 c45 = 1; + int err; if (dev_addr == MDIO_DEVAD_NONE) { if (!strcmp(bus->name, DEFAULT_FM_TGEC_MDIO_NAME)) @@ -97,9 +137,9 @@ int memac_mdio_read(struct mii_dev *bus, int port_addr, int dev_addr, } else memac_setbits_32(&regs->mdio_stat, MDIO_STAT_ENC); - /* Wait till the bus is free */ - while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY) - ; + err = memac_wait_until_free(regs); + if (err) + return err; /* Set the Port and Device Addrs */ mdio_ctl = MDIO_CTL_PORT_ADDR(port_addr) | MDIO_CTL_DEV_ADDR(dev_addr); @@ -109,17 +149,17 @@ int memac_mdio_read(struct mii_dev *bus, int port_addr, int dev_addr, if (c45) memac_out_32(&regs->mdio_addr, regnum & 0xffff); - /* Wait till the bus is free */ - while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY) - ; + err = memac_wait_until_free(regs); + if (err) + return err; /* Initiate the read */ mdio_ctl |= MDIO_CTL_READ; memac_out_32(&regs->mdio_ctl, mdio_ctl); - /* Wait till the MDIO write is complete */ - while ((memac_in_32(&regs->mdio_data)) & MDIO_DATA_BSY) - ; + err = memac_wait_until_done(regs); + if (err) + return err; /* Return all Fs if nothing was there */ if (memac_in_32(&regs->mdio_stat) & MDIO_STAT_RD_ER) -- 2.17.1

2 1

Re: FW: [PATCH] add check for ignored CONFIG_ENV_EXT4_DEVICE_AND_PART definition
by Patrick DELAUNAY 09 Dec '20

09 Dec '20

Hi Manuel, On 12/9/20 9:59 AM, Patrick DELAUNAY wrote: > From: Manuel Reis <mluis.reis(a)gmail.com> > Sent: mercredi 25 novembre 2020 11:16 > > Check whether user has explicitly defined device and partition where environment file will be located before using 'auto' i.e. bootable partition > > Voids the need to set such partition as bootable to work with the 'dev:auto' tuple > > Signed-off-by: Manuel Reis <mluis.reis(a)gmail.com> > Cc: Patrick Delaunay <patrick.delaunay(a)st.com> > Cc: Patrice Chotard <patrice.chotard(a)st.com> > Tested-by: Michael Opdenacker <michael.opdenacker(a)bootlin.com> > --- > > board/st/stm32mp1/stm32mp1.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 03a19af930..09d9bbf07d 100644 > --- a/board/st/stm32mp1/stm32mp1.c > +++ b/board/st/stm32mp1/stm32mp1.c > @@ -827,7 +827,12 @@ const char *env_ext4_get_intf(void) > > const char *env_ext4_get_dev_part(void) { > + static char *const env_dev_part = CONFIG_ENV_EXT4_DEVICE_AND_PART; > static char *const dev_part[] = {"0:auto", "1:auto", "2:auto"}; > + > + if (strlen(env_dev_part) > 0) > + return env_dev_part; > + > u32 bootmode = get_bootmode(); > > return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1]; > -- > 2.27.0 > In fact it just is V2 of previous patch http://patchwork.ozlabs.org/project/uboot/patch/20201122151939.20005-1-mlui… Reviewed-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Applied to u-boot-stm/master. Thanks Patrick

2 2

[PATCH] configs: ls1088aqds: add COMMON_ENV to fix distroboot
by Biwen Li 09 Dec '20

09 Dec '20

From: Biwen Li <biwen.li(a)nxp.com> Add COMMON_ENV to fix distroboot, boot log as follows, Found U-Boot script /ls1088aqds_boot.scr 961 bytes read in 18 ms (51.8 KiB/s) ## Executing script at 80000000 load - load binary file from a filesystemUsage: load <interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]] - Load binary file filename from partition part on device type interface instance dev to address addr in memory. bytes gives the size to load in bytes. If bytes is 0 or omitted, the file is read until the end. pos gives the file byte position to start reading from. If pos is 0 or omitted, the file is read from the start. load - load binary file from a filesystemUsage: load <interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]] - Load binary file filename from partition part on device type interface instance dev to address addr in memory. bytes gives the size to load in bytes. If bytes is 0 or omitted, the file is read until the end. pos gives the file byte position to start reading from. If pos is 0 or omitted, the file is read from the start. Bad Linux ARM64 Image magic! SCRIPT FAILED: continuing... Signed-off-by: Biwen Li <biwen.li(a)nxp.com> --- include/configs/ls1088aqds.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 59757120fc..0dd6bb9f32 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -384,10 +384,18 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \ QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER) +#define COMMON_ENV \ + "kernelheader_addr_r=0x80200000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernel_addr_r=0x81000000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" + /* Initial environment variables */ #ifdef CONFIG_NXP_ESBC #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x100000\0" \ @@ -419,6 +427,7 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x100000\0" \ @@ -480,6 +489,7 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_QSPI_BOOT) #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x100000\0" \ @@ -497,6 +507,7 @@ unsigned long get_board_ddr_clk(void); #elif defined(CONFIG_SD_BOOT) #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x800\0" \ @@ -514,6 +525,7 @@ unsigned long get_board_ddr_clk(void); #else /* NOR BOOT */ #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x100000\0" \ -- 2.17.1

1 0

[PATCH 1/2] mtd: spi-nor: add unlock all config option
by Michael Walle 09 Dec '20

09 Dec '20

Provide an explicit configuration option to disable default "unlock all" of any flash chip which supports locking. It doesn't make sense to automatically unprotect the entire flash on each u-boot startup if the block protection bits are actually used. Traditionally, the unlock was there to be able to write to flash devices which powered-up with the block protection bits set. Over time this feature creeped into all flash devices which support locking. For a more detailed description and discussion see: https://lore.kernel.org/linux-mtd/20201203162959.29589-8-michael@walle.cc/ Keep things simple in u-boot and just provide a configration option to disable this behavior which can be set per board. Signed-off-by: Michael Walle <michael(a)walle.cc> --- drivers/mtd/spi/Kconfig | 10 ++++++++++ drivers/mtd/spi/spi-nor-core.c | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 018e8c597e..bb8e8a9153 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -95,6 +95,16 @@ config SPI_FLASH_BAR Bank/Extended address registers are used to access the flash which has size > 16MiB in 3-byte addressing. +config SPI_FLASH_UNLOCK_ALL + bool "Unlock the entire SPI flash on u-boot startup" + default y + help + Some flashes tend to power up with the software write protection + bits set. If this option is set, the whole flash will be unlocked. + + For legacy reasons, this option default to y. But if you intend to + actually use the software protection bits you should say n here. + config SF_DUAL_FLASH bool "SPI DUAL flash memory support" help diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index e16b0e1462..ef426dac02 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -2443,10 +2443,11 @@ static int spi_nor_init(struct spi_nor *nor) * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up * with the software protection bits set */ - if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || - JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || - JEDEC_MFR(nor->info) == SNOR_MFR_SST || - nor->info->flags & SPI_NOR_HAS_LOCK) { + if (IS_ENABLED(CONFIG_SPI_FLASH_UNLOCK_ALL) && + (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || + JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || + JEDEC_MFR(nor->info) == SNOR_MFR_SST || + nor->info->flags & SPI_NOR_HAS_LOCK)) { write_enable(nor); write_sr(nor, 0); spi_nor_wait_till_ready(nor); -- 2.20.1

1 1

Re: FW: [PATCH 1/4] ARM: dts: stm32: Enable internal pull-ups for SDMMC1 on DHCOM SoM
by Patrick DELAUNAY 09 Dec '20

09 Dec '20

Hi Marek, From: Marek Vasut <marex(a)denx.de> > Sent: mardi 1 décembre 2020 11:29 > > The default state of SD bus and clock line is logical HI. SD card IO is open-drain and pulls the bus lines LO. Always enable the SD bus pull ups to guarantee this behavior on DHCOM SoM. Note that on SoMs with SD bus voltage level shifter, the pull ups are built into the level shifter, however that has no negative impact. > > Signed-off-by: Marek Vasut <marex(a)denx.de> > Cc: Patrice Chotard <patrice.chotard(a)st.com> > Cc: Patrick Delaunay <patrick.delaunay(a)st.com> > --- > arch/arm/dts/stm32mp15xx-dhcom.dtsi | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/arm/dts/stm32mp15xx-dhcom.dtsi b/arch/arm/dts/stm32mp15xx-dhcom.dtsi > index f022d8395c..9049245c5b 100644 > --- a/arch/arm/dts/stm32mp15xx-dhcom.dtsi > +++ b/arch/arm/dts/stm32mp15xx-dhcom.dtsi > @@ -339,6 +339,20 @@ > status = "okay"; > }; > > +&sdmmc1_b4_pins_a { > + /* > + * SD bus pull-up resistors: > + * - optional on SoMs with SD voltage translator > + * - mandatory on SoMs without SD voltage translator > + */ > + pins1 { > + bias-pull-up; > + }; > + pins2 { > + bias-pull-up; > + }; > +}; > + > &sdmmc2 { > pinctrl-names = "default"; > pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_a>; > -- > 2.29.2 > Reviewed-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> For the serie: the target is next or it is a bugfix for master / v2021.01 ? Thanks Patrick

2 2

[PATCH 0/2] efi_loader: link partition to block device
by Heinrich Schuchardt 09 Dec '20

09 Dec '20

We provide a UEFI driver for block devices. When ConnectController() is called for a handle with the EFI_BLOCK_IO_PROTOCOL this driver creates the partitions. When DisconnectController() is called the handles for the partitions have to be deleted. This requires that the child controllers (partitions) open the EFI_BLOCK_IO_PROTOCOL of the controller (block IO device) with attribute EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. Heinrich Schuchardt (2): efi_loader: make efi_protocol_open() non-static efi_loader: link partition to block device include/efi_loader.h | 5 +++++ lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_disk.c | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) -- 2.29.2

1 2