Re: [PATCH 2/2] configs: add defconfigs for the am625-lp-sk
On Apr 30, 2024 at 14:57:46 -0500, Bryan Brattlof wrote: > The am62x-lp-sk is a package and reference board spin of the am62x-sk to > showcase the low-power features of the am62x SoC family. Because it so > closely resembles the am62x-sk board, us the preprocessor to inherit its s/us/use > configuration making the needed changes for this board. > > Signed-off-by: Bryan Brattlof > --- > configs/am62x_lp_sk_a53_defconfig | 3 +++ > configs/am62x_lp_sk_r5_defconfig | 2 ++ > 2 files changed, 5 insertions(+) > > diff --git a/configs/am62x_lp_sk_a53_defconfig > b/configs/am62x_lp_sk_a53_defconfig > new file mode 100644 > index 0..904b2142b2f53 > --- /dev/null > +++ b/configs/am62x_lp_sk_a53_defconfig > @@ -0,0 +1,3 @@ > +#include > +CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am62-lp-sk" > +CONFIG_OF_UPSTREAM=y > diff --git a/configs/am62x_lp_sk_r5_defconfig > b/configs/am62x_lp_sk_r5_defconfig > new file mode 100644 > index 0..93b3922e6fec5 > --- /dev/null > +++ b/configs/am62x_lp_sk_r5_defconfig > @@ -0,0 +1,2 @@ > +#include > +CONFIG_DEFAULT_DEVICE_TREE="k3-am62-r5-lp-sk" Reviewed-by: Dhruva Gole -- Best regards, Dhruva Gole
Re: [PATCH 1/2] arm: dts: add U-Boot dtbs for the am625-lp-sk
On Apr 30, 2024 at 14:57:45 -0500, Bryan Brattlof wrote:
> From: Nitin Yadav
>
> Add the U-Boot device tree overrides for the am62x-lp-sk reference
> board.
>
> Signed-off-by: Nitin Yadav
> Signed-off-by: Bryan Brattlof
> ---
> arch/arm/dts/k3-am62-lp-sk-binman.dtsi | 21 +
> arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 17 +
> arch/arm/dts/k3-am62-lp4-50-800-800.dtsi | 2190
> ++
> arch/arm/dts/k3-am62-r5-lp-sk.dts| 82 ++
> 4 files changed, 2310 insertions(+)
>
> diff --git a/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
> b/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
> new file mode 100644
> index 0..de425a4b54f81
> --- /dev/null
> +++ b/arch/arm/dts/k3-am62-lp-sk-binman.dtsi
> @@ -0,0 +1,21 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
Can make this 2024, here and everywhere else.
> + */
> +
> +#include "k3-binman.dtsi"
> +#include "k3-am625-sk-binman.dtsi"
> +
> +#ifdef CONFIG_TARGET_AM625_A53_EVM
> +
> +#define SPL_AM62_LP_SK_DTB "spl/dts/ti/k3-am62-lp-sk.dtb"
> +
> +_am625_sk_dtb {
> + filename = SPL_AM62_LP_SK_DTB;
> +};
> +
> +_am625_sk_dtb_unsigned {
> + filename = SPL_AM62_LP_SK_DTB;
> +};
> +
> +#endif
> diff --git a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
> b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
> new file mode 100644
> index 0..08f572446657e
> --- /dev/null
> +++ b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * AM62x LP SK dts file for SPLs
> + * Copyright (C) 2021-2023 Texas Instruments Incorporated -
> https://www.ti.com/
2024 ^^
[...]
With that fixed,
Reviewed-by: Dhruva Gole
--
Best regards,
Dhruva Gole
[PATCH] MAINTAINERS: update Broadcom BCMBCA maintainer
Joel is no longer with Broadcom. Remove his email from bcmbca maintainer list and replace him with myself for stack protection maintainer. Signed-off-by: William Zhang --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 921ce05755a6..7a3b4d3712c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -224,7 +224,6 @@ ARM BROADCOM BCMBCA M: Anand Gore M: William Zhang M: Kursad Oney -M: Joel Peshkin M: Philippe Reynes S: Maintained F: arch/arm/mach-bcmbca/ @@ -1568,7 +1567,7 @@ F:cmd/sqfs.c F: test/py/tests/test_fs/test_squashfs/ STACKPROTECTOR -M: Joel Peshkin +M: William Zhang S: Maintained F: common/stackprot.c F: cmd/stackprot_test.c -- 2.37.3
Re: [PATCH 65/81] spi: Remove and add needed includes
On 05/01/2024 06:31 PM, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Jagan Teki Cc: Tom Rini Cc: Anand Gore Cc: William Zhang Cc: Kursad Oney Cc: Joel Peshkin Cc: Philippe Reynes Cc: Alex Nemirovsky Cc: Michal Simek Cc: Stefan Roese Cc: Neil Armstrong Cc: Gregory CLEMENT Cc: Lars Povlsen Cc: Horatiu Vultur Cc: Ryder Lee Cc: Weijie Gao Cc: Chunfeng Yun Cc: GSS_MTK_Uboot_upstream Cc: Nobuhiro Iwamatsu Cc: Marek Vasut Cc: Simon Glass Cc: Chin-Ting Kuo Cc: "Cédric Le Goater" Cc: Aspeed BMC SW team Cc: Ryan Chen Cc: Chia-Wei Wang Cc: Joel Stanley Cc: Robert Marko Cc: Luka Kovacic Cc: Luka Perkov Cc: Masahisa Kojima Cc: Patrick Delaunay Cc: Patrice Chotard Cc: Thierry Reding Cc: Svyatoslav Ryhel Cc: Kunihiko Hayashi Cc: Dai Okamura --- drivers/spi/altera_spi.c | 1 - drivers/spi/apple_spi.c | 1 - drivers/spi/atcspi200_spi.c | 1 - drivers/spi/ath79_spi.c | 1 - drivers/spi/atmel-quadspi.c | 1 - drivers/spi/atmel_spi.c | 1 - drivers/spi/bcm63xx_hsspi.c | 1 - drivers/spi/bcm63xx_spi.c | 1 - drivers/spi/bcmbca_hsspi.c| 1 - drivers/spi/ca_sflash.c | 1 - drivers/spi/cadence_ospi_versal.c | 1 - drivers/spi/cadence_qspi.c| 1 - drivers/spi/cadence_qspi_apb.c| 1 - drivers/spi/cf_spi.c | 1 - drivers/spi/davinci_spi.c | 2 +- drivers/spi/designware_spi.c | 1 - drivers/spi/exynos_spi.c | 1 - drivers/spi/fsl_dspi.c| 1 - drivers/spi/fsl_espi.c| 2 +- drivers/spi/fsl_qspi.c| 1 - drivers/spi/ich.c | 1 - drivers/spi/iproc_qspi.c | 1 - drivers/spi/kirkwood_spi.c| 2 +- drivers/spi/meson_spifc.c | 1 - drivers/spi/microchip_coreqspi.c | 1 - drivers/spi/mpc8xx_spi.c | 1 - drivers/spi/mpc8xxx_spi.c | 1 - drivers/spi/mscc_bb_spi.c | 1 - drivers/spi/mt7621_spi.c | 1 - drivers/spi/mtk_snfi_spi.c| 1 - drivers/spi/mtk_snor.c| 1 - drivers/spi/mvebu_a3700_spi.c | 1 - drivers/spi/mxc_spi.c | 2 +- drivers/spi/mxs_spi.c | 1 - drivers/spi/npcm_pspi.c | 1 - drivers/spi/nxp_fspi.c| 1 - drivers/spi/omap3_spi.c | 2 +- drivers/spi/pic32_spi.c | 1 - drivers/spi/pl022_spi.c | 1 - drivers/spi/renesas_rpc_spi.c | 1 - drivers/spi/rk_spi.c | 1 - drivers/spi/sandbox_spi.c | 1 - drivers/spi/sh_qspi.c | 1 - drivers/spi/soft_spi.c| 1 - drivers/spi/spi-aspeed-smc.c | 1 - drivers/spi/spi-emul-uclass.c | 1 - drivers/spi/spi-mem.c | 1 - drivers/spi/spi-mxic.c| 1 - drivers/spi/spi-qup.c | 1 - drivers/spi/spi-sifive.c | 1 - drivers/spi/spi-sn-f-ospi.c | 1 - drivers/spi/spi-sunxi.c | 1 - drivers/spi/spi-synquacer.c | 1 - drivers/spi/spi-uclass.c | 1 - drivers/spi/spi.c | 1 - drivers/spi/stm32_qspi.c | 1 - drivers/spi/stm32_spi.c | 1 - drivers/spi/tegra114_spi.c| 1 - drivers/spi/tegra20_sflash.c | 1 - drivers/spi/tegra20_slink.c | 1 - drivers/spi/tegra210_qspi.c | 1 - drivers/spi/ti_qspi.c | 1 - drivers/spi/uniphier_spi.c| 1 - drivers/spi/xilinx_spi.c | 1 - drivers/spi/zynq_qspi.c | 1 - drivers/spi/zynq_spi.c| 1 - drivers/spi/zynqmp_gqspi.c| 1 - 67 files changed, 5 insertions(+), 67 deletions(-) For drivers/spi/bcm63xx_hsspi.c and drivers/spi/bcmbca_hsspi.c Reviewed-by: William Zhang smime.p7s Description: S/MIME Cryptographic Signature
Re: [PATCH 48/81] pci: Remove and add needed includes
Hello Tom, On 02.05.24 03:31, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese Cc: Tom Rini Cc: Nobuhiro Iwamatsu Cc: Marek Vasut Cc: Heiko Schocher Cc: Simon Glass Cc: Mark Kettenis Cc: Neil Armstrong Cc: Philipp Tomsich Cc: Kever Yang Cc: Masahisa Kojima Cc: Ryder Lee Cc: Weijie Gao Cc: Chunfeng Yun Cc: GSS_MTK_Uboot_upstream Cc: liuhao Cc: shuyiqi Cc: Minda Chen Cc: Kunihiko Hayashi Cc: Dai Okamura Cc: Michal Simek Cc: Bin Meng Cc: Heinrich Schuchardt Cc: Moritz Fischer Cc: This contributor prefers not to receive mails Cc: Sergei Antonov Cc: Nikhil M Jain Cc: Sam Edwards Cc: Jonas Karlman Cc: Johan Jonker Cc: Michael Trimarchi Cc: Jon Lin Cc: Eugen Hristev Cc: Maksim Kiselev Cc: Sumit Garg Cc: Peng Fan Cc: Ioana Ciornei Cc: Mathew McBride Cc: Leo Yu-Chi Liang Cc: Mason Huo Cc: Mayuresh Chitale --- drivers/pci/pci-aardvark.c | 1 - drivers/pci/pci-emul-uclass.c | 1 - drivers/pci/pci-rcar-gen2.c| 2 +- drivers/pci/pci-rcar-gen3.c| 1 - drivers/pci/pci-uclass.c | 1 - drivers/pci/pci_auto.c | 2 +- drivers/pci/pci_auto_common.c | 1 - drivers/pci/pci_common.c | 1 - drivers/pci/pci_compat.c | 1 - drivers/pci/pci_ftpci100.c | 1 - drivers/pci/pci_mpc85xx.c | 1 - drivers/pci/pci_mvebu.c| 1 - drivers/pci/pci_rom.c | 2 +- drivers/pci/pci_sandbox.c | 1 - drivers/pci/pci_sh7751.c | 2 +- drivers/pci/pci_tegra.c| 1 - drivers/pci/pci_x86.c | 1 - drivers/pci/pcie_apple.c | 1 - drivers/pci/pcie_brcmstb.c | 1 - drivers/pci/pcie_dw_common.c | 1 - drivers/pci/pcie_dw_meson.c| 1 - drivers/pci/pcie_dw_mvebu.c| 3 ++- drivers/pci/pcie_dw_rockchip.c | 1 - drivers/pci/pcie_dw_sifive.c | 1 - drivers/pci/pcie_dw_ti.c | 1 - drivers/pci/pcie_ecam_generic.c| 1 - drivers/pci/pcie_ecam_synquacer.c | 1 - drivers/pci/pcie_fsl.c | 2 +- drivers/pci/pcie_fsl_fixup.c | 1 - drivers/pci/pcie_imx.c | 1 - drivers/pci/pcie_intel_fpga.c | 1 - drivers/pci/pcie_iproc.c | 1 - drivers/pci/pcie_layerscape.c | 1 - drivers/pci/pcie_layerscape_ep.c | 2 +- drivers/pci/pcie_layerscape_fixup.c| 1 - drivers/pci/pcie_layerscape_fixup_common.c | 2 +- drivers/pci/pcie_layerscape_gen4.c | 2 +- drivers/pci/pcie_layerscape_gen4_fixup.c | 1 - drivers/pci/pcie_layerscape_rc.c | 1 - drivers/pci/pcie_mediatek.c| 1 - drivers/pci/pcie_phytium.c | 1 - drivers/pci/pcie_plda_common.c | 1 - drivers/pci/pcie_rockchip.c| 1 - drivers/pci/pcie_starfive_jh7110.c | 1 - drivers/pci/pcie_uniphier.c| 1 - drivers/pci/pcie_xilinx.c | 1 - 46 files changed, 10 insertions(+), 46 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH 33/81] gpio: Remove and add needed includes
Hello Tom, On 02.05.24 03:30, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Tom Rini Cc: Matthias Brugger Cc: Peter Robinson Cc: Alex Nemirovsky Cc: Ryan Chen Cc: Chia-Wei Wang Cc: Aspeed BMC SW team Cc: Joel Stanley Cc: Nobuhiro Iwamatsu Cc: Marek Vasut Cc: Kunihiko Hayashi Cc: Dai Okamura Cc: Michal Simek Cc: Eugeniy Paltsev Cc: Gregory CLEMENT Cc: Lars Povlsen Cc: Horatiu Vultur Cc: Caleb Connolly Cc: Neil Armstrong Cc: Sumit Garg Cc: Stefan Roese Cc: Stephan Gerhold Cc: Linus Walleij Cc: Stefan Bosch Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang Cc: Michael Walle Cc: Patrick Delaunay Cc: Patrice Chotard Cc: Thierry Reding Cc: Svyatoslav Ryhel Cc: Sean Anderson Cc: Andre Przywara Cc: Qu Wenruo Cc: Ilias Apalodimas Cc: Heiko Schocher Cc: Peng Fan Cc: Bin Meng Cc: Piotr Wojtaszczyk Cc: Jim Liu Cc: Nishanth Menon Cc: Samuel Holland Cc: Sam Edwards --- drivers/gpio/74x164_gpio.c | 1 - drivers/gpio/altera_pio.c | 1 - drivers/gpio/at91_gpio.c| 1 - drivers/gpio/atmel_pio4.c | 1 - drivers/gpio/axp_gpio.c | 1 - drivers/gpio/bcm2835_gpio.c | 1 - drivers/gpio/bcm6345_gpio.c | 1 - drivers/gpio/cortina_gpio.c | 1 - drivers/gpio/da8xx_gpio.c | 1 - drivers/gpio/ftgpio010.c| 1 - drivers/gpio/gpio-aspeed.c | 1 - drivers/gpio/gpio-fxl6408.c | 1 - drivers/gpio/gpio-rcar.c| 1 - drivers/gpio/gpio-rza1.c| 1 - drivers/gpio/gpio-uclass.c | 1 - drivers/gpio/gpio-uniphier.c| 1 - drivers/gpio/gpio_slg7xl45106.c | 1 - drivers/gpio/hi6220_gpio.c | 1 - drivers/gpio/hsdk-creg-gpio.c | 1 - drivers/gpio/imx_rgpio2p.c | 1 - drivers/gpio/intel_broadwell_gpio.c | 1 - drivers/gpio/intel_gpio.c | 1 - drivers/gpio/intel_ich6_gpio.c | 1 - drivers/gpio/iproc_gpio.c | 1 - drivers/gpio/kw_gpio.c | 1 - drivers/gpio/lpc32xx_gpio.c | 1 - drivers/gpio/max7320_gpio.c | 1 - drivers/gpio/mcp230xx_gpio.c| 1 - drivers/gpio/mpc83xx_spisel_boot.c | 1 - drivers/gpio/mpc8xx_gpio.c | 1 - drivers/gpio/mpc8xxx_gpio.c | 1 - drivers/gpio/mscc_sgpio.c | 1 - drivers/gpio/msm_gpio.c | 1 - drivers/gpio/mt7621_gpio.c | 1 - drivers/gpio/mvebu_gpio.c | 1 - drivers/gpio/mxc_gpio.c | 1 - drivers/gpio/mxs_gpio.c | 1 - drivers/gpio/nmk_gpio.c | 1 - drivers/gpio/npcm_gpio.c| 1 - drivers/gpio/nx_gpio.c | 1 - drivers/gpio/omap_gpio.c| 1 - drivers/gpio/pca953x.c | 3 ++- drivers/gpio/pca953x_gpio.c | 1 - drivers/gpio/pcf8575_gpio.c | 1 - drivers/gpio/pic32_gpio.c | 1 - drivers/gpio/qcom_pmic_gpio.c | 1 - drivers/gpio/qe_gpio.c | 1 - drivers/gpio/rk_gpio.c | 1 - drivers/gpio/s5p_gpio.c | 1 - drivers/gpio/sandbox.c | 1 - drivers/gpio/sandbox_test.c | 1 - drivers/gpio/sh_pfc.c | 1 - drivers/gpio/sifive-gpio.c | 1 - drivers/gpio/sl28cpld-gpio.c| 1 - drivers/gpio/stm32_gpio.c | 1 - drivers/gpio/sunxi_gpio.c | 1 - drivers/gpio/tca642x.c | 2 +- drivers/gpio/tegra186_gpio.c| 1 - drivers/gpio/tegra_gpio.c | 1 - drivers/gpio/vybrid_gpio.c | 1 - drivers/gpio/xilinx_gpio.c | 1 - drivers/gpio/zynq_gpio.c| 1 - drivers/gpio/zynqmp_gpio_modepin.c | 1 - 63 files changed, 3 insertions(+), 63 deletions(-) Thanks for this cleanup! Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH 43/81] mtd: Remove and add needed includes
On 05/01/2024 06:31 PM, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Tom Rini Cc: Stefan Roese Cc: Dario Binacchi Cc: Michael Trimarchi Cc: Anand Gore Cc: William Zhang Cc: Kursad Oney Cc: Joel Peshkin Cc: Philippe Reynes Cc: Alex Nemirovsky Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang Cc: Patrick Delaunay Cc: Patrice Chotard Cc: Michal Simek Cc: Frieder Schrempf Cc: Abdellatif El Khlifi Cc: Nobuhiro Iwamatsu Cc: Marek Vasut Cc: Jagan Teki Cc: Vignesh R Cc: Nishanth Menon Cc: Sean Anderson --- drivers/mtd/altera_qspi.c | 1 - drivers/mtd/cfi_flash.c | 3 ++- drivers/mtd/cfi_mtd.c | 1 - drivers/mtd/hbmc-am654.c| 1 - drivers/mtd/jedec_flash.c | 1 - drivers/mtd/mtd-uclass.c| 1 - drivers/mtd/mtd_uboot.c | 1 - drivers/mtd/mtdpart.c | 1 - drivers/mtd/nand/bbt.c | 1 - drivers/mtd/nand/core.c | 1 - drivers/mtd/nand/raw/am335x_spl_bch.c | 2 +- drivers/mtd/nand/raw/arasan_nfc.c | 1 - drivers/mtd/nand/raw/atmel_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 1 - drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c| 1 - drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c| 1 - drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 1 - drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c| 1 - drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c| 1 - drivers/mtd/nand/raw/brcmnand/brcmnand.c| 1 - drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 1 - drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 1 - drivers/mtd/nand/raw/cortina_nand.c | 1 - drivers/mtd/nand/raw/davinci_nand.c | 2 +- drivers/mtd/nand/raw/denali.c | 1 - drivers/mtd/nand/raw/denali_spl.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_nand.c| 2 +- drivers/mtd/nand/raw/fsl_elbc_spl.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 2 +- drivers/mtd/nand/raw/kirkwood_nand.c| 1 - drivers/mtd/nand/raw/kmeter1_nand.c | 2 +- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- drivers/mtd/nand/raw/mxc_nand.c | 2 +- drivers/mtd/nand/raw/mxc_nand_spl.c | 2 +- drivers/mtd/nand/raw/mxic_nand.c| 1 - drivers/mtd/nand/raw/mxs_nand.c | 1 - drivers/mtd/nand/raw/mxs_nand_spl.c | 1 - drivers/mtd/nand/raw/nand.c | 2 +- drivers/mtd/nand/raw/nand_base.c| 1 - drivers/mtd/nand/raw/nand_bbt.c | 1 - drivers/mtd/nand/raw/nand_bch.c | 1 - drivers/mtd/nand/raw/nand_ecc.c | 1 - drivers/mtd/nand/raw/nand_ids.c | 1 - drivers/mtd/nand/raw/nand_spl_load.c| 2 +- drivers/mtd/nand/raw/nand_spl_simple.c | 2 +- drivers/mtd/nand/raw/nand_timings.c | 1 - drivers/mtd/nand/raw/nand_util.c| 1 - drivers/mtd/nand/raw/omap_elm.c | 1 - drivers/mtd/nand/raw/omap_gpmc.c| 2 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 1 - drivers/mtd/nand/raw/rockchip_nfc.c | 1 - drivers/mtd/nand/raw/stm32_fmc2_nand.c | 1 - drivers/mtd/nand/raw/sunxi_nand.c | 1 - drivers/mtd/nand/raw/sunxi_nand_spl.c | 1 - drivers/mtd/nand/raw/tegra_nand.c | 1 - drivers/mtd/nand/raw/vf610_nfc.c| 2 +- drivers/mtd/nand/raw/zynq_nand.c| 1 - drivers/mtd/nand/spi/core.c | 1 - drivers/mtd/nvmxip/nvmxip-uclass.c | 1 - drivers/mtd/nvmxip/nvmxip.c | 1 - drivers/mtd/nvmxip/nvmxip_qspi.c| 1 - drivers/mtd/onenand/onenand_base.c | 1 - drivers/mtd/onenand/onenand_bbt.c | 1 - drivers/mtd/onenand/onenand_spl.c | 3 ++- drivers/mtd/onenand/onenand_uboot.c | 2 +- drivers/mtd/onenand/samsung.c | 1 - drivers/mtd/renesas_rpc_hf.c| 1 - drivers/mtd/spi/fsl_espi_spl.c | 2 +- drivers/mtd/spi/sandbox.c | 1 - drivers/mtd/spi/sf-uclass.c | 1 - drivers/mtd/spi/sf_bootdev.c| 1 - drivers/mtd/spi/sf_dataflash.c | 1 - drivers/mtd/spi/sf_mtd.c| 1 - drivers/mtd/spi/sf_probe.c | 1 - drivers/mtd/spi/spi-nor-core.c | 1 - drivers/mtd/spi/spi-nor-ids.c
Re: [PATCH 35/81] i2c: Remove and add needed includes
Hello Tom, On 02.05.24 03:30, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Heiko Schocher Cc: Tom Rini Cc: Ryan Chen Cc: Aspeed BMC SW team Cc: Chia-Wei Wang Cc: Joel Stanley Cc: Michal Simek Cc: Alex Nemirovsky Cc: Liviu Dudau Cc: Neil Armstrong Cc: Stefan Roese Cc: Stefan Bosch Cc: Nobuhiro Iwamatsu Cc: Marek Vasut Cc: Simon Glass Cc: Patrick Delaunay Cc: Patrice Chotard Cc: Thierry Reding Cc: Svyatoslav Ryhel --- drivers/i2c/acpi_i2c.c | 1 - drivers/i2c/ast2600_i2c.c | 1 - drivers/i2c/ast_i2c.c | 1 - drivers/i2c/at91_i2c.c | 1 - drivers/i2c/cros_ec_ldo.c | 1 - drivers/i2c/cros_ec_tunnel.c | 1 - drivers/i2c/davinci_i2c.c | 2 +- drivers/i2c/designware_i2c.c | 1 - drivers/i2c/designware_i2c_pci.c | 1 - drivers/i2c/exynos_hs_i2c.c| 1 - drivers/i2c/fsl_i2c.c | 2 +- drivers/i2c/i2c-cdns.c | 1 - drivers/i2c/i2c-cortina.c | 2 +- drivers/i2c/i2c-emul-uclass.c | 1 - drivers/i2c/i2c-gpio.c | 1 - drivers/i2c/i2c-microchip.c| 1 - drivers/i2c/i2c-uclass.c | 1 - drivers/i2c/i2c-versatile.c| 1 - drivers/i2c/i2c_core.c | 2 +- drivers/i2c/ihs_i2c.c | 1 - drivers/i2c/imx_lpi2c.c| 1 - drivers/i2c/intel_i2c.c| 2 +- drivers/i2c/iproc_i2c.c| 1 - drivers/i2c/lpc32xx_i2c.c | 2 +- drivers/i2c/meson_i2c.c| 1 - drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +- drivers/i2c/muxes/i2c-mux-gpio.c | 1 - drivers/i2c/muxes/i2c-mux-uclass.c | 1 - drivers/i2c/muxes/pca954x.c| 1 - drivers/i2c/mv_i2c.c | 1 - drivers/i2c/mvtwsi.c | 2 +- drivers/i2c/mxc_i2c.c | 2 +- drivers/i2c/nx_i2c.c | 2 +- drivers/i2c/ocores_i2c.c | 1 - drivers/i2c/omap24xx_i2c.c | 1 - drivers/i2c/qup_i2c.c | 1 - drivers/i2c/rcar_i2c.c | 1 - drivers/i2c/rcar_iic.c | 1 - drivers/i2c/rk_i2c.c | 1 - drivers/i2c/s3c24x0_i2c.c | 2 +- drivers/i2c/sandbox_i2c.c | 1 - drivers/i2c/sh_i2c.c | 1 - drivers/i2c/soft_i2c.c | 2 +- drivers/i2c/stm32f7_i2c.c | 1 - drivers/i2c/sun6i_p2wi.c | 1 - drivers/i2c/sun8i_rsb.c| 1 - drivers/i2c/tegra186_bpmp_i2c.c| 1 - drivers/i2c/tegra_i2c.c| 1 - drivers/i2c/xilinx_xiic.c | 1 - 49 files changed, 12 insertions(+), 49 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
RE: [PATCH 42/81] mmc: Remove and add needed includes
> -Original Message- > From: Tom Rini > Sent: Thursday, May 2, 2024 10:31 AM > To: u-boot@lists.denx.de > Cc: Peng Fan ; Jaehoon Chung ; Ryan > Chen > ; Chia-Wei Wang ; > Aspeed BMC SW team s...@aspeedtech.com>; Joel Stanley ; Matthias Brugger > ; Peter > Robinson ; Thomas Fitzsimmons ; > Alex Nemirovsky > ; Masahisa Kojima > ; Neil Armstrong > ; Simon Glass ; Caleb Connolly > ; Sumit Garg ; Ryder Lee > ; > Weijie Gao ; Chunfeng Yun > ; GSS_MTK_Uboot_upstream > ; Tianrui Wei ; > Philipp Tomsich > ; Kever Yang ; Nobuhiro > Iwamatsu > ; Marek Vasut ; > Eugeniy Paltsev > ; Patrice Chotard > ; Patrick Delaunay > ; Thierry Reding ; > Svyatoslav Ryhel > ; Kunihiko Hayashi ; Dai > Okamura > ; Stefan Roese ; Michal Simek > > Subject: [PATCH 42/81] mmc: Remove and add needed includes > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Jaehoon Chung Best Regards, Jaehoon Chung > --- > Cc: Peng Fan > Cc: Jaehoon Chung > Cc: Tom Rini > Cc: Ryan Chen > Cc: Chia-Wei Wang > Cc: Aspeed BMC SW team > Cc: Joel Stanley > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Thomas Fitzsimmons > Cc: Alex Nemirovsky > Cc: Masahisa Kojima > Cc: Neil Armstrong > Cc: Simon Glass > Cc: Caleb Connolly > Cc: Sumit Garg > Cc: Ryder Lee > Cc: Weijie Gao > Cc: Chunfeng Yun > Cc: GSS_MTK_Uboot_upstream > Cc: Tianrui Wei > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Nobuhiro Iwamatsu > Cc: Marek Vasut > Cc: Eugeniy Paltsev > Cc: Patrice Chotard > Cc: Patrick Delaunay > Cc: Thierry Reding > Cc: Svyatoslav Ryhel > Cc: Kunihiko Hayashi > Cc: Dai Okamura > Cc: Stefan Roese > Cc: Michal Simek > --- > drivers/mmc/am654_sdhci.c | 1 - > drivers/mmc/arm_pl180_mmci.c | 1 - > drivers/mmc/aspeed_sdhci.c| 1 - > drivers/mmc/atmel_sdhci.c | 1 - > drivers/mmc/bcm2835_sdhci.c | 1 - > drivers/mmc/bcm2835_sdhost.c | 1 - > drivers/mmc/bcmstb_sdhci.c| 1 - > drivers/mmc/ca_dw_mmc.c | 1 - > drivers/mmc/davinci_mmc.c | 1 - > drivers/mmc/dw_mmc.c | 1 - > drivers/mmc/exynos_dw_mmc.c | 1 - > drivers/mmc/f_sdh30.c | 1 - > drivers/mmc/fsl_esdhc.c | 1 - > drivers/mmc/fsl_esdhc_imx.c | 1 - > drivers/mmc/fsl_esdhc_spl.c | 2 +- > drivers/mmc/ftsdc010_mci.c| 1 - > drivers/mmc/gen_atmel_mci.c | 2 +- > drivers/mmc/hi6220_dw_mmc.c | 1 - > drivers/mmc/iproc_sdhci.c | 1 - > drivers/mmc/jz_mmc.c | 1 - > drivers/mmc/kona_sdhci.c | 1 - > drivers/mmc/meson_gx_mmc.c| 1 - > drivers/mmc/mmc-pwrseq.c | 1 - > drivers/mmc/mmc-uclass.c | 1 - > drivers/mmc/mmc.c | 3 ++- > drivers/mmc/mmc_boot.c| 1 - > drivers/mmc/mmc_bootdev.c | 1 - > drivers/mmc/mmc_legacy.c | 1 - > drivers/mmc/mmc_spi.c | 1 - > drivers/mmc/mmc_write.c | 1 - > drivers/mmc/msm_sdhci.c | 1 - > drivers/mmc/mtk-sd.c | 1 - > drivers/mmc/mv_sdhci.c| 1 - > drivers/mmc/mvebu_mmc.c | 1 - > drivers/mmc/mxcmmc.c | 1 - > drivers/mmc/mxsmmc.c | 1 - > drivers/mmc/nexell_dw_mmc.c | 1 - > drivers/mmc/npcm_sdhci.c | 1 - > drivers/mmc/omap_hsmmc.c | 1 - > drivers/mmc/owl_mmc.c | 1 - > drivers/mmc/pci_mmc.c | 1 - > drivers/mmc/piton_mmc.c | 1 - > drivers/mmc/rockchip_dw_mmc.c | 1 - > drivers/mmc/rockchip_sdhci.c | 1 - > drivers/mmc/rpmb.c| 1 - > drivers/mmc/s5p_sdhci.c | 1 - > drivers/mmc/sandbox_mmc.c | 1 - > drivers/mmc/sdhci-adma.c | 1 - > drivers/mmc/sdhci-cadence.c | 1 - > drivers/mmc/sdhci.c | 2 +- > drivers/mmc/sh_mmcif.c| 1 - > drivers/mmc/snps_dw_mmc.c | 1 - > drivers/mmc/socfpga_dw_mmc.c | 1 - > drivers/mmc/sti_sdhci.c | 1 - > drivers/mmc/stm32_sdmmc2.c| 1 - > drivers/mmc/sunxi_mmc.c | 1 - > drivers/mmc/tangier_sdhci.c | 1 - > drivers/mmc/tegra_mmc.c | 1 - > drivers/mmc/tmio-common.c | 1 - > drivers/mmc/uniphier-sd.c | 1 - > drivers/mmc/xenon_sdhci.c | 1 - > drivers/mmc/zynq_sdhci.c | 1 - > 62 files changed, 5 insertions(+), 62 deletions(-) > > diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c > index ffb461c2f6c1..48fac7a11b48 100644 > --- a/drivers/mmc/am654_sdhci.c > +++ b/drivers/mmc/am654_sdhci.c > @@ -6,7 +6,6 @@ > */ > > #include > -#include > #include > #include > #include > diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c > index cecc7ad783d0..f00b0ff0dc95 100644 > --- a/drivers/mmc/arm_pl180_mmci.c > +++ b/drivers/mmc/arm_pl180_mmci.c > @@ -11,7 +11,6 @@ > > /* #define DEBUG */ > > -#include "common.h" > #include > #include > #include > diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c > index c9626c6beb8f..87a6f66ebb37 100644 > --- a/drivers/mmc/aspeed_sdhci.c > +++ b/drivers/mmc/aspeed_sdhci.c > @@ -4,7 +4,6 @@ > * Eddie
RE: [PATCH 01/81] mmc: Migrate MMC_SUPPORTS_TUNING to Kconfig
> -Original Message- > From: Tom Rini > Sent: Thursday, May 2, 2024 10:30 AM > To: u-boot@lists.denx.de > Cc: Weijie Gao ; GSS_MTK_Uboot_upstream > ; > Peng Fan ; Jaehoon Chung > Subject: [PATCH 01/81] mmc: Migrate MMC_SUPPORTS_TUNING to Kconfig > > The constraints on the MMC_SUPPORTS_TUNING symbol can easily be > expressed in Kconfig (with the addition of SPL_MMC_SUPPORTS_TUNING). > Furthermore, in order to remove from the MMC subsystem, the > way this symbol is used today needs to be changed in order to continue > functioning. > > Signed-off-by: Tom Rini Reviewed-by: Jaehoon Chung Best Regards, Jaehoon Chung > --- > Cc: Weijie Gao > Cc: GSS_MTK_Uboot_upstream > Cc: Peng Fan > Cc: Jaehoon Chung > --- > arch/arm/mach-mediatek/Kconfig | 1 + > arch/mips/mach-mtmips/Kconfig | 1 + > drivers/mmc/Kconfig| 11 +++ > drivers/mmc/am654_sdhci.c | 6 +++--- > drivers/mmc/fsl_esdhc.c| 4 ++-- > drivers/mmc/fsl_esdhc_imx.c| 8 > drivers/mmc/mmc-uclass.c | 2 +- > drivers/mmc/mmc.c | 12 ++-- > drivers/mmc/mtk-sd.c | 4 ++-- > drivers/mmc/octeontx_hsmmc.c | 12 ++-- > drivers/mmc/omap_hsmmc.c | 4 ++-- > drivers/mmc/sdhci-cadence.c| 2 +- > drivers/mmc/sdhci.c| 4 ++-- > include/configs/mt7621.h | 3 --- > include/configs/mt7623.h | 3 --- > include/configs/octeontx2_common.h | 5 - > include/mmc.h | 9 + > 17 files changed, 43 insertions(+), 48 deletions(-) > > diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig > index 82018bd9d3e3..ff1fdee5c8da 100644 > --- a/arch/arm/mach-mediatek/Kconfig > +++ b/arch/arm/mach-mediatek/Kconfig > @@ -23,6 +23,7 @@ config TARGET_MT7622 > config TARGET_MT7623 > bool "MediaTek MT7623 SoC" > select CPU_V7A > + select MMC_SUPPORTS_TUNING > help > The MediaTek MT7623 is a ARM-based SoC with a quad-core Cortex-A7 > including NEON and GPU, Mali-450 graphics, several DDR3 options, > diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig > index 15b2792e619b..3fcd0b8465b4 100644 > --- a/arch/mips/mach-mtmips/Kconfig > +++ b/arch/mips/mach-mtmips/Kconfig > @@ -80,6 +80,7 @@ config SOC_MT7621 > bool "MT7621" > select MIPS_CM > select MIPS_L2_CACHE > + select MMC_SUPPORTS_TUNING > select SYS_CACHE_SHIFT_5 > select SYS_MIPS_CACHE_INIT_RAM_LOAD > select PINCTRL_MT7621 > diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig > index 549634891a36..d0944793c92d 100644 > --- a/drivers/mmc/Kconfig > +++ b/drivers/mmc/Kconfig > @@ -147,9 +147,16 @@ config SPL_MMC_IO_VOLTAGE > support. For eMMC this not mandatory, but not enabling this option may > prevent the driver of using the faster modes. > > +config MMC_SUPPORTS_TUNING > + bool > + > +config SPL_MMC_SUPPORTS_TUNING > + bool > + > config MMC_UHS_SUPPORT > bool "enable UHS support" > depends on MMC_IO_VOLTAGE > + select MMC_SUPPORTS_TUNING > help > The Ultra High Speed (UHS) bus is available on some SDHC and SDXC > cards. The IO voltage must be switchable from 3.3v to 1.8v. The bus > @@ -158,6 +165,7 @@ config MMC_UHS_SUPPORT > config SPL_MMC_UHS_SUPPORT > bool "enable UHS support in SPL" > depends on SPL_MMC_IO_VOLTAGE > + select SPL_MMC_SUPPORTS_TUNING > help > The Ultra High Speed (UHS) bus is available on some SDHC and SDXC > cards. The IO voltage must be switchable from 3.3v to 1.8v. The bus > @@ -193,6 +201,7 @@ config SPL_MMC_HS400_SUPPORT > > config MMC_HS200_SUPPORT > bool "enable HS200 support" > + select MMC_SUPPORTS_TUNING > help > The HS200 mode is support by some eMMC. The bus frequency is up to > 200MHz. This mode requires tuning the IO. > @@ -200,6 +209,7 @@ config MMC_HS200_SUPPORT > config SPL_MMC_HS200_SUPPORT > bool "enable HS200 support in SPL" > depends on SPL_MMC > + select SPL_MMC_SUPPORTS_TUNING > help > The HS200 mode is support by some eMMC. The bus frequency is up to > 200MHz. This mode requires tuning the IO. > @@ -347,6 +357,7 @@ config MMC_OCTEONTX > bool "Marvell Octeon Multimedia Card Interface support" > depends on (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2) > depends on DM_MMC > + select MMC_SUPPORTS_TUNING if ARCH_OCTEONTX2 > help > This selects the Octeon Multimedia card Interface. > If you have an OcteonTX/TX2 or MIPS Octeon board with a > diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c > index fadab7d40bb7..ffb461c2f6c1 100644 > --- a/drivers/mmc/am654_sdhci.c > +++ b/drivers/mmc/am654_sdhci.c > @@ -397,7 +397,7 @@ static void am654_sdhci_write_b(struct sdhci_host *host, > u8 val, int reg) > >
[PATCH v2 4/4] imx: hab: Use nxp_imx8mcst etype for i.MX8M flash.bin signing
Update documentation and use nxp_imx8mcst binman etype for signing
of flash.bin instead of previous horrible shell scripting.
Signed-off-by: Marek Vasut
---
Cc: "NXP i.MX U-Boot Team"
Cc: Adam Ford
Cc: Alper Nebi Yasak
Cc: Andrejs Cainikovs
Cc: Angus Ainslie
Cc: Emanuele Ghidoli
Cc: Fabio Estevam
Cc: Francesco Dolcini
Cc: Marcel Ziswiler
Cc: Rasmus Villemoes
Cc: Simon Glass
Cc: Stefan Eichenberger
Cc: Stefano Babic
Cc: Tim Harvey
Cc: Tom Rini
Cc: ker...@puri.sm
Cc: u-b...@dh-electronics.com
Cc: u-boot@lists.denx.de
---
V2: Document the automatic signing in case CONFIG_IMX_HAB is enabled
---
doc/imx/habv4/csf_examples/mx8m/csf.sh| 92
doc/imx/habv4/csf_examples/mx8m/csf_fit.txt | 30 --
doc/imx/habv4/csf_examples/mx8m/csf_spl.txt | 33 --
doc/imx/habv4/guides/mx8m_spl_secure_boot.txt | 100 +++---
4 files changed, 14 insertions(+), 241 deletions(-)
delete mode 100644 doc/imx/habv4/csf_examples/mx8m/csf.sh
delete mode 100644 doc/imx/habv4/csf_examples/mx8m/csf_fit.txt
delete mode 100644 doc/imx/habv4/csf_examples/mx8m/csf_spl.txt
diff --git a/doc/imx/habv4/csf_examples/mx8m/csf.sh
b/doc/imx/habv4/csf_examples/mx8m/csf.sh
deleted file mode 100644
index cd3b2614a2f..000
--- a/doc/imx/habv4/csf_examples/mx8m/csf.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# 0) Generate keys
-#
-# WARNING: ECDSA keys are only supported by HAB 4.5 and newer (i.e. i.MX8M
Plus)
-#
-# cd /path/to/cst-3.3.1/keys/
-#./hab4_pki_tree.sh -existing-ca n -use-ecc n -kl 4096 -duration 10
-num-srk 4 -srk-ca y
-# cd /path/to/cst-3.3.1/crts/
-# ../linux64/bin/srktool -h 4 -t SRK_1_2_3_4_table.bin -e
SRK_1_2_3_4_fuse.bin -d sha256 -c
./SRK1_sha256_4096_65537_v3_ca_crt.pem,./SRK2_sha256_4096_65537_v3_ca_crt.pem,./SRK3_sha256_4096_65537_v3_ca_crt.pem,./SRK4_sha256_4096_65537_v3_ca_crt.pem
-f 1
-
-# 1) Build U-Boot (e.g. for i.MX8MM)
-#
-# cp -Lv /path/to/arm-trusted-firmware/build/imx8mm/release/bl31.bin .
-# cp -Lv /path/to/firmware-imx-8.14/firmware/ddr/synopsys/ddr3* .
-# make -j imx8mm_board_defconfig
-# make -j`nproc` flash.bin
-
-# 2) Sign SPL and DRAM blobs
-
-cp doc/imx/habv4/csf_examples/mx8m/csf_spl.txt csf_spl.tmp
-cp doc/imx/habv4/csf_examples/mx8m/csf_fit.txt csf_fit.tmp
-
-# update File Paths from env vars
-if ! [ -r $CSF_KEY ]; then
- echo "Error: \$CSF_KEY not found"
- exit 1
-fi
-if ! [ -r $IMG_KEY ]; then
- echo "Error: \$IMG_KEY not found"
- exit 1
-fi
-if ! [ -r $SRK_TABLE ]; then
- echo "Error: \$SRK_TABLE not found"
- exit 1
-fi
-sed -i "s:\$CSF_KEY:$CSF_KEY:" csf_spl.tmp
-sed -i "s:\$IMG_KEY:$IMG_KEY:" csf_spl.tmp
-sed -i "s:\$SRK_TABLE:$SRK_TABLE:" csf_spl.tmp
-sed -i "s:\$CSF_KEY:$CSF_KEY:" csf_fit.tmp
-sed -i "s:\$IMG_KEY:$IMG_KEY:" csf_fit.tmp
-sed -i "s:\$SRK_TABLE:$SRK_TABLE:" csf_fit.tmp
-
-# update SPL Blocks
-spl_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_SPL_TEXT_BASE=/ s@.*=@@p"
.config) - 0x40)) )
-spl_block_size=$(printf "0x%x" $(stat -tc %s u-boot-spl-ddr.bin))
-sed -i "/Blocks = / s@.*@ Blocks = $spl_block_base 0x0 $spl_block_size
\"flash.bin\"@" csf_spl.tmp
-
-# Generate CSF blob
-cst -i csf_spl.tmp -o csf_spl.bin
-
-# Patch CSF blob into flash.bin
-spl_csf_offset=$(xxd -s 24 -l 4 -e flash.bin | cut -d " " -f 2 | sed "s@^@0x@")
-spl_bin_offset=$(xxd -s 4 -l 4 -e flash.bin | cut -d " " -f 2 | sed "s@^@0x@")
-spl_dd_offset=$((${spl_csf_offset} - ${spl_bin_offset} + 0x40))
-dd if=csf_spl.bin of=flash.bin bs=1 seek=${spl_dd_offset} conv=notrunc
-
-# 3) Sign u-boot.itb
-
-# fitImage
-fit_block_base=$(printf "0x%x" $(sed -n "/CONFIG_SPL_LOAD_FIT_ADDRESS=/
s@.*=@@p" .config) )
-fit_block_offset=$(printf "0x%s" $(fdtget -t x u-boot.dtb
/binman/imx-boot/uboot offset))
-fit_block_size=$(printf "0x%x" $(( ( ( $(stat -tc %s u-boot.itb) + 0x1000 -
0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) )
-sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset
$fit_block_size \"flash.bin\"@" csf_fit.tmp
-
-# IVT
-ivt_ptr_base=$(printf "%08x" ${fit_block_base} | sed
"s@\(..\)\(..\)\(..\)\(..\)@0x\4\3\2\1@")
-ivt_block_base=$(printf "%08x" $(( ${fit_block_base} + ${fit_block_size} -
0x20 )) | sed "s@\(..\)\(..\)\(..\)\(..\)@0x\4\3\2\1@")
-csf_block_base=$(printf "%08x" $(( ${fit_block_base} + ${fit_block_size} )) |
sed "s@\(..\)\(..\)\(..\)\(..\)@0x\4\3\2\1@")
-ivt_block_offset=$((${fit_block_offset} + ${fit_block_size} - 0x20))
-csf_block_offset=$((${ivt_block_offset} + 0x20))
-
-echo "0xd1002041 ${ivt_block_base} 0x 0x 0x
${ivt_block_base} ${csf_block_base} 0x" | xxd -r -p > ivt.bin
-dd if=ivt.bin of=flash.bin bs=1 seek=${ivt_block_offset} conv=notrunc
-
-# Generate CSF blob
-cst -i csf_fit.tmp -o csf_fit.bin
-
-# When loading flash.bin via USB, we must ensure that the file being
-# served is as large as the target expects (see
-# board_spl_fit_size_align()), otherwise the target will hang in
-# rom_api_download_image() waiting for the remaining
[PATCH v2 3/4] ARM: dts: imx: Wrap i.MX8M binman SPL and FIT nodes in CST node if IMX_HAB enabled
In case CONFIG_IMX_HAB is enabled, extend the binman image description for
all of i.MX8M{Q,M,N,P} with CST wrapper node. This way, if CONFIG_IMX_HAB
is enabled, binman will be automatically used to sign SPL and fitImage.
Signed-off-by: Marek Vasut
---
Cc: "NXP i.MX U-Boot Team"
Cc: Adam Ford
Cc: Alper Nebi Yasak
Cc: Andrejs Cainikovs
Cc: Angus Ainslie
Cc: Emanuele Ghidoli
Cc: Fabio Estevam
Cc: Francesco Dolcini
Cc: Marcel Ziswiler
Cc: Rasmus Villemoes
Cc: Simon Glass
Cc: Stefan Eichenberger
Cc: Stefano Babic
Cc: Tim Harvey
Cc: Tom Rini
Cc: ker...@puri.sm
Cc: u-b...@dh-electronics.com
Cc: u-boot@lists.denx.de
---
V2: New patch
---
arch/arm/dts/imx8mm-u-boot.dtsi | 195 -
arch/arm/dts/imx8mn-u-boot.dtsi | 209 ++--
arch/arm/dts/imx8mp-u-boot.dtsi | 172 ++
arch/arm/dts/imx8mq-u-boot.dtsi | 182 ++-
4 files changed, 424 insertions(+), 334 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index b9b1193823a..c02e11def5f 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -54,126 +54,151 @@
};
#endif
- binman_imx_spl: nxp-imx8mimage {
- filename = "u-boot-spl-mkimage.bin";
- nxp,boot-from = "sd";
- nxp,rom-version = <1>;
+#ifdef CONFIG_IMX_HAB
+ nxp-imx8mcst@0 {
+ filename = "u-boot-spl-mkimage.signed.bin";
nxp,loader-address = ;
+ nxp,unlock;
args; /* Needed by mkimage etype superclass */
+#endif
- section {
- align = <4>;
- align-size = <4>;
- filename = "u-boot-spl-ddr.bin";
- pad-byte = <0xff>;
-
- u-boot-spl {
- align-end = <4>;
- filename = "u-boot-spl.bin";
- };
+ binman_imx_spl: nxp-imx8mimage {
+ filename = "u-boot-spl-mkimage.bin";
+ nxp,boot-from = "sd";
+ nxp,rom-version = <1>;
+ nxp,loader-address = ;
+ args; /* Needed by mkimage etype superclass */
+
+ section {
+ align = <4>;
+ align-size = <4>;
+ filename = "u-boot-spl-ddr.bin";
+ pad-byte = <0xff>;
+
+ u-boot-spl {
+ align-end = <4>;
+ filename = "u-boot-spl.bin";
+ };
- ddr-1d-imem-fw {
- filename =
"lpddr4_pmu_train_1d_imem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
+ ddr-1d-imem-fw {
+ filename =
"lpddr4_pmu_train_1d_imem.bin";
+ align-end = <4>;
+ type = "blob-ext";
+ };
- ddr-1d-dmem-fw {
- filename =
"lpddr4_pmu_train_1d_dmem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
+ ddr-1d-dmem-fw {
+ filename =
"lpddr4_pmu_train_1d_dmem.bin";
+ align-end = <4>;
+ type = "blob-ext";
+ };
- ddr-2d-imem-fw {
- filename =
"lpddr4_pmu_train_2d_imem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
+ ddr-2d-imem-fw {
+ filename =
"lpddr4_pmu_train_2d_imem.bin";
+ align-end = <4>;
+ type = "blob-ext";
+ };
- ddr-2d-dmem-fw {
-
[PATCH v2 2/4] ARM: dts: imx: Introduce SPL and FIT labels to i.MX8M DTs binman nodes
Add binman_imx_spl and binman_imx_fit labels to nxp-imx8mimage {} and fit {}
nodes respectively, so they can be referened in board DTs no matter how deep
in the top level binman image description they are. Update current board DTs
to use those labels.
Signed-off-by: Marek Vasut
---
Cc: "NXP i.MX U-Boot Team"
Cc: Adam Ford
Cc: Alper Nebi Yasak
Cc: Andrejs Cainikovs
Cc: Angus Ainslie
Cc: Emanuele Ghidoli
Cc: Fabio Estevam
Cc: Francesco Dolcini
Cc: Marcel Ziswiler
Cc: Rasmus Villemoes
Cc: Simon Glass
Cc: Stefan Eichenberger
Cc: Stefano Babic
Cc: Tim Harvey
Cc: Tom Rini
Cc: ker...@puri.sm
Cc: u-b...@dh-electronics.com
Cc: u-boot@lists.denx.de
---
V2: New patch
---
arch/arm/dts/imx8mm-u-boot.dtsi | 4 +-
.../dts/imx8mm-verdin-wifi-dev-u-boot.dtsi| 8 +-
arch/arm/dts/imx8mn-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mp-dhcom-u-boot.dtsi | 124 +-
arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi| 26 ++--
arch/arm/dts/imx8mp-u-boot.dtsi | 4 +-
arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi| 10 +-
arch/arm/dts/imx8mq-u-boot.dtsi | 4 +-
8 files changed, 84 insertions(+), 100 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 6ab8f66256e..b9b1193823a 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -54,7 +54,7 @@
};
#endif
- nxp-imx8mimage {
+ binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <1>;
@@ -98,7 +98,7 @@
};
};
- fit {
+ binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = ;
diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
index 90183aff8bc..183de46f66a 100644
--- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
@@ -35,12 +35,8 @@
bootph-pre-ram;
};
- {
- section {
- fit {
- offset = <0x5fc00>;
- };
- };
+_imx_fit {
+ offset = <0x5fc00>;
};
{
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index ba9967dbe4a..c9fb33cfb73 100644
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -103,7 +103,7 @@
};
#endif
- nxp-imx8mimage {
+ binman_imx_spl: nxp-imx8mimage {
filename = "u-boot-spl-mkimage.bin";
nxp,boot-from = "sd";
nxp,rom-version = <2>;
@@ -169,7 +169,7 @@
};
};
- fit {
+ binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
#ifndef CONFIG_IMX_HAB
fit,external-offset = ;
diff --git a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
index cb37e28f28f..c065fb82994 100644
--- a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
@@ -135,73 +135,69 @@
bootph-pre-ram;
};
- {
- section {
- fit {
- images {
- fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast {
- description =
"imx8mp-dhcom-som-overlay-eth1xfast";
- type = "flat_dt";
- compression = "none";
-
- blob-ext {
- filename =
"imx8mp-dhcom-som-overlay-eth1xfast.dtbo";
- };
- };
-
- fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast {
- description =
"imx8mp-dhcom-som-overlay-eth2xfast";
- type = "flat_dt";
- compression = "none";
-
- blob-ext {
- filename =
"imx8mp-dhcom-som-overlay-eth2xfast.dtbo";
- };
- };
-
- fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast {
- description =
"imx8mp-dhcom-pdk-overlay-eth2xfast";
- type = "flat_dt";
- compression = "none";
-
- blob-ext {
- filename =
[PATCH v2 1/4] binman: Add nxp_imx8mcst etype for i.MX8M flash.bin signing
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-crt, nxp,img-crt, 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.
Signed-off-by: Marek Vasut
---
Cc: "NXP i.MX U-Boot Team"
Cc: Adam Ford
Cc: Alper Nebi Yasak
Cc: Andrejs Cainikovs
Cc: Angus Ainslie
Cc: Emanuele Ghidoli
Cc: Fabio Estevam
Cc: Francesco Dolcini
Cc: Marcel Ziswiler
Cc: Rasmus Villemoes
Cc: Simon Glass
Cc: Stefan Eichenberger
Cc: Stefano Babic
Cc: Tim Harvey
Cc: Tom Rini
Cc: ker...@puri.sm
Cc: u-b...@dh-electronics.com
Cc: u-boot@lists.denx.de
---
V2: - Use configparser module for generating the configuration INI file
- Use config template as an input, parse it, modify only keys of interest
- Pull magic values into top level variables
- Rename nxp,csf-key and nxp,img-key to nxp,csf-crt and nxp,img-crt
- Return unmodified data if signing unrecognized (non-SPL/non-FIT) section
---
tools/binman/btool/cst.py | 48 +
tools/binman/etype/nxp_imx8mcst.py | 163 +
2 files changed, 211 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 000..30e78bdbbd9
--- /dev/null
+++ b/tools/binman/btool/cst.py
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright 2024 Marek Vasut
+#
+"""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 000..132127ad482
--- /dev/null
+++ b/tools/binman/etype/nxp_imx8mcst.py
@@ -0,0 +1,163 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright 2023-2024 Marek Vasut
+# Written with much help from Simon Glass
+#
+# 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 configparser
+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
+
+MAGIC_NXP_IMX_IVT = 0x412000d1
+MAGIC_FITIMAGE= 0xedfe0dd0
+
+csf_config_template = """
+[Header]
+ Version = 4.3
+ Hash Algorithm = sha256
+ Engine = CAAM
+ Engine Configuration = 0
+ Certificate Format = X509
+ Signature Format = CMS
+
+[Install SRK]
+ File = "SRK_1_2_3_4_table.bin"
+ Source index = 0
+
+[Install CSFK]
+ File = "CSF1_1_sha256_4096_65537_v3_usr_crt.pem"
+
+[Authenticate CSF]
+
+[Unlock]
+ Engine = CAAM
+ Features = MID
+
+[Install Key]
+ Verification index = 0
+ Target Index = 2
+ File = "IMG1_1_sha256_4096_65537_v3_usr_crt.pem"
+
+[Authenticate Data]
+ Verification index = 2
+ Blocks = 0x1234 0x78 0xabcd "data.bin"
+"""
+
+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 =
[PATCH V3] board: rockchip: add Powkiddy X55
From: Chris Morgan
The Powkiddy X55 is a Rockchip RK3566 based handheld gaming device.
UART, ADC, eMMC, and SDMMC are tested to work in U-Boot and this
successfully boots mainline Linux.
Kernel commit:
e99adc97e21a ("arm64: dts: rockchip: Add Powkiddy X55")
Signed-off-by: Chris Morgan
---
Changes since V2:
- Refactored to use the upstream device tree from Linux.
- Removed logic for handling the adc button and instead simply try to
boot from sdmmc0 as a valid target first.
---
arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi | 9 +++
arch/arm/mach-rockchip/rk3568/Kconfig| 6 ++
board/powkiddy/x55/Kconfig | 15 +
board/powkiddy/x55/MAINTAINERS | 7 +++
board/powkiddy/x55/Makefile | 6 ++
board/powkiddy/x55/x55.c | 39 +
configs/powkiddy-x55-rk3566_defconfig| 59
doc/board/rockchip/rockchip.rst | 1 +
include/configs/powkiddy-x55-rk3566.h| 12
9 files changed, 154 insertions(+)
create mode 100644 arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi
create mode 100644 board/powkiddy/x55/Kconfig
create mode 100644 board/powkiddy/x55/MAINTAINERS
create mode 100644 board/powkiddy/x55/Makefile
create mode 100644 board/powkiddy/x55/x55.c
create mode 100644 configs/powkiddy-x55-rk3566_defconfig
create mode 100644 include/configs/powkiddy-x55-rk3566.h
diff --git a/arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi
b/arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi
new file mode 100644
index 00..c440201ec7
--- /dev/null
+++ b/arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk356x-u-boot.dtsi"
+
+/ {
+ chosen {
+ u-boot,spl-boot-order = , ,
+ };
+};
diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig
b/arch/arm/mach-rockchip/rk3568/Kconfig
index af537d912a..014ebf9f0b 100644
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -22,6 +22,11 @@ config TARGET_ODROID_M1_RK3568
help
Hardkernel ODROID-M1 single board computer with a RK3568B2 SoC.
+config TARGET_POWKIDDY_X55_RK3566
+ bool "Powkiddy X55"
+ help
+ Powkiddy X55 handheld gaming console with an RK3566 SoC.
+
config TARGET_QUARTZ64_RK3566
bool "Pine64 Quartz64"
help
@@ -48,5 +53,6 @@ source "board/rockchip/evb_rk3568/Kconfig"
source "board/anbernic/rgxx3_rk3566/Kconfig"
source "board/hardkernel/odroid_m1/Kconfig"
source "board/pine64/quartz64_rk3566/Kconfig"
+source "board/powkiddy/x55/Kconfig"
endif
diff --git a/board/powkiddy/x55/Kconfig b/board/powkiddy/x55/Kconfig
new file mode 100644
index 00..a7b3ed4d0d
--- /dev/null
+++ b/board/powkiddy/x55/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_POWKIDDY_X55_RK3566
+
+config SYS_BOARD
+ default "x55"
+
+config SYS_VENDOR
+ default "powkiddy"
+
+config SYS_CONFIG_NAME
+ default "powkiddy-x55-rk3566"
+
+config BOARD_SPECIFIC_OPTIONS
+ def_bool y
+
+endif
diff --git a/board/powkiddy/x55/MAINTAINERS b/board/powkiddy/x55/MAINTAINERS
new file mode 100644
index 00..01ae8da19d
--- /dev/null
+++ b/board/powkiddy/x55/MAINTAINERS
@@ -0,0 +1,7 @@
+X55
+M: Chris Morgan
+S: Maintained
+F: board/powkiddy/x55
+F: include/configs/powkiddy-x55-rk3566.h
+F: configs/powkiddy-x55-rk3566_defconfig
+F: arch/arm/dts/rk3566-powkiddy-x55-u-boot.dtsi
diff --git a/board/powkiddy/x55/Makefile b/board/powkiddy/x55/Makefile
new file mode 100644
index 00..55c8c16aa1
--- /dev/null
+++ b/board/powkiddy/x55/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2023 Chris Morgan
+#
+
+obj-y += x55.o
diff --git a/board/powkiddy/x55/x55.c b/board/powkiddy/x55/x55.c
new file mode 100644
index 00..b2703e6382
--- /dev/null
+++ b/board/powkiddy/x55/x55.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2023 Chris Morgan
+ */
+
+#include
+
+#define GPIO4_BASE 0xfe77
+#define GPIO_SWPORT_DR_L 0x
+#define GPIO_SWPORT_DDR_L 0x0008
+#define GPIO_B4BIT(12)
+#define GPIO_B5BIT(13)
+#define GPIO_B6BIT(14)
+
+#define GPIO_WRITEMASK(bits) ((bits) << 16)
+
+/*
+ * Start LED very early so user knows device is on. Set color
+ * to red.
+ */
+void spl_board_init(void)
+{
+ /* Set GPIO4_B4, GPIO4_B5, and GPIO4_B6 to output. */
+ writel(GPIO_WRITEMASK(GPIO_B6 | GPIO_B5 | GPIO_B4) | \
+ (GPIO_B6 | GPIO_B5 | GPIO_B4),
+ (GPIO4_BASE + GPIO_SWPORT_DDR_L));
+ /* Set GPIO4_B5 and GPIO4_B6 to 0 and GPIO4_B4 to 1. */
+ writel(GPIO_WRITEMASK(GPIO_B6 | GPIO_B5 | GPIO_B4) | GPIO_B4,
+ (GPIO4_BASE + GPIO_SWPORT_DR_L));
+}
+
+int rk_board_late_init(void)
+{
+ /* Turn off red LED and turn on orange LED. */
+
[PATCH v3] configs: rk3588-turing-rk1: disable SPI flash by default
While the Turing RK1 board has a pad on the PCB for SPI flash, it is
not populated at the factory: supporting SPI flash boot is a user
modification, not an out-of-the-box feature. The defconfig for this
board should therefore not be enabling the SPI flash image nor SPI
support in the SPL, as it causes confusion among downstream users as to
whether the SPI image needs to be distributed.
Fixes: 153ac950a599 ("board: rockchip: Add the Turing RK1 SoM")
Suggested-by: Florian Klink
Signed-off-by: Sam Edwards
Acked-by: Joshua Riek
Reviewed-by: Jonas Karlman
---
Changes v1->v2 (both requested by Jonas):
- Added back (i.e. made unremoved by patch) CONFIG_USB_GADGET_PRODUCT_NUM value
previously automatically removed by savedefconfig.
- Also disable SPI/SFC driver entirely until SPI/SFC lands in the DT (if ever).
Changes v2->v3:
- Rebased onto latest master for clean apply
---
configs/turing-rk1-rk3588_defconfig | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/configs/turing-rk1-rk3588_defconfig
b/configs/turing-rk1-rk3588_defconfig
index 038b14769e..39ef05477a 100644
--- a/configs/turing-rk1-rk3588_defconfig
+++ b/configs/turing-rk1-rk3588_defconfig
@@ -3,17 +3,12 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_SYS_HAS_NONCACHED_MEMORY=y
CONFIG_COUNTER_FREQUENCY=2400
CONFIG_ARCH_ROCKCHIP=y
-CONFIG_SF_DEFAULT_SPEED=2400
-CONFIG_SF_DEFAULT_MODE=0x2000
CONFIG_DEFAULT_DEVICE_TREE="rk3588-turing-rk1"
CONFIG_ROCKCHIP_RK3588=y
-CONFIG_ROCKCHIP_SPI_IMAGE=y
CONFIG_SPL_SERIAL=y
CONFIG_TARGET_TURINGRK1_RK3588=y
CONFIG_DEBUG_UART_BASE=0xFEBC
CONFIG_DEBUG_UART_CLOCK=2400
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
CONFIG_SYS_LOAD_ADDR=0xc00800
CONFIG_PCI=y
CONFIG_DEBUG_UART=y
@@ -29,8 +24,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x4
CONFIG_SPL_PAD_TO=0x7f8000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x6
CONFIG_SPL_ATF=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_GPT=y
@@ -64,11 +57,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
-CONFIG_SF_DEFAULT_BUS=5
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_XMC=y
-CONFIG_SPI_FLASH_XTX=y
+# CONFIG_SPI_FLASH is not set
CONFIG_PHY_REALTEK=y
CONFIG_DWC_ETH_QOS=y
CONFIG_DWC_ETH_QOS_ROCKCHIP=y
@@ -84,7 +73,6 @@ CONFIG_SPL_RAM=y
CONFIG_SCSI=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
-CONFIG_ROCKCHIP_SFC=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
--
2.43.2
Re: [PATCH 2/2] board: rockchip: rgxx3: Use sdmmc0 as first device
Hi Chris,
On 2024-05-02 21:34, Chris Morgan wrote:
> From: Chris Morgan
>
> Some of the rgxx3 devices do not have a way to recover from a poor
> flash of a bootloader to eMMC. Set the device to always attempt to boot
> from sdmmc0 first which ensures that we can override the boot from
> emmc if we have a card present with a valid U-Boot stage.
I would expect that after [1] was merged in v2024.07-rc1 the likelihood
of booting a bad/poor flash (where FIT checksum is invalid) have been
mitigated and the boot process now fall back to loading FIT from SD-card?
Or is it to protect against flashing a FIT containing a non working
U-Boot proper that this tries to protect against?
Also sdmmc1 seem to be missing from SPL control FDT so that could also
impact fallback logic in SPL. Following nodes should be added to
rk3566-anbernic-rgxx3-u-boot.dtsi:
{
bootph-pre-ram;
bootph-some-ram;
};
_bus4 {
bootph-pre-ram;
bootph-some-ram;
};
_clk {
bootph-pre-ram;
bootph-some-ram;
};
_cmd {
bootph-pre-ram;
bootph-some-ram;
};
_det {
bootph-pre-ram;
bootph-some-ram;
};
[1]
https://source.denx.de/u-boot/u-boot/-/commit/61177bead95d366d3155722eb52db8077829579c
Regards,
Jonas
>
> Signed-off-by: Chris Morgan
> ---
> arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
> b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
> index 793ed4ae8a..18f540a3a2 100644
> --- a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
> +++ b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
> @@ -4,7 +4,7 @@
>
> / {
> chosen {
> - u-boot,spl-boot-order = "same-as-spl", ,
> + u-boot,spl-boot-order = , ,
> };
> };
>
[PATCH 2/2] board: rockchip: rgxx3: Use sdmmc0 as first device
From: Chris Morgan
Some of the rgxx3 devices do not have a way to recover from a poor
flash of a bootloader to eMMC. Set the device to always attempt to boot
from sdmmc0 first which ensures that we can override the boot from
emmc if we have a card present with a valid U-Boot stage.
Signed-off-by: Chris Morgan
---
arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
index 793ed4ae8a..18f540a3a2 100644
--- a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi
@@ -4,7 +4,7 @@
/ {
chosen {
- u-boot,spl-boot-order = "same-as-spl", ,
+ u-boot,spl-boot-order = , ,
};
};
--
2.34.1
[PATCH 1/2] Revert "board: rockchip: Add early ADC button detect for RGxx3"
From: Chris Morgan
This reverts commit 41a60d0e5cef54a59596a58940fa7c9cf071034b.
On some of the supported devices the adc detect code always returns
that the button has been pushed, and as a result the device will
not boot normally.
Signed-off-by: Chris Morgan
---
board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 64 --
1 file changed, 64 deletions(-)
diff --git a/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c
b/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c
index 099eea60c3..5c57b902d1 100644
--- a/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c
+++ b/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c
@@ -6,14 +6,12 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -21,8 +19,6 @@
#include
#include
-#define BOOT_BROM_DOWNLOAD 0xef08a53c
-
#define GPIO0_BASE 0xfdd6
#define GPIO4_BASE 0xfe77
#define GPIO_SWPORT_DR_L 0x
@@ -36,14 +32,6 @@
#define GPIO_WRITEMASK(bits) ((bits) << 16)
-#define SARADC_BASE0xfe72
-#define SARADC_DATA0x
-#define SARADC_STAS0x0004
-#define SARADC_ADC_STATUS BIT(0)
-#define SARADC_CTRL0x0008
-#define SARADC_INPUT_SRC_MSK 0x7
-#define SARADC_POWER_CTRL BIT(3)
-
#define DTB_DIR"rockchip/"
struct rg3xx_model {
@@ -169,64 +157,12 @@ static const struct rg353_panel rg353_panel_details[] = {
},
};
-/*
- * The device has internal eMMC, and while some devices have an exposed
- * clk pin you can ground to force a bypass not all devices do. As a
- * result it may be possible for some devices to become a perma-brick
- * if a corrupted TPL or SPL stage with a valid header is flashed to
- * the internal eMMC. Add functionality to read ADC channel 0 (the func
- * button) as early as possible in the boot process to provide some
- * protection against this. If we ever get an open TPL stage, we should
- * consider moving this function there.
- */
-void read_func_button(void)
-{
- int ret;
- u32 reg;
-
- /* Turn off SARADC to reset it. */
- writel(0, (SARADC_BASE + SARADC_CTRL));
-
- /* Enable channel 0 and power on SARADC. */
- writel(((0 & SARADC_INPUT_SRC_MSK) | SARADC_POWER_CTRL),
- (SARADC_BASE + SARADC_CTRL));
-
- /*
-* Wait for data to be ready. Use timeout of 2us from
-* rockchip_saradc driver.
-*/
- ret = readl_poll_timeout((SARADC_BASE + SARADC_STAS), reg,
-!(reg & SARADC_ADC_STATUS), 2);
- if (ret) {
- printf("ADC Timeout");
- return;
- }
-
- /* Read the data from the SARADC. */
- reg = readl((SARADC_BASE + SARADC_DATA));
-
- /* Turn the SARADC back off so it's ready to be used again. */
- writel(0, (SARADC_BASE + SARADC_CTRL));
-
- /*
-* If the value is less than 30 the button is being pressed.
-* Reset the device back into Rockchip download mode.
-*/
- if (reg <= 30) {
- printf("download key pressed, entering download mode...");
- writel(BOOT_BROM_DOWNLOAD, CONFIG_ROCKCHIP_BOOT_MODE_REG);
- do_reset(NULL, 0, 0, NULL);
- }
-};
-
/*
* Start LED very early so user knows device is on. Set color
* to red.
*/
void spl_board_init(void)
{
- read_func_button();
-
/* Set GPIO0_C5, GPIO0_C6, and GPIO0_C7 to output. */
writel(GPIO_WRITEMASK(GPIO_C7 | GPIO_C6 | GPIO_C5) | \
(GPIO_C7 | GPIO_C6 | GPIO_C5),
--
2.34.1
[PATCH 0/2] RGXX3: Set boot order for mmc0 first
From: Chris Morgan Set the rgxx3 device to boot from mmc0 first. This serves as a fallback to allow us to recover from a bad U-Boot (or later) stage in a worst case scenario. The code for an ADC button appears to have broke some board revisions; this solution is much simpler and allows users to continue to program the adc button as they see fit. Chris Morgan (2): Revert "board: rockchip: Add early ADC button detect for RGxx3" board: rockchip: rgxx3: Use sdmmc0 as first device .../arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 2 +- board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c| 64 --- 2 files changed, 1 insertion(+), 65 deletions(-) -- 2.34.1
[PATCH V2] board: rockchip: Add Indiedroid Nova
From: Chris Morgan
The Indiedroid Nova is a Rockchip RK3588S based SBC from Indiedroid.
Specifications:
Rockchip RK3588S SoC
4x ARM Cortex-A76, 4x ARM Cortex-A55
4/8/16GB memory LPDDR4x
Mali G610MC4 GPU
Optional eMMC
2x USB 2.0, 2x USB 3.0, 1x USB 3.0 C port with DP Alt
1x MIPI-CSI Port (4-lane or 2x 2-lane)
1x MIPI-DSI 4-lane connector
1x Micro HDMI 2.1 output, 1x DP 1.4 output
Gigabit Ethernet
Realtek RTL8821CS WiFi
4 pin debug UART connector
40 pin GPIO header
Size: 85mm x 56mm (Raspberry Pi Form Factor)
Kernel commit:
3900160e164b ("arm64: dts: rockchip: Add Indiedroid Nova board")
Signed-off-by: Chris Morgan
---
Changes since V1:
- Refactored to use the upstream Linux device tree now that that is
an option.
- Added board to doc/board/rockchip/rockchip.rst.
---
arch/arm/mach-rockchip/rk3588/Kconfig | 10
board/indiedroid/nova/Kconfig | 12 +
board/indiedroid/nova/MAINTAINERS | 6 +++
configs/nova-rk3588s_defconfig| 70 +++
doc/board/rockchip/rockchip.rst | 1 +
include/configs/nova-rk3588s.h| 15 ++
6 files changed, 114 insertions(+)
create mode 100644 board/indiedroid/nova/Kconfig
create mode 100644 board/indiedroid/nova/MAINTAINERS
create mode 100644 configs/nova-rk3588s_defconfig
create mode 100644 include/configs/nova-rk3588s.h
diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig
b/arch/arm/mach-rockchip/rk3588/Kconfig
index 39049ab35a..820e979abb 100644
--- a/arch/arm/mach-rockchip/rk3588/Kconfig
+++ b/arch/arm/mach-rockchip/rk3588/Kconfig
@@ -78,6 +78,15 @@ config TARGET_NANOPCT6_RK3588
Power: 5.5*2.1mm DC Jack, 12VDC input
Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case)
+config TARGET_NOVA_RK3588
+ bool "Indiedroid Nova RK3588"
+ select BOARD_LATE_INIT
+ help
+ Indiedroid Nova is a Rockchip RK3588s based SBC by Indiedroid.
+ It comes in configurations from 4GB of RAM to 16GB of RAM,
+ includes socket for eMMC storage, an SDMMC slot, and a 40-pin
+ GPIO header for expansion.
+
config TARGET_RK3588_NEU6
bool "Edgeble Neural Compute Module 6(Neu6) SoM"
select BOARD_LATE_INIT
@@ -223,6 +232,7 @@ config TEXT_BASE
source "board/edgeble/neural-compute-module-6/Kconfig"
source "board/friendlyelec/nanopc-t6-rk3588/Kconfig"
+source "board/indiedroid/nova/Kconfig"
source "board/pine64/quartzpro64-rk3588/Kconfig"
source "board/turing/turing-rk1-rk3588/Kconfig"
source "board/radxa/rock5a-rk3588s/Kconfig"
diff --git a/board/indiedroid/nova/Kconfig b/board/indiedroid/nova/Kconfig
new file mode 100644
index 00..271d15a0ed
--- /dev/null
+++ b/board/indiedroid/nova/Kconfig
@@ -0,0 +1,12 @@
+if TARGET_NOVA_RK3588
+
+config SYS_BOARD
+ default "nova-rk3588s"
+
+config SYS_VENDOR
+ default "indiedroid"
+
+config SYS_CONFIG_NAME
+ default "nova-rk3588s"
+
+endif
diff --git a/board/indiedroid/nova/MAINTAINERS
b/board/indiedroid/nova/MAINTAINERS
new file mode 100644
index 00..9c56d01bf0
--- /dev/null
+++ b/board/indiedroid/nova/MAINTAINERS
@@ -0,0 +1,6 @@
+INDIEDROID-NOVA-RK3588
+M: Chris Morgan
+S: Maintained
+F: board/indiedroid/nova
+F: include/configs/nova-rk3588s.h
+F: configs/indiedroid-nova-rk3588_defconfig
diff --git a/configs/nova-rk3588s_defconfig b/configs/nova-rk3588s_defconfig
new file mode 100644
index 00..231831fb55
--- /dev/null
+++ b/configs/nova-rk3588s_defconfig
@@ -0,0 +1,70 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=2400
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-indiedroid-nova"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_SPL_SERIAL=y
+CONFIG_TARGET_NOVA_RK3588=y
+CONFIG_DEBUG_UART_BASE=0xFEB5
+CONFIG_DEBUG_UART_CLOCK=2400
+CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_PCI=y
+CONFIG_DEBUG_UART=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SPL_MAX_SIZE=0x4
+CONFIG_SPL_PAD_TO=0x7f8000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_SPL_ATF=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_UPSTREAM=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks
assigned-clock-rates assigned-clock-parents"
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SPL_SYSCON=y
+CONFIG_SPL_CLK=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
Re: [PATCH] mmc: sdhci: Correct ADMA_DESC_LEN to 12
On Wed, May 01, 2024 at 08:53:04PM +0200, A. Sverdlin wrote:
> From: Alexander Sverdlin
>
> Commit 37cb626da25d0d ("mmc: sdhci: Add Support for ADMA2") introduced
> ADMA_DESC_LEN == 16 (64 bit case), but it was never used before commit
> 74755c1fed1b0 ("mmc: sdhci: introduce adma_write_desc() hook to struct
> sdhci_ops").
>
> "sizeof(struct sdhci_adma_desc)" (== 12 for 64bit case) was used instead.
>
> Confusion probably originates from Linux commit 685e444bbaa0
> ("mmc: sdhci: Add ADMA2 64-bit addressing support for V4 mode"), but
> the latter "V4 mode" was never ported to U-Boot.
>
> Fixes: 74755c1fed1b0 ("mmc: sdhci: introduce adma_write_desc() hook to struct
> sdhci_ops")
> Signed-off-by: Alexander Sverdlin
Applied to u-boot/master, thanks!
--
Tom
signature.asc
Description: PGP signature
Re: [PATCH 0/2] qcom: ehci: enable core + iface clocks
On Thu, May 2, 2024 at 3:41 PM Caleb Connolly wrote: > > Hi Sam, > > On 02/05/2024 15:16, Sam Day wrote: > > These clocks are mandatory, as can be seen in msm_hsusb driver in the > > Linux kernel. > > > > The appropriate HS_USB AHB/SYSTEM clocks were added to gcc_apq8016. > > > > Technically there's other adjacent SoC families that can use the > > msm_hsusb driver with different clocks, but only msm8916/apq8016 are > > currently making use of it so I think this change shouldn't break > > anything elsewhere. > > Thanks for the patches. I have a feeling this might break IPQ4019, you > might need to stub the clks there (cc Robert). Hi, IPQ4019 does not use ehci-msm, but rather DWC3 so it should be fine. Regards, Robert > > Seems like the To: and Cc: addresses aren't all quite right still. > > > > Signed-off-by: Sam Day > > --- > > Sam Day (2): > >clk/qcom: apq8016: add support for USB_HS clocks > >ehci: msm: bring up iface + core clocks > > > > drivers/clk/qcom/clock-apq8016.c | 31 +++ > > drivers/usb/host/ehci-msm.c | 37 > > +++-- > > 2 files changed, 66 insertions(+), 2 deletions(-) > > --- > > base-commit: ff0de1f0557ed7d2dab47ba976a37347a1fdc432 > > change-id: 20240502-msm8916-hs-usb-clocks-34bc22b03f3d > > > > Best regards, > > -- > // Caleb (they/them) -- Robert Marko Staff Embedded Linux Engineer Sartura Ltd. Lendavska ulica 16a 1 Zagreb, Croatia Email: robert.ma...@sartura.hr Web: www.sartura.hr
Re: [PATCH 73/81] usb: Remove and add needed includes
On Thu, May 02, 2024 at 09:40:52AM +0200, Mattijs Korpershoek wrote: > Hi Tom, > > Thank you for the patch > > On mer., mai 01, 2024 at 19:31, Tom Rini wrote: > > > Remove from this driver directory and when needed > > add missing include files directly. > > > > Signed-off-by: Tom Rini > > [...] > > > diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c > > index fedcf7869295..38c5928faed5 100644 > > --- a/drivers/usb/host/xhci-rcar.c > > +++ b/drivers/usb/host/xhci-rcar.c > > @@ -5,7 +5,6 @@ > > * Renesas RCar USB HOST xHCI Controller > > */ > > > > -#include > > #include > > #include > > #include > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > > index 910c5f3352b8..1360a5940fa0 100644 > > --- a/drivers/usb/host/xhci-ring.c > > +++ b/drivers/usb/host/xhci-ring.c > > @@ -13,7 +13,6 @@ > > * Vikas Sajjan > > */ > > > > -#include > > This generates the following build warning with > khadas-vim3_android_defconfig: > > drivers/usb/host/xhci-ring.c: In function 'xhci_wait_for_event': > drivers/usb/host/xhci-ring.c:464:28: warning: implicit declaration of > function 'get_timer'; did you mean 'get_mem'? > [-Wimplicit-function-declaration] > 464 | unsigned long ts = get_timer(0); > |^ > |get_mem > > Adding: "#include " fixes the warning. > > With the above fix included: > > Reviewed-by: Mattijs Korpershoek Did you have the full series applied? I don't see the warning here (nor in CI) and I suspect that: https://patchwork.ozlabs.org/project/uboot/patch/20240502013138.2383421-9-tr...@konsulko.com/ is what resolves this warning. -- Tom signature.asc Description: PGP signature
Re: [PATCH 25/81] dfu: Remove and add needed includes
On Thu, May 02, 2024 at 09:28:03AM +0200, Mattijs Korpershoek wrote: > Hi Tom, > > Thank you for the patch. > > On mer., mai 01, 2024 at 19:30, Tom Rini wrote: > > > Remove from this driver directory and when needed > > add missing include files directly. > > > > Signed-off-by: Tom Rini > > Reviewed-by: Mattijs Korpershoek > > Since this is quite a big series, I'm assuming you will pick it up > yourself. > > If it's expected of me to pick this up through u-boot-dfu, let me know. Yes, I plan to grab all 4 of the series once I open the next branch. -- Tom signature.asc Description: PGP signature
Re: [GIT PULL] u-boot-riscv/master
On Thu, May 02, 2024 at 12:38:11AM +0800, Leo Liang wrote: > Hi Tom, > > The following changes since commit ff0de1f0557ed7d2dab47ba976a37347a1fdc432: > > Merge patch series "Update PHYTEC SOM Detection" (2024-04-29 10:56:05 -0600) > > are available in the Git repository at: > > https://source.denx.de/u-boot/custodians/u-boot-riscv.git > > for you to fetch changes up to 19b762cf83f68b9d9a1f14e75d75781cedf4049f: > > board: starfive: Rename spl_soc_init() to spl_dram_init() (2024-05-02 > 00:01:18 +0800) > > CI result shows no issue: > https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/20596 Applied to u-boot/master, thanks! -- Tom signature.asc Description: PGP signature
Re: Pull request efi-2024-07-rc2
On Wed, May 01, 2024 at 11:14:27AM +0200, Heinrich Schuchardt wrote: > Dear Tom, > > The following changes since commit ff0de1f0557ed7d2dab47ba976a37347a1fdc432: > > Merge patch series "Update PHYTEC SOM Detection" (2024-04-29 10:56:05 > -0600) > > are available in the Git repository at: > > https://source.denx.de/u-boot/custodians/u-boot-efi.git > tags/efi-2024-07-rc2 > > for you to fetch changes up to 8745f13fe102968f58a9e2e5f69ad153a675b59c: > > efi_loader: pass GUID by address to efi_dp_from_lo (2024-05-01 > 08:40:42 +0200) > > Gitlab CI showed no issues: > https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/20590 > Applied to u-boot/master, thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCH] mmc: sdhci: Correct ADMA_DESC_LEN to 12
Hi,
On 5/1/24 1:53 PM, A. Sverdlin wrote:
From: Alexander Sverdlin
Commit 37cb626da25d0d ("mmc: sdhci: Add Support for ADMA2") introduced
ADMA_DESC_LEN == 16 (64 bit case), but it was never used before commit
74755c1fed1b0 ("mmc: sdhci: introduce adma_write_desc() hook to struct
sdhci_ops").
"sizeof(struct sdhci_adma_desc)" (== 12 for 64bit case) was used instead.
Confusion probably originates from Linux commit 685e444bbaa0
("mmc: sdhci: Add ADMA2 64-bit addressing support for V4 mode"), but
the latter "V4 mode" was never ported to U-Boot.
Fixes: 74755c1fed1b0 ("mmc: sdhci: introduce adma_write_desc() hook to struct
sdhci_ops")
Signed-off-by: Alexander Sverdlin
---
include/sdhci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/sdhci.h b/include/sdhci.h
index d73a725609be3..810ef56e4be66 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -300,7 +300,7 @@ struct sdhci_ops {
#define ADMA_MAX_LEN 65532
#ifdef CONFIG_DMA_ADDR_T_64BIT
-#define ADMA_DESC_LEN 16
+#define ADMA_DESC_LEN 12
#else
#define ADMA_DESC_LEN 8
#endif
on TI AM62 platform:
Tested-by: Judith Mendez
Re: [GIT PULL] Please pull u-boot-mmc master
Hi Greg, On 5/1/24 9:40 PM, Greg Malysa wrote: On Tue, Apr 30, 2024 at 3:42 AM Francesco Dolcini wrote: On Mon, Apr 29, 2024 at 03:39:53PM -0500, Judith Mendez wrote: A patch in this series caused a regression for AM62x SK with the following error: +1, this affects also Verdin AM62. Hi, please try https://patchwork.ozlabs.org/project/uboot/patch/20240501185331.1189647-1-alexander.sverd...@siemens.com/ as this should explain the issue and also fix it. The fix fixes my issuu on AM62x, thanks. ~ Judith
Re: [PATCH 0/2] qcom: ehci: enable core + iface clocks
Hi Sam, On 02/05/2024 15:16, Sam Day wrote: These clocks are mandatory, as can be seen in msm_hsusb driver in the Linux kernel. The appropriate HS_USB AHB/SYSTEM clocks were added to gcc_apq8016. Technically there's other adjacent SoC families that can use the msm_hsusb driver with different clocks, but only msm8916/apq8016 are currently making use of it so I think this change shouldn't break anything elsewhere. Thanks for the patches. I have a feeling this might break IPQ4019, you might need to stub the clks there (cc Robert). Seems like the To: and Cc: addresses aren't all quite right still. Signed-off-by: Sam Day --- Sam Day (2): clk/qcom: apq8016: add support for USB_HS clocks ehci: msm: bring up iface + core clocks drivers/clk/qcom/clock-apq8016.c | 31 +++ drivers/usb/host/ehci-msm.c | 37 +++-- 2 files changed, 66 insertions(+), 2 deletions(-) --- base-commit: ff0de1f0557ed7d2dab47ba976a37347a1fdc432 change-id: 20240502-msm8916-hs-usb-clocks-34bc22b03f3d Best regards, -- // Caleb (they/them)
Re: [PATCH 2/2] ehci: msm: bring up iface + core clocks
On 02/05/2024 15:16, Sam Day wrote:
This seems to be necessary on my samsung-a5. Without this patch, the
first access of EHCI registers causes a bus stall and subsequent reset.
I am unsure why this wasn't already necessary for db410c, perhaps those
clocks are already enabled on boot.
Signed-off-by: Sam Day
---
drivers/usb/host/ehci-msm.c | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 98fe7bc3bc..b2e294dd64 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -7,8 +7,10 @@
* Based on Linux driver
*/
+#include
#include
#include
+#include
#include
#include
#include
@@ -25,6 +27,8 @@ struct msm_ehci_priv {
struct usb_ehci *ehci; /* Start of IP core*/
struct ulpi_viewport ulpi_vp; /* ULPI Viewport */
struct phy phy;
+ struct clk iface_clk;
+ struct clk core_clk;
You could simplify this with the bulk clock API, but I'm easy either way.
Reviewed-by: Caleb Connolly
};
static int msm_init_after_reset(struct ehci_ctrl *dev)
@@ -53,20 +57,46 @@ static int ehci_usb_probe(struct udevice *dev)
struct ehci_hcor *hcor;
int ret;
+ ret = clk_get_by_name(dev, "core", >core_clk);
+ if (ret) {
+ dev_err(dev, "Failed to get core clock: %d\n", ret);
+ return ret;
+ }
+
+ ret = clk_get_by_name(dev, "iface", >iface_clk);
+ if (ret) {
+ dev_err(dev, "Failed to get iface clock: %d\n", ret);
+ return ret;
+ }
+
+ ret = clk_prepare_enable(>core_clk);
+ if (ret)
+ return ret;
+
+ ret = clk_prepare_enable(>iface_clk);
+ if (ret)
+ goto cleanup_core;
+
hccr = (struct ehci_hccr *)((phys_addr_t)>caplength);
hcor = (struct ehci_hcor *)((phys_addr_t)hccr +
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
ret = generic_setup_phy(dev, >phy, 0);
if (ret)
- return ret;
+ goto cleanup_iface;
ret = board_usb_init(0, plat->init_type);
if (ret < 0)
- return ret;
+ goto cleanup_iface;
return ehci_register(dev, hccr, hcor, _ehci_ops, 0,
plat->init_type);
+
+cleanup_iface:
+ clk_disable_unprepare(>iface_clk);
+cleanup_core:
+ clk_disable_unprepare(>core_clk);
+ return ret;
}
static int ehci_usb_remove(struct udevice *dev)
@@ -82,6 +112,9 @@ static int ehci_usb_remove(struct udevice *dev)
/* Stop controller. */
clrbits_le32(>usbcmd, CMD_RUN);
+ clk_disable_unprepare(>iface_clk);
+ clk_disable_unprepare(>core_clk);
+
ret = generic_shutdown_phy(>phy);
if (ret)
return ret;
--
// Caleb (they/them)
Re: [PATCH 1/2] clk/qcom: apq8016: add support for USB_HS clocks
On 02/05/2024 15:16, Sam Day wrote:
The newer "register map for simple gate clocks" support added for qcom
clocks is used. As a result gcc_apq8016 now has a mixture of the old and
new styles. I didn't (and still don't!) feel comfortable enough in this
area to update the existing code.
Some groundwork was also laid to dump the state of these gate clocks
with the recently-added qcom dump callbacks.
I'm not sure which part of the patch you're referring to, but the dump
callbacks aren't in upstream yet.
Signed-off-by: Sam Day
---
drivers/clk/qcom/clock-apq8016.c | 31 +++
1 file changed, 31 insertions(+)
diff --git a/drivers/clk/qcom/clock-apq8016.c b/drivers/clk/qcom/clock-apq8016.c
index d3b63b9c1a..745371a289 100644
--- a/drivers/clk/qcom/clock-apq8016.c
+++ b/drivers/clk/qcom/clock-apq8016.c
@@ -17,6 +17,8 @@
#include "clock-qcom.h"
+#define USB_HS_SYSTEM_CLK_CMD_RCGR 0x41010
+
/* Clocks: (from CLK_CTL_BASE) */
#define GPLL0_STATUS (0x2101C)
#define APCS_GPLL_ENA_VOTE(0x45000)
@@ -39,6 +41,11 @@
/* GPLL0 clock control registers */
#define GPLL0_STATUS_ACTIVE BIT(17)
+static const struct freq_tbl ftbl_gcc_usb_hs_system_clk[] = {
+ F(8000, CFG_CLK_SRC_GPLL0, 10, 0, 0),
Since this is just one entry, it probably makes more sense to just put
the literal values in the clk_rcg_set_rate_mnd(). This makes it clear
that there's only one actual frequency, and we have the kernel for
reference anyway.
+ { }
+};
+
static struct pll_vote_clk gpll0_vote_clk = {
.status = GPLL0_STATUS,
.status_bit = GPLL0_STATUS_ACTIVE,
@@ -52,6 +59,11 @@ static struct vote_clk gcc_blsp1_ahb_clk = {
.vote_bit = BIT(10),
};
+static const struct gate_clk apq8016_clks[] = {
Please define the size of this array, or add a bounds check in
apq8016_clk_enable() (I know this is missing for some of the other drivers).
+ GATE_CLK(GCC_USB_HS_AHB_CLK,0x41008, 0x0001),
+ GATE_CLK(GCC_USB_HS_SYSTEM_CLK, 0x41004, 0x0001),
+};
+
/* SDHCI */
static int apq8016_clk_init_sdc(struct msm_clk_priv *priv, int slot, uint
rate)
{
@@ -106,6 +118,7 @@ int apq8016_clk_init_uart(phys_addr_t base, unsigned long
id)
static ulong apq8016_clk_set_rate(struct clk *clk, ulong rate)
{
+ const struct freq_tbl *freq;
struct msm_clk_priv *priv = dev_get_priv(clk->dev);
switch (clk->id) {
@@ -117,13 +130,31 @@ static ulong apq8016_clk_set_rate(struct clk *clk, ulong
rate)
case GCC_BLSP1_UART2_APPS_CLK: /* UART2 */
apq8016_clk_init_uart(priv->base, clk->id);
return 7372800;
+ case GCC_USB_HS_SYSTEM_CLK:
+ freq = qcom_find_freq(ftbl_gcc_usb_hs_system_clk, rate);
As there is only one valid "rate" for this clock, I would be in favour
of a log_warn() if the rate is wrong (it should be 8000).
Thanks and regards,
+ clk_rcg_set_rate_mnd(priv->base, USB_HS_SYSTEM_CLK_CMD_RCGR,
+freq->pre_div, freq->m, freq->n,
freq->src, 0);
+ return freq->freq;
default:
return 0;
}
}
+static int apq8016_clk_enable(struct clk *clk)
+{
+ struct msm_clk_priv *priv = dev_get_priv(clk->dev);
+
+ debug("%s: clk %s\n", __func__, apq8016_clks[clk->id].name);
+ qcom_gate_clk_en(priv, clk->id);
+
+ return 0;
+}
+
static struct msm_clk_data apq8016_clk_data = {
.set_rate = apq8016_clk_set_rate,
+ .clks = apq8016_clks,
+ .num_clks = ARRAY_SIZE(apq8016_clks),
+ .enable = apq8016_clk_enable,
};
static const struct udevice_id gcc_apq8016_of_match[] = {
--
// Caleb (they/them)
Re: Use header file from external library in u-boot
On 02.05.2024 08:57, Johannes Kirchmair - SKIDATA wrote: Dear u-boot folks, we are trying to share some information between u-boot and a Linux user space tool. For this we place some information in a FRAM. This information is just some numeric values, indicating some wanted behaviour. I thought of using a header file to keep these values aligned between the user space tool and u-boot. This header is provided by a library. Including it into the user space tool is straight forward, but into u-boot does seem complicated, as the build system is not meant to include external libraries. Is there a preferred way to do this kind of alignment or a suggestion on how to handle this? Best regards Johannes How about writing it into the linux device-tree. 'bootstage' does this in the same way if I remember correctly.
Re: Use header file from external library in u-boot
Hi Johannes, On Thu, May 2, 2024 at 10:18 AM Johannes Kirchmair - SKIDATA wrote: > > Dear u-boot folks, > > we are trying to share some information between u-boot and a Linux user space > tool. For this we place some information in a FRAM. This information is just > some numeric values, indicating some wanted behaviour. I thought of using a > header file to keep these values aligned between the user space tool and > u-boot. This header is provided by a library. Including it into the user > space tool is straight forward, but into u-boot does seem complicated, as the > build system is not meant to include external libraries. Is there a preferred > way to do this kind of alignment or a suggestion on how to handle this? Would libubootenv work for you? https://github.com/sbabic/libubootenv
[PATCH 1/2] clk/qcom: apq8016: add support for USB_HS clocks
The newer "register map for simple gate clocks" support added for qcom
clocks is used. As a result gcc_apq8016 now has a mixture of the old and
new styles. I didn't (and still don't!) feel comfortable enough in this
area to update the existing code.
Some groundwork was also laid to dump the state of these gate clocks
with the recently-added qcom dump callbacks.
Signed-off-by: Sam Day
---
drivers/clk/qcom/clock-apq8016.c | 31 +++
1 file changed, 31 insertions(+)
diff --git a/drivers/clk/qcom/clock-apq8016.c b/drivers/clk/qcom/clock-apq8016.c
index d3b63b9c1a..745371a289 100644
--- a/drivers/clk/qcom/clock-apq8016.c
+++ b/drivers/clk/qcom/clock-apq8016.c
@@ -17,6 +17,8 @@
#include "clock-qcom.h"
+#define USB_HS_SYSTEM_CLK_CMD_RCGR 0x41010
+
/* Clocks: (from CLK_CTL_BASE) */
#define GPLL0_STATUS (0x2101C)
#define APCS_GPLL_ENA_VOTE (0x45000)
@@ -39,6 +41,11 @@
/* GPLL0 clock control registers */
#define GPLL0_STATUS_ACTIVE BIT(17)
+static const struct freq_tbl ftbl_gcc_usb_hs_system_clk[] = {
+ F(8000, CFG_CLK_SRC_GPLL0, 10, 0, 0),
+ { }
+};
+
static struct pll_vote_clk gpll0_vote_clk = {
.status = GPLL0_STATUS,
.status_bit = GPLL0_STATUS_ACTIVE,
@@ -52,6 +59,11 @@ static struct vote_clk gcc_blsp1_ahb_clk = {
.vote_bit = BIT(10),
};
+static const struct gate_clk apq8016_clks[] = {
+ GATE_CLK(GCC_USB_HS_AHB_CLK,0x41008, 0x0001),
+ GATE_CLK(GCC_USB_HS_SYSTEM_CLK, 0x41004, 0x0001),
+};
+
/* SDHCI */
static int apq8016_clk_init_sdc(struct msm_clk_priv *priv, int slot, uint rate)
{
@@ -106,6 +118,7 @@ int apq8016_clk_init_uart(phys_addr_t base, unsigned long
id)
static ulong apq8016_clk_set_rate(struct clk *clk, ulong rate)
{
+ const struct freq_tbl *freq;
struct msm_clk_priv *priv = dev_get_priv(clk->dev);
switch (clk->id) {
@@ -117,13 +130,31 @@ static ulong apq8016_clk_set_rate(struct clk *clk, ulong
rate)
case GCC_BLSP1_UART2_APPS_CLK: /* UART2 */
apq8016_clk_init_uart(priv->base, clk->id);
return 7372800;
+ case GCC_USB_HS_SYSTEM_CLK:
+ freq = qcom_find_freq(ftbl_gcc_usb_hs_system_clk, rate);
+ clk_rcg_set_rate_mnd(priv->base, USB_HS_SYSTEM_CLK_CMD_RCGR,
+freq->pre_div, freq->m, freq->n,
freq->src, 0);
+ return freq->freq;
default:
return 0;
}
}
+static int apq8016_clk_enable(struct clk *clk)
+{
+ struct msm_clk_priv *priv = dev_get_priv(clk->dev);
+
+ debug("%s: clk %s\n", __func__, apq8016_clks[clk->id].name);
+ qcom_gate_clk_en(priv, clk->id);
+
+ return 0;
+}
+
static struct msm_clk_data apq8016_clk_data = {
.set_rate = apq8016_clk_set_rate,
+ .clks = apq8016_clks,
+ .num_clks = ARRAY_SIZE(apq8016_clks),
+ .enable = apq8016_clk_enable,
};
static const struct udevice_id gcc_apq8016_of_match[] = {
--
2.44.0
[PATCH 2/2] ehci: msm: bring up iface + core clocks
This seems to be necessary on my samsung-a5. Without this patch, the
first access of EHCI registers causes a bus stall and subsequent reset.
I am unsure why this wasn't already necessary for db410c, perhaps those
clocks are already enabled on boot.
Signed-off-by: Sam Day
---
drivers/usb/host/ehci-msm.c | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 98fe7bc3bc..b2e294dd64 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -7,8 +7,10 @@
* Based on Linux driver
*/
+#include
#include
#include
+#include
#include
#include
#include
@@ -25,6 +27,8 @@ struct msm_ehci_priv {
struct usb_ehci *ehci; /* Start of IP core*/
struct ulpi_viewport ulpi_vp; /* ULPI Viewport */
struct phy phy;
+ struct clk iface_clk;
+ struct clk core_clk;
};
static int msm_init_after_reset(struct ehci_ctrl *dev)
@@ -53,20 +57,46 @@ static int ehci_usb_probe(struct udevice *dev)
struct ehci_hcor *hcor;
int ret;
+ ret = clk_get_by_name(dev, "core", >core_clk);
+ if (ret) {
+ dev_err(dev, "Failed to get core clock: %d\n", ret);
+ return ret;
+ }
+
+ ret = clk_get_by_name(dev, "iface", >iface_clk);
+ if (ret) {
+ dev_err(dev, "Failed to get iface clock: %d\n", ret);
+ return ret;
+ }
+
+ ret = clk_prepare_enable(>core_clk);
+ if (ret)
+ return ret;
+
+ ret = clk_prepare_enable(>iface_clk);
+ if (ret)
+ goto cleanup_core;
+
hccr = (struct ehci_hccr *)((phys_addr_t)>caplength);
hcor = (struct ehci_hcor *)((phys_addr_t)hccr +
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
ret = generic_setup_phy(dev, >phy, 0);
if (ret)
- return ret;
+ goto cleanup_iface;
ret = board_usb_init(0, plat->init_type);
if (ret < 0)
- return ret;
+ goto cleanup_iface;
return ehci_register(dev, hccr, hcor, _ehci_ops, 0,
plat->init_type);
+
+cleanup_iface:
+ clk_disable_unprepare(>iface_clk);
+cleanup_core:
+ clk_disable_unprepare(>core_clk);
+ return ret;
}
static int ehci_usb_remove(struct udevice *dev)
@@ -82,6 +112,9 @@ static int ehci_usb_remove(struct udevice *dev)
/* Stop controller. */
clrbits_le32(>usbcmd, CMD_RUN);
+ clk_disable_unprepare(>iface_clk);
+ clk_disable_unprepare(>core_clk);
+
ret = generic_shutdown_phy(>phy);
if (ret)
return ret;
--
2.44.0
[PATCH 0/2] qcom: ehci: enable core + iface clocks
These clocks are mandatory, as can be seen in msm_hsusb driver in the Linux kernel. The appropriate HS_USB AHB/SYSTEM clocks were added to gcc_apq8016. Technically there's other adjacent SoC families that can use the msm_hsusb driver with different clocks, but only msm8916/apq8016 are currently making use of it so I think this change shouldn't break anything elsewhere. Signed-off-by: Sam Day --- Sam Day (2): clk/qcom: apq8016: add support for USB_HS clocks ehci: msm: bring up iface + core clocks drivers/clk/qcom/clock-apq8016.c | 31 +++ drivers/usb/host/ehci-msm.c | 37 +++-- 2 files changed, 66 insertions(+), 2 deletions(-) --- base-commit: ff0de1f0557ed7d2dab47ba976a37347a1fdc432 change-id: 20240502-msm8916-hs-usb-clocks-34bc22b03f3d Best regards, -- Sam Day
Re: [PATCH 60/81] serial: Remove and add needed includes
On Thu, 2 May 2024 at 02:33, Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Peter Robinson Looks good. > --- > Cc: Tom Rini > Cc: Simon Glass > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Alex Nemirovsky > Cc: Neil Armstrong > Cc: Caleb Connolly > Cc: Sumit Garg > Cc: This contributor prefers not to receive mails > Cc: Stefan Roese > Cc: Stefano Babic > Cc: Fabio Estevam > Cc: "NXP i.MX U-Boot Team" > Cc: Manivannan Sadhasivam > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Stefan Bosch > Cc: Sean Anderson > Cc: Patrice Chotard > Cc: Patrick Delaunay > Cc: Kunihiko Hayashi > Cc: Dai Okamura > Cc: Anastasiia Lukianenko > Cc: Oleksandr Andrushchenko > Cc: Michal Simek > Cc: Rasmus Villemoes > Cc: Marek Vasut > Cc: Venkatesh Yadav Abbarapu > Cc: Maksim Kiselev > Cc: Algapally Santosh Sagar > Cc: Heinrich Schuchardt > Cc: Bin Meng > Cc: Peng Fan > Cc: "Sébastien Szymanski" > Cc: Ye Li > Cc: Christophe Leroy > Cc: Weijie Gao > Cc: Sam Shih > Cc: Jim Liu > Cc: Lukasz Majewski > Cc: Yang Xiwen > --- > drivers/serial/altera_jtag_uart.c | 1 - > drivers/serial/altera_uart.c | 1 - > drivers/serial/arm_dcc.c | 1 - > drivers/serial/atmel_usart.c | 1 - > drivers/serial/ns16550.c | 2 +- > drivers/serial/sandbox.c | 1 - > drivers/serial/serial-uclass.c| 2 +- > drivers/serial/serial.c | 2 +- > drivers/serial/serial_ar933x.c| 1 - > drivers/serial/serial_arc.c | 1 - > drivers/serial/serial_bcm283x_mu.c| 1 - > drivers/serial/serial_bcm283x_pl011.c | 1 - > drivers/serial/serial_coreboot.c | 1 - > drivers/serial/serial_cortina.c | 1 - > drivers/serial/serial_efi.c | 1 - > drivers/serial/serial_htif.c | 1 - > drivers/serial/serial_intel_mid.c | 1 - > drivers/serial/serial_linflexuart.c | 1 - > drivers/serial/serial_lpuart.c| 1 - > drivers/serial/serial_mcf.c | 1 - > drivers/serial/serial_meson.c | 1 - > drivers/serial/serial_mpc8xx.c| 1 - > drivers/serial/serial_msm.c | 1 - > drivers/serial/serial_msm_geni.c | 1 - > drivers/serial/serial_mtk.c | 2 +- > drivers/serial/serial_mvebu_a3700.c | 1 - > drivers/serial/serial_mxc.c | 1 - > drivers/serial/serial_mxs.c | 1 - > drivers/serial/serial_npcm.c | 1 - > drivers/serial/serial_ns16550.c | 2 +- > drivers/serial/serial_nulldev.c | 1 - > drivers/serial/serial_omap.c | 2 +- > drivers/serial/serial_owl.c | 1 - > drivers/serial/serial_pic32.c | 1 - > drivers/serial/serial_pl01x.c | 1 - > drivers/serial/serial_rockchip.c | 1 - > drivers/serial/serial_s5p4418_pl011.c | 1 - > drivers/serial/serial_semihosting.c | 1 - > drivers/serial/serial_sifive.c| 1 - > drivers/serial/serial_sti_asc.c | 1 - > drivers/serial/serial_stm32.c | 1 - > drivers/serial/serial_uniphier.c | 1 - > drivers/serial/serial_xen.c | 1 - > drivers/serial/serial_xuartlite.c | 1 - > drivers/serial/serial_zynq.c | 1 - > drivers/serial/usbtty.c | 1 - > 46 files changed, 6 insertions(+), 46 deletions(-) > > diff --git a/drivers/serial/altera_jtag_uart.c > b/drivers/serial/altera_jtag_uart.c > index 9e39da7dd246..3f706e1839f2 100644 > --- a/drivers/serial/altera_jtag_uart.c > +++ b/drivers/serial/altera_jtag_uart.c > @@ -4,7 +4,6 @@ > * Scott McNutt > */ > > -#include > #include > #include > #include > diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c > index 35920480841a..3c13ef25bb49 100644 > --- a/drivers/serial/altera_uart.c > +++ b/drivers/serial/altera_uart.c > @@ -4,7 +4,6 @@ > * Scott McNutt > */ > > -#include > #include > #include > #include > diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c > index a402a123b6d6..66af136695d0 100644 > --- a/drivers/serial/arm_dcc.c > +++ b/drivers/serial/arm_dcc.c > @@ -15,7 +15,6 @@ > * this file might be covered by the GNU General Public License. > */ > > -#include > #include > #include > > diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c > index 9827c006fa88..7e45a80969e8 100644 > --- a/drivers/serial/atmel_usart.c > +++ b/drivers/serial/atmel_usart.c > @@ -5,7 +5,6 @@ > * Modified to support C structur SoC access by > * Andreas Bießmann > */ > -#include > #include > #include > #include > diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c > index 6deb1d8ddc56..4963385dc1c1 100644 > --- a/drivers/serial/ns16550.c > +++ b/drivers/serial/ns16550.c > @@ -5,7 +5,7 @@ > */ > > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c > index
Re: [PATCH 51/81] pinctrl: Remove and add needed includes
On Thu, 2 May 2024 at 02:33, Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Peter Robinson Looks fine > --- > Cc: Ryan Chen > Cc: Chia-Wei Wang > Cc: Aspeed BMC SW team > Cc: Joel Stanley > Cc: Tom Rini > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Ryder Lee > Cc: Weijie Gao > Cc: Chunfeng Yun > Cc: GSS_MTK_Uboot_upstream > Cc: Neil Armstrong > Cc: Gregory CLEMENT > Cc: Lars Povlsen > Cc: Horatiu Vultur > Cc: Stefan Roese > Cc: Stefan Bosch > Cc: Mark Kettenis > Cc: Sean Anderson > Cc: Simon Glass > Cc: Patrice Chotard > Cc: Patrick Delaunay > Cc: Michal Simek > Cc: Caleb Connolly > Cc: Sumit Garg > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Thierry Reding > Cc: Svyatoslav Ryhel > Cc: Kunihiko Hayashi > Cc: Dai Okamura > Cc: Minkyu Kang > Cc: Sam Protsenko > Cc: Peng Fan > Cc: Stefano Babic > Cc: Matthias Schiffer > Cc: Quentin Schulz > Cc: Jonas Karlman > Cc: Volodymyr Babchuk > Cc: Robert Marko > --- > drivers/pinctrl/aspeed/pinctrl_ast2500.c | 1 - > drivers/pinctrl/aspeed/pinctrl_ast2600.c | 1 - > drivers/pinctrl/ath79/pinctrl_ar933x.c | 1 - > drivers/pinctrl/ath79/pinctrl_qca953x.c | 1 - > drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 1 - > drivers/pinctrl/broadcom/pinctrl-bcm6838.c | 1 - > drivers/pinctrl/exynos/pinctrl-exynos.c | 1 - > drivers/pinctrl/exynos/pinctrl-exynos7420.c | 1 - > drivers/pinctrl/exynos/pinctrl-exynos78x0.c | 1 - > drivers/pinctrl/intel/pinctrl.c | 1 - > drivers/pinctrl/intel/pinctrl_apl.c | 1 - > drivers/pinctrl/mediatek/pinctrl-mtk-common.c| 1 - > drivers/pinctrl/meson/pinctrl-meson-a1.c | 1 - > drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c| 1 - > drivers/pinctrl/meson/pinctrl-meson-axg.c| 1 - > drivers/pinctrl/meson/pinctrl-meson-g12a.c | 1 - > drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 1 - > drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 - > drivers/pinctrl/meson/pinctrl-meson-gxl.c| 1 - > drivers/pinctrl/meson/pinctrl-meson.c| 1 - > drivers/pinctrl/mscc/mscc-common.c | 1 - > drivers/pinctrl/mscc/pinctrl-jr2.c | 1 - > drivers/pinctrl/mscc/pinctrl-luton.c | 1 - > drivers/pinctrl/mscc/pinctrl-ocelot.c| 1 - > drivers/pinctrl/mscc/pinctrl-serval.c| 1 - > drivers/pinctrl/mscc/pinctrl-servalt.c | 1 - > drivers/pinctrl/mtmips/pinctrl-mt7628.c | 1 - > drivers/pinctrl/mtmips/pinctrl-mtmips-common.c | 1 - > drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 1 - > drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 1 - > drivers/pinctrl/mvebu/pinctrl-mvebu.c| 1 - > drivers/pinctrl/nexell/pinctrl-nexell.c | 1 - > drivers/pinctrl/nexell/pinctrl-s5pxx18.c | 1 - > drivers/pinctrl/nxp/pinctrl-imx.c| 1 - > drivers/pinctrl/nxp/pinctrl-imx5.c | 1 - > drivers/pinctrl/nxp/pinctrl-imx6.c | 1 - > drivers/pinctrl/nxp/pinctrl-imx7.c | 1 - > drivers/pinctrl/nxp/pinctrl-imx7ulp.c| 1 - > drivers/pinctrl/nxp/pinctrl-imx8.c | 1 - > drivers/pinctrl/nxp/pinctrl-imx8ulp.c| 1 - > drivers/pinctrl/nxp/pinctrl-imxrt.c | 1 - > drivers/pinctrl/nxp/pinctrl-mxs.c| 1 - > drivers/pinctrl/nxp/pinctrl-scu.c| 1 - > drivers/pinctrl/nxp/pinctrl-vf610.c | 1 - > drivers/pinctrl/pinctrl-apple.c | 1 - > drivers/pinctrl/pinctrl-at91-pio4.c | 1 - > drivers/pinctrl/pinctrl-at91.c | 1 - > drivers/pinctrl/pinctrl-generic.c| 1 - > drivers/pinctrl/pinctrl-k210.c | 1 - > drivers/pinctrl/pinctrl-qe-io.c | 1 - > drivers/pinctrl/pinctrl-sandbox.c| 1 - > drivers/pinctrl/pinctrl-single.c | 1 - > drivers/pinctrl/pinctrl-sti.c| 1 - > drivers/pinctrl/pinctrl-stmfx.c | 1 - > drivers/pinctrl/pinctrl-uclass.c | 1 - > drivers/pinctrl/pinctrl-zynqmp.c | 1 - > drivers/pinctrl/pinctrl_pic32.c | 1 - > drivers/pinctrl/pinctrl_stm32.c | 1 - > drivers/pinctrl/qcom/pinctrl-apq8016.c | 1 - > drivers/pinctrl/qcom/pinctrl-apq8096.c | 1 - > drivers/pinctrl/qcom/pinctrl-ipq4019.c | 1 - > drivers/pinctrl/qcom/pinctrl-qcom.c | 1 - > drivers/pinctrl/qcom/pinctrl-qcs404.c| 1 - > drivers/pinctrl/qcom/pinctrl-sdm845.c| 1 - > drivers/pinctrl/rockchip/pinctrl-px30.c | 1 - > drivers/pinctrl/rockchip/pinctrl-rk3036.c| 1 - > drivers/pinctrl/rockchip/pinctrl-rk3066.c| 1 - > drivers/pinctrl/rockchip/pinctrl-rk3128.c
Re: [PATCH 42/81] mmc: Remove and add needed includes
On Thu, 2 May 2024 at 02:32, Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Peter Robinson Looks good. > --- > Cc: Peng Fan > Cc: Jaehoon Chung > Cc: Tom Rini > Cc: Ryan Chen > Cc: Chia-Wei Wang > Cc: Aspeed BMC SW team > Cc: Joel Stanley > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Thomas Fitzsimmons > Cc: Alex Nemirovsky > Cc: Masahisa Kojima > Cc: Neil Armstrong > Cc: Simon Glass > Cc: Caleb Connolly > Cc: Sumit Garg > Cc: Ryder Lee > Cc: Weijie Gao > Cc: Chunfeng Yun > Cc: GSS_MTK_Uboot_upstream > Cc: Tianrui Wei > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Nobuhiro Iwamatsu > Cc: Marek Vasut > Cc: Eugeniy Paltsev > Cc: Patrice Chotard > Cc: Patrick Delaunay > Cc: Thierry Reding > Cc: Svyatoslav Ryhel > Cc: Kunihiko Hayashi > Cc: Dai Okamura > Cc: Stefan Roese > Cc: Michal Simek > --- > drivers/mmc/am654_sdhci.c | 1 - > drivers/mmc/arm_pl180_mmci.c | 1 - > drivers/mmc/aspeed_sdhci.c| 1 - > drivers/mmc/atmel_sdhci.c | 1 - > drivers/mmc/bcm2835_sdhci.c | 1 - > drivers/mmc/bcm2835_sdhost.c | 1 - > drivers/mmc/bcmstb_sdhci.c| 1 - > drivers/mmc/ca_dw_mmc.c | 1 - > drivers/mmc/davinci_mmc.c | 1 - > drivers/mmc/dw_mmc.c | 1 - > drivers/mmc/exynos_dw_mmc.c | 1 - > drivers/mmc/f_sdh30.c | 1 - > drivers/mmc/fsl_esdhc.c | 1 - > drivers/mmc/fsl_esdhc_imx.c | 1 - > drivers/mmc/fsl_esdhc_spl.c | 2 +- > drivers/mmc/ftsdc010_mci.c| 1 - > drivers/mmc/gen_atmel_mci.c | 2 +- > drivers/mmc/hi6220_dw_mmc.c | 1 - > drivers/mmc/iproc_sdhci.c | 1 - > drivers/mmc/jz_mmc.c | 1 - > drivers/mmc/kona_sdhci.c | 1 - > drivers/mmc/meson_gx_mmc.c| 1 - > drivers/mmc/mmc-pwrseq.c | 1 - > drivers/mmc/mmc-uclass.c | 1 - > drivers/mmc/mmc.c | 3 ++- > drivers/mmc/mmc_boot.c| 1 - > drivers/mmc/mmc_bootdev.c | 1 - > drivers/mmc/mmc_legacy.c | 1 - > drivers/mmc/mmc_spi.c | 1 - > drivers/mmc/mmc_write.c | 1 - > drivers/mmc/msm_sdhci.c | 1 - > drivers/mmc/mtk-sd.c | 1 - > drivers/mmc/mv_sdhci.c| 1 - > drivers/mmc/mvebu_mmc.c | 1 - > drivers/mmc/mxcmmc.c | 1 - > drivers/mmc/mxsmmc.c | 1 - > drivers/mmc/nexell_dw_mmc.c | 1 - > drivers/mmc/npcm_sdhci.c | 1 - > drivers/mmc/omap_hsmmc.c | 1 - > drivers/mmc/owl_mmc.c | 1 - > drivers/mmc/pci_mmc.c | 1 - > drivers/mmc/piton_mmc.c | 1 - > drivers/mmc/rockchip_dw_mmc.c | 1 - > drivers/mmc/rockchip_sdhci.c | 1 - > drivers/mmc/rpmb.c| 1 - > drivers/mmc/s5p_sdhci.c | 1 - > drivers/mmc/sandbox_mmc.c | 1 - > drivers/mmc/sdhci-adma.c | 1 - > drivers/mmc/sdhci-cadence.c | 1 - > drivers/mmc/sdhci.c | 2 +- > drivers/mmc/sh_mmcif.c| 1 - > drivers/mmc/snps_dw_mmc.c | 1 - > drivers/mmc/socfpga_dw_mmc.c | 1 - > drivers/mmc/sti_sdhci.c | 1 - > drivers/mmc/stm32_sdmmc2.c| 1 - > drivers/mmc/sunxi_mmc.c | 1 - > drivers/mmc/tangier_sdhci.c | 1 - > drivers/mmc/tegra_mmc.c | 1 - > drivers/mmc/tmio-common.c | 1 - > drivers/mmc/uniphier-sd.c | 1 - > drivers/mmc/xenon_sdhci.c | 1 - > drivers/mmc/zynq_sdhci.c | 1 - > 62 files changed, 5 insertions(+), 62 deletions(-) > > diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c > index ffb461c2f6c1..48fac7a11b48 100644 > --- a/drivers/mmc/am654_sdhci.c > +++ b/drivers/mmc/am654_sdhci.c > @@ -6,7 +6,6 @@ > */ > > #include > -#include > #include > #include > #include > diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c > index cecc7ad783d0..f00b0ff0dc95 100644 > --- a/drivers/mmc/arm_pl180_mmci.c > +++ b/drivers/mmc/arm_pl180_mmci.c > @@ -11,7 +11,6 @@ > > /* #define DEBUG */ > > -#include "common.h" > #include > #include > #include > diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c > index c9626c6beb8f..87a6f66ebb37 100644 > --- a/drivers/mmc/aspeed_sdhci.c > +++ b/drivers/mmc/aspeed_sdhci.c > @@ -4,7 +4,6 @@ > * Eddie James > */ > > -#include > #include > #include > #include > diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c > index d92bad97b71e..0b265196f025 100644 > --- a/drivers/mmc/atmel_sdhci.c > +++ b/drivers/mmc/atmel_sdhci.c > @@ -4,7 +4,6 @@ > * Wenyou.Yang > */ > > -#include > #include > #include > #include > diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c > index 5e48394fd0fb..598a51d914a9 100644 > --- a/drivers/mmc/bcm2835_sdhci.c > +++ b/drivers/mmc/bcm2835_sdhci.c > @@ -36,7 +36,6 @@ > * Inspired by sdhci-pci.c, by Pierre Ossman > */ > > -#include > #include > #include > #include > diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c > index 5c23c03d10d7..720127468d37
Re: [PATCH 33/81] gpio: Remove and add needed includes
On Thu, 2 May 2024 at 02:32, Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Peter Robinson Looks fine to me. > --- > Cc: Tom Rini > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Alex Nemirovsky > Cc: Ryan Chen > Cc: Chia-Wei Wang > Cc: Aspeed BMC SW team > Cc: Joel Stanley > Cc: Nobuhiro Iwamatsu > Cc: Marek Vasut > Cc: Kunihiko Hayashi > Cc: Dai Okamura > Cc: Michal Simek > Cc: Eugeniy Paltsev > Cc: Gregory CLEMENT > Cc: Lars Povlsen > Cc: Horatiu Vultur > Cc: Caleb Connolly > Cc: Neil Armstrong > Cc: Sumit Garg > Cc: Stefan Roese > Cc: Stephan Gerhold > Cc: Linus Walleij > Cc: Stefan Bosch > Cc: Simon Glass > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Michael Walle > Cc: Patrick Delaunay > Cc: Patrice Chotard > Cc: Thierry Reding > Cc: Svyatoslav Ryhel > Cc: Sean Anderson > Cc: Andre Przywara > Cc: Qu Wenruo > Cc: Ilias Apalodimas > Cc: Heiko Schocher > Cc: Peng Fan > Cc: Bin Meng > Cc: Piotr Wojtaszczyk > Cc: Jim Liu > Cc: Nishanth Menon > Cc: Samuel Holland > Cc: Sam Edwards > --- > drivers/gpio/74x164_gpio.c | 1 - > drivers/gpio/altera_pio.c | 1 - > drivers/gpio/at91_gpio.c| 1 - > drivers/gpio/atmel_pio4.c | 1 - > drivers/gpio/axp_gpio.c | 1 - > drivers/gpio/bcm2835_gpio.c | 1 - > drivers/gpio/bcm6345_gpio.c | 1 - > drivers/gpio/cortina_gpio.c | 1 - > drivers/gpio/da8xx_gpio.c | 1 - > drivers/gpio/ftgpio010.c| 1 - > drivers/gpio/gpio-aspeed.c | 1 - > drivers/gpio/gpio-fxl6408.c | 1 - > drivers/gpio/gpio-rcar.c| 1 - > drivers/gpio/gpio-rza1.c| 1 - > drivers/gpio/gpio-uclass.c | 1 - > drivers/gpio/gpio-uniphier.c| 1 - > drivers/gpio/gpio_slg7xl45106.c | 1 - > drivers/gpio/hi6220_gpio.c | 1 - > drivers/gpio/hsdk-creg-gpio.c | 1 - > drivers/gpio/imx_rgpio2p.c | 1 - > drivers/gpio/intel_broadwell_gpio.c | 1 - > drivers/gpio/intel_gpio.c | 1 - > drivers/gpio/intel_ich6_gpio.c | 1 - > drivers/gpio/iproc_gpio.c | 1 - > drivers/gpio/kw_gpio.c | 1 - > drivers/gpio/lpc32xx_gpio.c | 1 - > drivers/gpio/max7320_gpio.c | 1 - > drivers/gpio/mcp230xx_gpio.c| 1 - > drivers/gpio/mpc83xx_spisel_boot.c | 1 - > drivers/gpio/mpc8xx_gpio.c | 1 - > drivers/gpio/mpc8xxx_gpio.c | 1 - > drivers/gpio/mscc_sgpio.c | 1 - > drivers/gpio/msm_gpio.c | 1 - > drivers/gpio/mt7621_gpio.c | 1 - > drivers/gpio/mvebu_gpio.c | 1 - > drivers/gpio/mxc_gpio.c | 1 - > drivers/gpio/mxs_gpio.c | 1 - > drivers/gpio/nmk_gpio.c | 1 - > drivers/gpio/npcm_gpio.c| 1 - > drivers/gpio/nx_gpio.c | 1 - > drivers/gpio/omap_gpio.c| 1 - > drivers/gpio/pca953x.c | 3 ++- > drivers/gpio/pca953x_gpio.c | 1 - > drivers/gpio/pcf8575_gpio.c | 1 - > drivers/gpio/pic32_gpio.c | 1 - > drivers/gpio/qcom_pmic_gpio.c | 1 - > drivers/gpio/qe_gpio.c | 1 - > drivers/gpio/rk_gpio.c | 1 - > drivers/gpio/s5p_gpio.c | 1 - > drivers/gpio/sandbox.c | 1 - > drivers/gpio/sandbox_test.c | 1 - > drivers/gpio/sh_pfc.c | 1 - > drivers/gpio/sifive-gpio.c | 1 - > drivers/gpio/sl28cpld-gpio.c| 1 - > drivers/gpio/stm32_gpio.c | 1 - > drivers/gpio/sunxi_gpio.c | 1 - > drivers/gpio/tca642x.c | 2 +- > drivers/gpio/tegra186_gpio.c| 1 - > drivers/gpio/tegra_gpio.c | 1 - > drivers/gpio/vybrid_gpio.c | 1 - > drivers/gpio/xilinx_gpio.c | 1 - > drivers/gpio/zynq_gpio.c| 1 - > drivers/gpio/zynqmp_gpio_modepin.c | 1 - > 63 files changed, 3 insertions(+), 63 deletions(-) > > diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c > index 7a7cfe86114b..331428ccdb9a 100644 > --- a/drivers/gpio/74x164_gpio.c > +++ b/drivers/gpio/74x164_gpio.c > @@ -8,7 +8,6 @@ > * > */ > > -#include > #include > #include > #include > diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c > index edc5a8093b0c..7ba1595e4ae3 100644 > --- a/drivers/gpio/altera_pio.c > +++ b/drivers/gpio/altera_pio.c > @@ -4,7 +4,6 @@ > * Copyright (C) 2011 Missing Link Electronics > * Joachim Foerster > */ > -#include > #include > #include > #include > diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c > index f80f4afd24ff..50a698159075 100644 > --- a/drivers/gpio/at91_gpio.c > +++ b/drivers/gpio/at91_gpio.c > @@ -8,7 +8,6 @@ > */ > > #include > -#include > #include > #include > #include > diff --git a/drivers/gpio/atmel_pio4.c
U-boot script for RPI with boot partition of ext4 type
Hi,
I'm working with a Raspberry Pi Compute Module 4 and RAUC update tool for
embedded linux.
The problem I'm struggling with is to update both the rootfs and the boot
partition. The approach I'm trying to apply is based on an architecture of
two boot partitions and two rootfs partitions.
The boot and rootfs partitions are supposed to get updated in pairs.
boot_A (/dev/mmcblk0p1)
boot_B (/dev/mmcblk0p2)
rootfs_A (/dev/mmcblk0p3)
rootfs_B (/dev/mmcblk0p4)
For RAUC to be able to write an update to a boot partition it has to be of
*ext4* type and this is the real problem. What should be the u-boot
*boot.scr* script to handle this?
I've read that *fatload* should be replaced with *ext4load* instruction,
however such a simple swap does not work well, the board does not boot at
all.
Are there any other steps I should take to make the board bootable with an
ext4 boot partition?
Below is the source of my original *boot.scr* script:
fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
>
> setenv bootpart "/dev/mmcblk0p3"
> setenv raucslot "A"
> setenv bootargs "${bootargs} root=${bootpart} rauc.slot=${raucslot}"
> fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
> if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
> @@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}
>
Best regards,
Antoni
[PATCH] net: phy: Add missing RGMII internal delay cases to vsc8541_config
Currently, vsc8541_config does not account for cases where RGMII mode with internal delays on TX, RX or both are selected, even though the device supports that functionality. Instead, it returns an error when "rgmii-id", "rgmii-txid" or "rgmii-rxid" is selected in its corresponding DT node. Fix by adding missing RGMII internal delay modes to list of fall-through cases so that when configured with modes "rgmii-id", "rgmii-txid" or "rgmii-rxid", the internal delay registers get updated correctly in vsc8531_vsc8541_clk_skew_config(). Signed-off-by: Ryan Shimizu --- drivers/net/phy/mscc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index bd9cd95297..7263887b9c 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -1371,6 +1371,9 @@ static int vsc8541_config(struct phy_device *phydev) case PHY_INTERFACE_MODE_GMII: case PHY_INTERFACE_MODE_RMII: case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_TXID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_ID: retval = vsc8531_vsc8541_mac_config(phydev); if (retval != 0) return retval; -- 2.34.1
Re: [PATCH 093/149] board: msc: Remove and add needed includes
On Tue, Apr 30, 2024 at 08:42:20PM -0600, Tom Rini wrote: > > WARNING: This email originated from outside of GE HealthCare. Please validate > the sender's email address before clicking on links or attachments as they > may not be safe. > > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Ian Ray > --- > Cc: Martyn Welch > Cc: Ian Ray > --- > board/msc/sm2s_imx8mp/sm2s_imx8mp.c | 1 - > board/msc/sm2s_imx8mp/spl.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/msc/sm2s_imx8mp/sm2s_imx8mp.c > b/board/msc/sm2s_imx8mp/sm2s_imx8mp.c > index 6ccbf02db06e..b1ce014bd55d 100644 > --- a/board/msc/sm2s_imx8mp/sm2s_imx8mp.c > +++ b/board/msc/sm2s_imx8mp/sm2s_imx8mp.c > @@ -7,7 +7,6 @@ > * Copyright 2021 Collabora Ltd. > */ > > -#include > #include > #include > #include > diff --git a/board/msc/sm2s_imx8mp/spl.c b/board/msc/sm2s_imx8mp/spl.c > index ed7a1b7d3d00..b1b5561838dc 100644 > --- a/board/msc/sm2s_imx8mp/spl.c > +++ b/board/msc/sm2s_imx8mp/spl.c > @@ -7,7 +7,7 @@ > * Copyright 2021 Collabora Ltd. > */ > > -#include > +#include > #include > #include > #include > -- > 2.34.1 > >
Re: [PATCHv2 066/149] board: ge: Remove and add needed includes
On Wed, May 01, 2024 at 05:58:49PM -0600, Tom Rini wrote: > > WARNING: This email originated from outside of GE HealthCare. Please validate > the sender's email address before clicking on links or attachments as they > may not be safe. > > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Ian Ray > --- > Changes in v2: > - Remove "common.h" include as well. > > Cc: "Huan 'Kitty' Wang" > Cc: Ian Ray > Cc: Martyn Welch > > board/ge/b1x5v2/b1x5v2.c | 1 - > board/ge/common/ge_rtc.c | 1 - > board/ge/common/vpd_reader.h | 2 +- > board/ge/mx53ppd/mx53ppd.c | 1 - > board/ge/mx53ppd/mx53ppd_video.c | 1 - > 5 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/board/ge/b1x5v2/b1x5v2.c b/board/ge/b1x5v2/b1x5v2.c > index a2cbd1512e92..031773bc5ef3 100644 > --- a/board/ge/b1x5v2/b1x5v2.c > +++ b/board/ge/b1x5v2/b1x5v2.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/board/ge/common/ge_rtc.c b/board/ge/common/ge_rtc.c > index 6437afc7bd0a..5c62ecca8c89 100644 > --- a/board/ge/common/ge_rtc.c > +++ b/board/ge/common/ge_rtc.c > @@ -3,7 +3,6 @@ > * Copyright 2017 General Electric Company > */ > > -#include > #include > #include > #include > diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h > index 0c51dc57e902..d32c18da351c 100644 > --- a/board/ge/common/vpd_reader.h > +++ b/board/ge/common/vpd_reader.h > @@ -3,7 +3,7 @@ > * Copyright 2016 General Electric Company > */ > > -#include "common.h" > +#include > > struct vpd_cache; > > diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c > index cc462d53da6a..9396d43f8add 100644 > --- a/board/ge/mx53ppd/mx53ppd.c > +++ b/board/ge/mx53ppd/mx53ppd.c > @@ -8,7 +8,6 @@ > * Jason Liu > */ > > -#include > #include > #include > #include > diff --git a/board/ge/mx53ppd/mx53ppd_video.c > b/board/ge/mx53ppd/mx53ppd_video.c > index 4e2c6ebde73c..eb4dd758b3b5 100644 > --- a/board/ge/mx53ppd/mx53ppd_video.c > +++ b/board/ge/mx53ppd/mx53ppd_video.c > @@ -8,7 +8,6 @@ > * Fabio Estevam > */ > > -#include > #include > #include > #include > -- > 2.34.1 > >
Re: [PATCH 73/81] usb: Remove and add needed includes
Hi Tom, Thank you for the patch On mer., mai 01, 2024 at 19:31, Tom Rini wrote: > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini [...] > diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c > index fedcf7869295..38c5928faed5 100644 > --- a/drivers/usb/host/xhci-rcar.c > +++ b/drivers/usb/host/xhci-rcar.c > @@ -5,7 +5,6 @@ > * Renesas RCar USB HOST xHCI Controller > */ > > -#include > #include > #include > #include > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index 910c5f3352b8..1360a5940fa0 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -13,7 +13,6 @@ > * Vikas Sajjan > */ > > -#include This generates the following build warning with khadas-vim3_android_defconfig: drivers/usb/host/xhci-ring.c: In function 'xhci_wait_for_event': drivers/usb/host/xhci-ring.c:464:28: warning: implicit declaration of function 'get_timer'; did you mean 'get_mem'? [-Wimplicit-function-declaration] 464 | unsigned long ts = get_timer(0); |^ |get_mem Adding: "#include " fixes the warning. With the above fix included: Reviewed-by: Mattijs Korpershoek > #include > #include > #include > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 741e186ee05b..d30725d3fcaa 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -19,7 +19,6 @@ > * The quirk devices support hasn't been given yet. > */ > > -#include > #include > #include > #include [...]
Use header file from external library in u-boot
Dear u-boot folks, we are trying to share some information between u-boot and a Linux user space tool. For this we place some information in a FRAM. This information is just some numeric values, indicating some wanted behaviour. I thought of using a header file to keep these values aligned between the user space tool and u-boot. This header is provided by a library. Including it into the user space tool is straight forward, but into u-boot does seem complicated, as the build system is not meant to include external libraries. Is there a preferred way to do this kind of alignment or a suggestion on how to handle this? Best regards Johannes
Re: [PATCH 025/149] board: beckhoff: Remove and add needed includes
Tested-by: Patrick Bruenn On Tue, 2024-04-30 at 20:41 -0600, Tom Rini wrote: > CAUTION: External Email!! > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini > --- > Cc: Patrick Bruenn > --- > board/beckhoff/mx53cx9020/mx53cx9020.c | 1 - > board/beckhoff/mx53cx9020/mx53cx9020_video.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c > b/board/beckhoff/mx53cx9020/mx53cx9020.c > index e7b131836b61..3a766728a6f7 100644 > --- a/board/beckhoff/mx53cx9020/mx53cx9020.c > +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c > @@ -7,7 +7,6 @@ > * Copyright (C) 2011 Freescale Semiconductor, Inc. > */ > > -#include > #include > #include > #include > diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c > b/board/beckhoff/mx53cx9020/mx53cx9020_video.c > index bf4729025622..fd28a70f4d72 100644 > --- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c > +++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c > @@ -7,7 +7,6 @@ > * Copyright (C) 2012 Freescale Semiconductor, Inc. > */ > > -#include > #include > #include > #include This email contains confidential information. If you have received it in error, you must not read, use, copy or pass on this e-mail or its attachments. If you have received the e-mail in error, please inform me immediately by reply e-mail and then delete this e-mail from your system. Thank you Diese E-Mail enthält vertrauliche Informationen. Sollten Sie sie irrtümlich erhalten haben, dürfen Sie diese E-Mail oder ihre Anhänge nicht lesen, verwenden, kopieren oder weitergeben. Sollten Sie die Mail versehentlich erhalten haben, teilen Sie mir dies bitte umgehend per Antwort-E-Mail mit und löschen Sie diese E-Mail dann aus Ihrem System. Vielen Dank Beckhoff Automation GmbH & Co. KG | Managing Director: Dipl. Phys. Hans Beckhoff Registered office: Verl, Germany | Register court: Guetersloh HRA 7075
Re: [PATCH 32/81] fwu-mdata: Remove and add needed includes
On Wed, May 1, 2024 at 8:45 PM Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini > --- > Cc: Tom Rini > Cc: Ilias Apalodimas > Cc: Jassi Brar > Cc: Etienne Carriere > --- Acked-by: Jassi Brar Thanks
Re: imx8mn: bootcount does not increment
Hi Fabio On Thu, May 2, 2024 at 2:45 PM Fabio Estevam wrote: > > Hi Heiko, > > On Fri, Apr 26, 2024 at 12:40 AM Heiko Schocher wrote: > > > No chance for a bootcounter in a register? > > Yes, this is a better approach. I changed it to: > > CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C4 > CONFIG_SYS_BOOTCOUNT_ADDR=0x30370090 > CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y > > and now bootcount increments. > Maybe you have anyway a bug on the evk when was not incrementing on environment Michael > Thanks, > > Fabio Estevam -- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 mich...@amarulasolutions.com __ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 i...@amarulasolutions.com www.amarulasolutions.com
Re: imx8mn: bootcount does not increment
Hi Heiko, On Fri, Apr 26, 2024 at 12:40 AM Heiko Schocher wrote: > No chance for a bootcounter in a register? Yes, this is a better approach. I changed it to: CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0xB0C4 CONFIG_SYS_BOOTCOUNT_ADDR=0x30370090 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y and now bootcount increments. Thanks, Fabio Estevam
Re: [PATCH 013/149] board: advantech: Remove and add needed includes
On 30/04/24, Tom Rini wrote: > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini > --- > Cc: "Ying-Chun Liu (PaulLiu)" > Cc: Oliver Graute > Cc: George McCollister > --- > board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 1 - > board/advantech/imx8mp_rsb3720a1/spl.c| 2 +- > board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c | 1 - > board/advantech/imx8qm_dmsse20_a1/spl.c | 2 +- > board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 1 - > board/advantech/imx8qm_rom7720_a1/spl.c | 2 +- > board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 - > 7 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > index d87fe3606f6a..070933fb54b2 100644 > --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > @@ -4,7 +4,6 @@ > * Copyright 2022 Linaro > */ > > -#include > #include > #include > #include > diff --git a/board/advantech/imx8mp_rsb3720a1/spl.c > b/board/advantech/imx8mp_rsb3720a1/spl.c > index f4257bc993d6..1f7c1f25adcf 100644 > --- a/board/advantech/imx8mp_rsb3720a1/spl.c > +++ b/board/advantech/imx8mp_rsb3720a1/spl.c > @@ -4,7 +4,7 @@ > * Copyright 2022 Linaro > */ > > -#include > +#include > #include > #include > #include > diff --git a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c > b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c > index 56b7bdb57c94..50b35db5f6cf 100644 > --- a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c > +++ b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c > @@ -4,7 +4,6 @@ > * Copyright 2019-2023 Kococonnector GmbH > */ > > -#include > #include > #include > #include > diff --git a/board/advantech/imx8qm_dmsse20_a1/spl.c > b/board/advantech/imx8qm_dmsse20_a1/spl.c > index e8959ede51d9..93cf07440026 100644 > --- a/board/advantech/imx8qm_dmsse20_a1/spl.c > +++ b/board/advantech/imx8qm_dmsse20_a1/spl.c > @@ -3,7 +3,7 @@ > * Copyright 2017-2018 NXP > * Copyright 2019-2023 Kococonnector GmbH > */ > -#include > +#include > #include > #include > #include > diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c > b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c > index 7f766a688bb5..3def182f2967 100644 > --- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c > +++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c > @@ -4,7 +4,6 @@ > * Copyright (C) 2019 Oliver Graute > */ > > -#include > #include > #include > #include > diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c > b/board/advantech/imx8qm_rom7720_a1/spl.c > index d32400101fc9..5863e335a8bc 100644 > --- a/board/advantech/imx8qm_rom7720_a1/spl.c > +++ b/board/advantech/imx8qm_rom7720_a1/spl.c > @@ -2,7 +2,7 @@ > /* > * Copyright 2017-2018 NXP > */ > -#include > +#include > #include > #include > #include > diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c > b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c > index 8499fc541fa7..9bbd5fd291aa 100644 > --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c > +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c > @@ -4,7 +4,6 @@ > * Copyright (C) 2016 George McCollister > */ > > -#include > #include > #include > > -- > 2.34.1 > Acked-by: Oliver Graute
Re: [PATCH 043/149] board: congatec: Remove and add needed includes
On 30/04/24, Tom Rini wrote: > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini > --- > Cc: Oliver Graute > Cc: Stefan Roese > --- > board/congatec/cgtqmx8/cgtqmx8.c | 2 +- > board/congatec/cgtqmx8/spl.c | 1 - > board/congatec/common/mmc.c| 3 ++- > board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 - > 4 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/board/congatec/cgtqmx8/cgtqmx8.c > b/board/congatec/cgtqmx8/cgtqmx8.c > index d8e5b1d69633..99c33a1943e0 100644 > --- a/board/congatec/cgtqmx8/cgtqmx8.c > +++ b/board/congatec/cgtqmx8/cgtqmx8.c > @@ -3,7 +3,7 @@ > * Copyright 2018 congatec AG > * Copyright (C) 2019 Oliver Graute > */ > -#include > +#include > #include > #include > #include > diff --git a/board/congatec/cgtqmx8/spl.c b/board/congatec/cgtqmx8/spl.c > index b432ce27459f..242e794981b7 100644 > --- a/board/congatec/cgtqmx8/spl.c > +++ b/board/congatec/cgtqmx8/spl.c > @@ -4,7 +4,6 @@ > * > */ > > -#include > #include > #include > #include > diff --git a/board/congatec/common/mmc.c b/board/congatec/common/mmc.c > index bb7a3d4a9aa0..74a189ab4d7f 100644 > --- a/board/congatec/common/mmc.c > +++ b/board/congatec/common/mmc.c > @@ -4,7 +4,8 @@ > * Copyright 2018 NXP > * > */ > -#include > + > +#include > #include > #include > #include > diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c > b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c > index 315b6dc54295..4197e88fb6ff 100644 > --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c > +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 Stefan Roese > */ > > -#include > #include > #include > #include > -- > 2.34.1 > Acked-by: Oliver Graute
Re: [PATCH] binman: Fix typo in mkimage etype description
Hi Marek, On 4/26/24 12:54 AM, Marek Vasut wrote: Fix a typo, no functional change. Signed-off-by: Marek Vasut Reviewed-by: Quentin Schulz Thanks, Quentin
Re: [PATCH 74/81] video: Remove and add needed includes
On Thu, 2 May 2024 at 02:34, Tom Rini wrote: > > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Peter Robinson LGTM. > --- > Cc: Anatolij Gustschin > Cc: Tom Rini > Cc: Matthias Brugger > Cc: Peter Robinson > Cc: Liviu Dudau > Cc: Stephan Gerhold > Cc: Linus Walleij > Cc: Neil Armstrong > Cc: Stefan Bosch > Cc: Simon Glass > Cc: Philipp Tomsich > Cc: Kever Yang > Cc: Michal Simek > Cc: Patrick Delaunay > Cc: Patrice Chotard > Cc: Jagan Teki > Cc: Andre Przywara > Cc: Thierry Reding > Cc: Svyatoslav Ryhel > Cc: Johan Jonker > --- > drivers/video/anx9804.c | 1 - > drivers/video/atmel_hlcdfb.c| 1 - > drivers/video/atmel_lcdfb.c | 1 - > drivers/video/backlight-uclass.c| 1 - > drivers/video/backlight_gpio.c | 1 - > drivers/video/bcm2835.c | 1 - > drivers/video/bmp.c | 1 - > drivers/video/bochs.c | 1 - > drivers/video/bridge/anx6345.c | 1 - > drivers/video/bridge/ps862x.c | 1 - > drivers/video/bridge/ptn3460.c | 1 - > drivers/video/bridge/ssd2825.c | 1 - > drivers/video/bridge/video-bridge-uclass.c | 1 - > drivers/video/broadwell_igd.c | 2 +- > drivers/video/console_normal.c | 1 - > drivers/video/console_rotate.c | 1 - > drivers/video/console_truetype.c| 1 - > drivers/video/coreboot.c| 1 - > drivers/video/display-uclass.c | 1 - > drivers/video/dsi-host-uclass.c | 1 - > drivers/video/dw_hdmi.c | 3 ++- > drivers/video/dw_mipi_dsi.c | 1 - > drivers/video/efi.c | 1 - > drivers/video/endeavoru-panel.c | 1 - > drivers/video/exynos/exynos_dp.c| 1 - > drivers/video/exynos/exynos_dp_lowlevel.c | 1 - > drivers/video/exynos/exynos_fb.c| 1 - > drivers/video/exynos/exynos_mipi_dsi.c | 1 - > drivers/video/exynos/exynos_mipi_dsi_common.c | 1 - > drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 1 - > drivers/video/himax-hx8394.c| 1 - > drivers/video/hitachi_tx18d42vm_lcd.c | 1 - > drivers/video/hx8238d.c | 1 - > drivers/video/ihs_video_out.c | 1 - > drivers/video/imx/ipu_common.c | 2 +- > drivers/video/imx/ipu_disp.c| 1 - > drivers/video/imx/mxc_ipuv3_fb.c| 1 - > drivers/video/ivybridge_igd.c | 1 - > drivers/video/lm3533_backlight.c| 1 - > drivers/video/logicore_dp_tx.c | 1 - > drivers/video/mali_dp.c | 1 - > drivers/video/mcde_simple.c | 1 - > drivers/video/meson/meson_canvas.c | 1 - > drivers/video/meson/meson_dw_hdmi.c | 1 - > drivers/video/meson/meson_plane.c | 1 - > drivers/video/meson/meson_vclk.c| 1 - > drivers/video/meson/meson_venc.c| 1 - > drivers/video/meson/meson_vpu.c | 1 - > drivers/video/meson/meson_vpu_init.c| 1 - > drivers/video/mipi_dsi.c| 1 - > drivers/video/mvebu_lcd.c | 1 - > drivers/video/mxsfb.c | 1 - > drivers/video/nexell/s5pxx18_dp.c | 1 - > drivers/video/nexell/s5pxx18_dp_hdmi.c | 1 - > drivers/video/nexell/s5pxx18_dp_lvds.c | 2 +- > drivers/video/nexell/s5pxx18_dp_mipi.c | 1 - > drivers/video/nexell/s5pxx18_dp_rgb.c | 2 +- > drivers/video/nexell/soc/s5pxx18_soc_disptop.h | 1 + > drivers/video/nexell_display.c | 1 - > drivers/video/omap3_dss.c | 1 - > drivers/video/orisetech_otm8009a.c | 1 - > drivers/video/panel-uclass.c| 1 - > drivers/video/pwm_backlight.c | 1 - > drivers/video/raydium-rm68200.c | 1 - > drivers/video/renesas-r61307.c | 1 - > drivers/video/renesas-r69328.c | 1 - > drivers/video/rockchip/dw_mipi_dsi_rockchip.c | 1 - > drivers/video/rockchip/rk3288_hdmi.c| 1 - > drivers/video/rockchip/rk3288_mipi.c| 1 - > drivers/video/rockchip/rk3288_vop.c | 1 - > drivers/video/rockchip/rk3399_hdmi.c| 1 - > drivers/video/rockchip/rk3399_mipi.c| 1 - > drivers/video/rockchip/rk3399_vop.c | 1 - > drivers/video/rockchip/rk_edp.c | 1 - > drivers/video/rockchip/rk_hdmi.c| 1 - > drivers/video/rockchip/rk_lvds.c| 1 - >
Re: [PATCH v2 22/22] rockchip: rk3399: Drop ethernet0 alias from SoC u-boot.dtsi
On Wed, 1 May 2024 at 17:25, Jonas Karlman wrote:
>
> Remove the obsolete ethernet0 alias now that all board device tree files
> have been fully synced with Linux kernel v6.8.
>
> Signed-off-by: Jonas Karlman
Reviewed-by: Peter Robinson
> ---
> v2: New patch
> ---
> arch/arm/dts/rk3399-u-boot.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 6af9621ac3d0..b6b43271172e 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -6,7 +6,6 @@
>
> / {
> aliases {
> - ethernet0 =
> mmc0 =
> mmc1 =
> pci0 =
> --
> 2.43.2
>
Re: [PATCH v2 22/22] rockchip: rk3399: Drop ethernet0 alias from SoC u-boot.dtsi
Hi Jonas,
On Wed, 2024-05-01 at 16:22 +, Jonas Karlman wrote:
> Remove the obsolete ethernet0 alias now that all board device tree files
> have been fully synced with Linux kernel v6.8.
>
> Signed-off-by: Jonas Karlman
Looks good to me.
Reviewed-by: Christopher Obbard
> ---
> v2: New patch
> ---
> arch/arm/dts/rk3399-u-boot.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-
> boot.dtsi
> index 6af9621ac3d0..b6b43271172e 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -6,7 +6,6 @@
>
> / {
> aliases {
> - ethernet0 =
> mmc0 =
> mmc1 =
> pci0 =
Re: [PATCH 19/33] arm: meson: Remove and add needed includes
On 30/04/2024 15:35, Tom Rini wrote: Remove from all mach-meson files and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Neil Armstrong Cc: u-boot-amlo...@groups.io --- arch/arm/mach-meson/board-a1.c | 2 +- arch/arm/mach-meson/board-axg.c| 1 - arch/arm/mach-meson/board-common.c | 1 - arch/arm/mach-meson/board-g12a.c | 1 - arch/arm/mach-meson/board-gx.c | 1 - arch/arm/mach-meson/board-info.c | 1 - arch/arm/mach-meson/sm.c | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c index 967bb671822e..f848c0f068ed 100644 --- a/arch/arm/mach-meson/board-a1.c +++ b/arch/arm/mach-meson/board-a1.c @@ -3,12 +3,12 @@ * (C) Copyright 2023 SberDevices, Inc. */ -#include #include #include #include #include #include +#include #include phys_size_t get_effective_memsize(void) diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index fdf18752cdd0..6535539184cc 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 7ceba7cede85..39774c43049a 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -3,7 +3,6 @@ * (C) Copyright 2016 Beniamino Galvani */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d5a830fb1db8..dc4abe1e1074 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index c3fbdfffeae8..0370ed57e205 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -4,7 +4,6 @@ * (C) Copyright 2018 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index d51d9b8f0645..b4058f593234 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -4,7 +4,6 @@ * (C) Copyright 2019 Neil Armstrong */ -#include #include #include #include diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 914fd11c9894..4d9f83d3b38d 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -5,7 +5,6 @@ * Secure monitor calls. */ -#include #include #include #include Reviewed-by: Neil Armstrong
Re: [PATCH 28/81] fastboot: Remove and add needed includes
Hi Tom, Thank you for the patch. On mer., mai 01, 2024 at 19:30, Tom Rini wrote: > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Mattijs Korpershoek > --- > Cc: Mattijs Korpershoek > Cc: Tom Rini > --- > drivers/fastboot/fb_command.c | 2 +- > drivers/fastboot/fb_common.c | 2 +- > drivers/fastboot/fb_getvar.c | 2 +- > drivers/fastboot/fb_mmc.c | 1 - > drivers/fastboot/fb_nand.c| 1 - > 5 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c > index 01443c5d39e2..e4484d65aca5 100644 > --- a/drivers/fastboot/fb_command.c > +++ b/drivers/fastboot/fb_command.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 The Android Open Source Project > */ > > -#include > #include > #include > #include > @@ -13,6 +12,7 @@ > #include > #include > #include > +#include > #include > > /** > diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c > index 3576b0677299..12ffb463deb9 100644 > --- a/drivers/fastboot/fb_common.c > +++ b/drivers/fastboot/fb_common.c > @@ -11,11 +11,11 @@ > */ > > #include > -#include > #include > #include > #include > #include > +#include > > /** > * fastboot_buf_addr - base address of the fastboot download buffer > diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c > index f65519c57b47..93cbd598e024 100644 > --- a/drivers/fastboot/fb_getvar.c > +++ b/drivers/fastboot/fb_getvar.c > @@ -3,7 +3,6 @@ > * Copyright (C) 2016 The Android Open Source Project > */ > > -#include > #include > #include > #include > @@ -12,6 +11,7 @@ > #include > #include > #include > +#include > #include > > static void getvar_version(char *var_parameter, char *response); > diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c > index 060918e49109..f11eb66761b1 100644 > --- a/drivers/fastboot/fb_mmc.c > +++ b/drivers/fastboot/fb_mmc.c > @@ -4,7 +4,6 @@ > */ > > #include > -#include > #include > #include > #include > diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c > index bbe26ddcc9be..afc64fd52807 100644 > --- a/drivers/fastboot/fb_nand.c > +++ b/drivers/fastboot/fb_nand.c > @@ -5,7 +5,6 @@ > */ > > #include > -#include > #include > > #include > -- > 2.34.1
Re: [PATCH 25/81] dfu: Remove and add needed includes
Hi Tom, Thank you for the patch. On mer., mai 01, 2024 at 19:30, Tom Rini wrote: > Remove from this driver directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Reviewed-by: Mattijs Korpershoek Since this is quite a big series, I'm assuming you will pick it up yourself. If it's expected of me to pick this up through u-boot-dfu, let me know. > --- > Cc: Lukasz Majewski > Cc: Mattijs Korpershoek > Cc: Tom Rini > --- > drivers/dfu/dfu.c | 1 - > drivers/dfu/dfu_alt.c | 1 - > drivers/dfu/dfu_mmc.c | 1 - > drivers/dfu/dfu_mtd.c | 1 - > drivers/dfu/dfu_nand.c | 1 - > drivers/dfu/dfu_ram.c | 1 - > drivers/dfu/dfu_sf.c | 1 - > drivers/dfu/dfu_virt.c | 1 - > 8 files changed, 8 deletions(-) > > diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c > index 2adf26e2fe24..540d48fab77d 100644 > --- a/drivers/dfu/dfu.c > +++ b/drivers/dfu/dfu.c > @@ -6,7 +6,6 @@ > * author: Lukasz Majewski > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_alt.c b/drivers/dfu/dfu_alt.c > index ece3d2236f3d..e9132936a90b 100644 > --- a/drivers/dfu/dfu_alt.c > +++ b/drivers/dfu/dfu_alt.c > @@ -4,7 +4,6 @@ > * Lukasz Majewski > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c > index 12c54e90ef71..cfa6334e4397 100644 > --- a/drivers/dfu/dfu_mmc.c > +++ b/drivers/dfu/dfu_mmc.c > @@ -6,7 +6,6 @@ > * author: Lukasz Majewski > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c > index 485586989c8a..c36ac09189f3 100644 > --- a/drivers/dfu/dfu_mtd.c > +++ b/drivers/dfu/dfu_mtd.c > @@ -7,7 +7,6 @@ > * Based on dfu_nand.c > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c > index 08e8cf5cdb37..940cfefc986c 100644 > --- a/drivers/dfu/dfu_nand.c > +++ b/drivers/dfu/dfu_nand.c > @@ -9,7 +9,6 @@ > * author: Lukasz Majewski > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c > index c4f4bd2e482f..043acbf022fc 100644 > --- a/drivers/dfu/dfu_ram.c > +++ b/drivers/dfu/dfu_ram.c > @@ -8,7 +8,6 @@ > * author: Lukasz Majewski > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c > index 2dae15937064..7c1c0f9e2dc7 100644 > --- a/drivers/dfu/dfu_sf.c > +++ b/drivers/dfu/dfu_sf.c > @@ -3,7 +3,6 @@ > * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. > */ > > -#include > #include > #include > #include > diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c > index 29f7a08f6728..2c31445af12a 100644 > --- a/drivers/dfu/dfu_virt.c > +++ b/drivers/dfu/dfu_virt.c > @@ -2,7 +2,6 @@ > /* > * Copyright (C) 2019, STMicroelectronics - All Rights Reserved > */ > -#include > #include > #include > #include > -- > 2.34.1
Re: [PATCH 14/81] block: Remove and add needed includes
Hi Tom,
Thank you for the patch.
On mer., mai 01, 2024 at 19:30, Tom Rini wrote:
> Remove from this driver directory and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini
Reviewed-by: Mattijs Korpershoek
> ---
> Cc: Tom Rini
> Cc: Tobias Waldekranz
> Cc: Simon Glass
> Cc: Heinrich Schuchardt
> Cc: Marek Vasut
> Cc: Bin Meng
> Cc: Johan Jonker
> Cc: Kever Yang
> Cc: Dan Carpenter
> Cc: Mattijs Korpershoek
> ---
> drivers/block/blk-uclass.c | 1 -
> drivers/block/blk_legacy.c | 1 -
> drivers/block/blkcache.c | 1 -
> drivers/block/blkmap.c | 1 -
> drivers/block/efi-media-uclass.c | 1 -
> drivers/block/efi_blk.c | 1 -
> drivers/block/host-uclass.c | 1 -
> drivers/block/host_dev.c | 1 -
> drivers/block/ide.c | 1 -
> drivers/block/sandbox.c | 1 -
> drivers/block/sb_efi_media.c | 1 -
> 11 files changed, 11 deletions(-)
>
> diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
> index 77066da352a3..512c952f4d7a 100644
> --- a/drivers/block/blk-uclass.c
> +++ b/drivers/block/blk-uclass.c
> @@ -6,7 +6,6 @@
>
> #define LOG_CATEGORY UCLASS_BLK
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
> index 5bf1d0471524..f36932183d1f 100644
> --- a/drivers/block/blk_legacy.c
> +++ b/drivers/block/blk_legacy.c
> @@ -4,7 +4,6 @@
> * Written by Simon Glass
> */
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c
> index 26bcbea43533..0e69160249c7 100644
> --- a/drivers/block/blkcache.c
> +++ b/drivers/block/blkcache.c
> @@ -4,7 +4,6 @@
> * Author: Eric Nelson
> *
> */
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/blkmap.c b/drivers/block/blkmap.c
> index 21201409ed4b..34eed1380dca 100644
> --- a/drivers/block/blkmap.c
> +++ b/drivers/block/blkmap.c
> @@ -4,7 +4,6 @@
> * Author: Tobias Waldekranz
> */
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/efi-media-uclass.c
> b/drivers/block/efi-media-uclass.c
> index e012f6f2f4c4..dc5e4f59b7f3 100644
> --- a/drivers/block/efi-media-uclass.c
> +++ b/drivers/block/efi-media-uclass.c
> @@ -5,7 +5,6 @@
> * Copyright 2021 Google LLC
> */
>
> -#include
> #include
>
> UCLASS_DRIVER(efi_media) = {
> diff --git a/drivers/block/efi_blk.c b/drivers/block/efi_blk.c
> index 917a19f60254..9766cd6f8327 100644
> --- a/drivers/block/efi_blk.c
> +++ b/drivers/block/efi_blk.c
> @@ -8,7 +8,6 @@
> * Copyright 2021 Google LLC
> */
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/host-uclass.c b/drivers/block/host-uclass.c
> index b3647e3ce335..cf42bd1e07ac 100644
> --- a/drivers/block/host-uclass.c
> +++ b/drivers/block/host-uclass.c
> @@ -9,7 +9,6 @@
>
> #define LOG_CATEGORY UCLASS_HOST
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/host_dev.c b/drivers/block/host_dev.c
> index 52313435a0cb..b3ff3cd1fab9 100644
> --- a/drivers/block/host_dev.c
> +++ b/drivers/block/host_dev.c
> @@ -9,7 +9,6 @@
>
> #define LOG_CATEGORY UCLASS_HOST
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/ide.c b/drivers/block/ide.c
> index c698f9cbd558..b16623d7a3ab 100644
> --- a/drivers/block/ide.c
> +++ b/drivers/block/ide.c
> @@ -6,7 +6,6 @@
>
> #define LOG_CATEGORY UCLASS_IDE
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
> index be4e02cb601a..ec34f1ad8c2e 100644
> --- a/drivers/block/sandbox.c
> +++ b/drivers/block/sandbox.c
> @@ -3,7 +3,6 @@
> * Copyright (C) 2013 Henrik Nordstrom
> */
>
> -#include
> #include
> #include
> #include
> diff --git a/drivers/block/sb_efi_media.c b/drivers/block/sb_efi_media.c
> index 52af155a6001..3255db064961 100644
> --- a/drivers/block/sb_efi_media.c
> +++ b/drivers/block/sb_efi_media.c
> @@ -5,7 +5,6 @@
> * Copyright 2021 Google LLC
> */
>
> -#include
> #include
>
> static const struct udevice_id sandbox_efi_media_ids[] = {
> --
> 2.34.1
Re: [PATCH 073/149] board: intel: Remove and add needed includes
On Tue, Apr 30, 2024 at 08:42:00PM -0600, Tom Rini wrote: > Remove from this board vendor directory and when needed > add missing include files directly. Acked-by: Andy Shevchenko -- With Best Regards, Andy Shevchenko
Re: [PATCH 032/149] board: buffalo: Remove and add needed includes
On Wed May 1, 2024 at 4:41 AM CEST, Tom Rini wrote: > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Acked-by: Michael Walle
Re: [PATCH 080/149] board: kontron: Remove and add needed includes
On Wed May 1, 2024 at 4:42 AM CEST, Tom Rini wrote: > Remove from this board vendor directory and when needed > add missing include files directly. > > Signed-off-by: Tom Rini Acked-by: Michael Walle
Re: [PATCH v4 1/7] usb: dwc3: Add dwc3 glue driver for am62
Hi Martyn,
On mer., mai 01, 2024 at 14:56, Martyn Welch wrote:
> On Tue, 2024-01-16 at 11:22 +0100, Mattijs Korpershoek wrote:
>> > + /* Program PHY PLL refclk by reading syscon property */
>> > + ret = regmap_update_bits(syscon, args.args[0],
>> > PHY_PLL_REFCLK_MASK, rate_code);
>> > + if (ret) {
>>
>> The doc of ofnode_parse_phandle_with_args() states that:
>>
>> * Caller is responsible to call of_node_put() on the returned
>> out_args->np
>> * pointer.
>>
>> Should we call of_node_put(args->np); before returning here?
>>
>
> It doesn't seem that this is done in U-Boot as the definition of
> of_node_put() here is:
>
>/* Dummy functions to mirror Linux. These are not used in U-Boot */
>#define of_node_get(x) (x)
>static inline void of_node_put(const struct device_node *np) { }
Indeed, thank you for looking into this.
In that case,
Reviewed-by: Mattijs Korpershoek
>
> Martyn
>
>> Should the cleanup be done in case of success as well?
>>
>> With that fixed:
>>
>> Reviewed-by: Mattijs Korpershoek
>>
Re: [PATCH 78/81] watchdog: Remove and add needed includes
Hi Tom, Acked-by: Angelo Dureghello On 02/05/24 3:31 AM, Tom Rini wrote: Remove from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese Cc: Tom Rini Cc: Ryan Chen Cc: Chia-Wei Wang Cc: Aspeed BMC SW team Cc: Joel Stanley Cc: Michal Simek Cc: Alex Nemirovsky Cc: Huan Wang Cc: Angelo Dureghello Cc: Ryder Lee Cc: Weijie Gao Cc: Chunfeng Yun Cc: GSS_MTK_Uboot_upstream Cc: Simon Glass Cc: Priyanka Jain Cc: Michael Walle Cc: Patrick Delaunay Cc: Patrice Chotard --- drivers/watchdog/armada-37xx-wdt.c | 1 - drivers/watchdog/ast2600_wdt.c | 1 - drivers/watchdog/ast_wdt.c | 1 - drivers/watchdog/at91sam9_wdt.c | 1 - drivers/watchdog/bcm6345_wdt.c | 1 - drivers/watchdog/cdns_wdt.c | 1 - drivers/watchdog/cortina_wdt.c | 1 - drivers/watchdog/designware_wdt.c| 1 - drivers/watchdog/ftwdt010_wdt.c | 1 - drivers/watchdog/imx_watchdog.c | 1 - drivers/watchdog/mcf_wdt.c | 2 +- drivers/watchdog/mpc8xxx_wdt.c | 1 - drivers/watchdog/mt7621_wdt.c| 1 - drivers/watchdog/mtk_wdt.c | 1 - drivers/watchdog/omap_wdt.c | 1 - drivers/watchdog/orion_wdt.c | 1 - drivers/watchdog/rti_wdt.c | 1 - drivers/watchdog/s5p_wdt.c | 1 - drivers/watchdog/sandbox_alarm-wdt.c | 1 - drivers/watchdog/sandbox_wdt.c | 1 - drivers/watchdog/sbsa_gwdt.c | 1 - drivers/watchdog/sl28cpld-wdt.c | 1 - drivers/watchdog/sp805_wdt.c | 1 - drivers/watchdog/stm32mp_wdt.c | 1 - drivers/watchdog/tangier_wdt.c | 1 - drivers/watchdog/ulp_wdog.c | 1 - drivers/watchdog/wdt-uclass.c| 1 - drivers/watchdog/xilinx_tb_wdt.c | 1 - drivers/watchdog/xilinx_wwdt.c | 1 - 29 files changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c index e09f5ac9e34e..4b51178e1b8c 100644 --- a/drivers/watchdog/armada-37xx-wdt.c +++ b/drivers/watchdog/armada-37xx-wdt.c @@ -5,7 +5,6 @@ * Marek Behún */ -#include #include #include #include diff --git a/drivers/watchdog/ast2600_wdt.c b/drivers/watchdog/ast2600_wdt.c index bc9842089bea..190490f3692b 100644 --- a/drivers/watchdog/ast2600_wdt.c +++ b/drivers/watchdog/ast2600_wdt.c @@ -3,7 +3,6 @@ * Copyright (c) 2020 Aspeed Technology, Inc */ -#include #include #include #include diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c index f7b5a1adc108..e61e13fdc49d 100644 --- a/drivers/watchdog/ast_wdt.c +++ b/drivers/watchdog/ast_wdt.c @@ -3,7 +3,6 @@ * Copyright 2017 Google, Inc */ -#include #include #include #include diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 647ae325e9ae..c809a8936b89 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c index 677b1347ca7a..6ebe901c2b82 100644 --- a/drivers/watchdog/bcm6345_wdt.c +++ b/drivers/watchdog/bcm6345_wdt.c @@ -7,7 +7,6 @@ *Copyright (C) 2008 Florian Fainelli */ -#include #include #include #include diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c index 743ab6487bcd..cb5a786c5891 100644 --- a/drivers/watchdog/cdns_wdt.c +++ b/drivers/watchdog/cdns_wdt.c @@ -6,7 +6,6 @@ * Author(s): Shreenidhi Shedi */ -#include #include #include #include diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c index 7ab9d7b2db97..9f09ac0e15ff 100644 --- a/drivers/watchdog/cortina_wdt.c +++ b/drivers/watchdog/cortina_wdt.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index b22e0ee06a4e..bd9d7105366b 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -4,7 +4,6 @@ */ #include -#include #include #include #include diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index 1f5f301b1251..4769b967e527 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -14,7 +14,6 @@ * 22/08/2022 Port to DM */ -#include #include #include #include diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index 894158b304a7..ea770217e590 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -4,7 +4,6 @@ * Licensed under the GPL-2 or later. */ -#include #include #include #include diff --git a/drivers/watchdog/mcf_wdt.c b/drivers/watchdog/mcf_wdt.c index b36488bb5b96..5092a256af0c 100644 ---
Re: [PATCH 040/149] board: cobra5272: Remove and add needed includes
Hi Tom, Acked-by:Angelo Dureghello On 01/05/24 4:41 AM, Tom Rini wrote: Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Angelo Dureghello --- board/cobra5272/cobra5272.c | 2 +- board/cobra5272/flash.c | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c index 69a9df942311..774aa82b57fe 100644 --- a/board/cobra5272/cobra5272.c +++ b/board/cobra5272/cobra5272.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, w...@denx.de. */ -#include +#include #include #include #include diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 8416af163ad1..157b71da85e8 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -4,13 +4,17 @@ * Wolfgang Denk, DENX Software Engineering, w...@denx.de. */ -#include +#include #include #include #include #include +#include +#include #include +#include #include +#include #define PHYS_FLASH_1 CFG_SYS_FLASH_BASE #define FLASH_BANK_SIZE 0x20
Re: [PATCH v3 2/2] board: starfive: Rename spl_soc_init() to spl_dram_init()
On Thu, May 02, 2024 at 08:06:43AM +0200, Lukas Funke wrote: > [EXTERNAL MAIL] > > On 24.04.2024 13:01, Heinrich Schuchardt wrote: > > On 24.04.24 09:43, lukas.funke-...@weidmueller.com wrote: > > > From: Lukas Funke > > > > > > Rename spl_soc_init() to spl_dram_init() because the generic function > > > name does not reflect what the function actually does. Also > > > spl_dram_init() is commonly used for dram initialization and should be > > > called from board_init_f(). > > > > > > Signed-off-by: Lukas Funke > > > > Reviewed-by: Heinrich Schuchardt > Any objection on this one? Hi Lukas, This patch has been merged to u-boot-riscv. Thanks! Best regards, Leo
Re: [PATCH] configs: am62x_evm_r5: Increase size of malloc_simple heap after relocation
Hi Judith!
On Mon, 2024-04-29 at 16:49 -0500, Judith Mendez wrote:
> On AM62x SK we can see a boot failure with signature "alloc space
> exhausted", so fix by increasing size of SPL_STACK_R_MALLOC_SIMPLE_LEN.
>
> Fixes: 128f81290b ("arm: dts: k3: binman: am625: add support for signing
> TIFSSTUB Images")
> Signed-off-by: Judith Mendez
This also helped me to enable DFU on AM625, so:
Tested-by: Alexander Sverdlin
> ---
> configs/am62x_evm_r5_defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig
> index 4b2e57b13a0..648241488ed 100644
> --- a/configs/am62x_evm_r5_defconfig
> +++ b/configs/am62x_evm_r5_defconfig
> @@ -26,6 +26,7 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> CONFIG_SPL_BSS_START_ADDR=0x43c3b000
> CONFIG_SPL_BSS_MAX_SIZE=0x3000
> CONFIG_SPL_STACK_R=y
> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20
> CONFIG_SPL_SIZE_LIMIT=0x3A7F0
> CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500
> CONFIG_SPL_FS_FAT=y
--
Alexander Sverdlin
Siemens AG
www.siemens.com
Re: [PATCH v3 2/2] board: starfive: Rename spl_soc_init() to spl_dram_init()
On 24.04.2024 13:01, Heinrich Schuchardt wrote:
On 24.04.24 09:43, lukas.funke-...@weidmueller.com wrote:
From: Lukas Funke
Rename spl_soc_init() to spl_dram_init() because the generic function
name does not reflect what the function actually does. Also
spl_dram_init() is commonly used for dram initialization and should be
called from board_init_f().
Signed-off-by: Lukas Funke
Reviewed-by: Heinrich Schuchardt
---
Changes in v3:
- Reorganize patches such that each patch can be built individually
Changes in v2:
- capitalized acronym DRAM
arch/riscv/cpu/jh7110/spl.c | 2 +-
arch/riscv/include/asm/arch-jh7110/spl.h | 2 +-
board/starfive/visionfive2/spl.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/riscv/cpu/jh7110/spl.c b/arch/riscv/cpu/jh7110/spl.c
index 6bdf8b9c72..87aaf86524 100644
--- a/arch/riscv/cpu/jh7110/spl.c
+++ b/arch/riscv/cpu/jh7110/spl.c
@@ -28,7 +28,7 @@ static bool check_ddr_size(phys_size_t size)
}
}
-int spl_soc_init(void)
+int spl_dram_init(void)
{
int ret;
struct udevice *dev;
diff --git a/arch/riscv/include/asm/arch-jh7110/spl.h
b/arch/riscv/include/asm/arch-jh7110/spl.h
index 23ce8871b3..d73355bf35 100644
--- a/arch/riscv/include/asm/arch-jh7110/spl.h
+++ b/arch/riscv/include/asm/arch-jh7110/spl.h
@@ -7,6 +7,6 @@
#ifndef _SPL_STARFIVE_H
#define _SPL_STARFIVE_H
-int spl_soc_init(void);
+int spl_dram_init(void);
#endif /* _SPL_STARFIVE_H */
diff --git a/board/starfive/visionfive2/spl.c
b/board/starfive/visionfive2/spl.c
index 45848db6d8..ca61b5be22 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -285,9 +285,9 @@ int spl_board_init_f(void)
jh7110_jtag_init();
- ret = spl_soc_init();
+ ret = spl_dram_init();
if (ret) {
- debug("JH7110 SPL init failed: %d\n", ret);
+ debug("JH7110 DRAM init failed: %d\n", ret);
return ret;
}
Any objection on this one?
Re: [PATCH 010/149] board: Marvell: Remove and add needed includes
On 5/1/24 04:40, Tom Rini wrote: Remove from this board vendor directory and when needed add missing include files directly. Signed-off-by: Tom Rini --- Cc: Stefan Roese Cc: Chris Packham Cc: Tony Dinh Cc: Jason Cooper Cc: Siddarth Gore Cc: Aaron Williams --- arch/arm/mach-kirkwood/include/mach/mpp.h | 2 ++ board/Marvell/db-88f6720/db-88f6720.c | 1 - board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 1 - board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 1 - board/Marvell/dreamplug/dreamplug.c | 1 - board/Marvell/guruplug/guruplug.c | 1 - board/Marvell/mvebu_alleycat-5/board.c| 2 +- board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/Marvell/mvebu_armada-8k/board.c | 2 +- board/Marvell/octeontx2/soc-utils.c | 1 - board/Marvell/openrd/openrd.c | 1 - board/Marvell/sheevaplug/sheevaplug.c | 1 - 14 files changed, 7 insertions(+), 13 deletions(-) Reviewed-by: Stefan Roese Thanks, Stefan diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h index 4d1f58c0cbdf..e2757942590b 100644 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h @@ -8,6 +8,8 @@ #ifndef __KIRKWOOD_MPP_H #define __KIRKWOOD_MPP_H +#include + #define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281) ( \ /* MPP number */((_num) & 0xff) | \ /* MPP select value */ (((_sel) & 0xf) << 8) | \ diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c index 26c30647fbb0..920421366f11 100644 --- a/board/Marvell/db-88f6720/db-88f6720.c +++ b/board/Marvell/db-88f6720/db-88f6720.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Stefan Roese */ -#include #include #include #include diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c index 122c63d11f99..0f92cc385bc8 100644 --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Stefan Roese */ -#include +#include #include #include #include diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c index 1edc1cb6515c..8f8b2720107a 100644 --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Stefan Roese */ -#include +#include #include #include #include diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c index 9e1fdecfca4d..6bca1f91a0a4 100644 --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c @@ -3,7 +3,6 @@ * Copyright (C) 2014 Stefan Roese */ -#include #include #include #include diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c index 0abdca1cd210..a7a84798a53b 100644 --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Stefan Roese */ -#include #include #include #include diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index d15faa1cb7ff..381275061318 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -8,7 +8,6 @@ * Written-by: Siddarth Gore */ -#include #include #include #include diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index ea87ded222e6..7c3cea22b936 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -5,7 +5,6 @@ * Written-by: Siddarth Gore */ -#include #include #include #include diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c index 0c4f8e03b859..c1b7cc3b613c 100644 --- a/board/Marvell/mvebu_alleycat-5/board.c +++ b/board/Marvell/mvebu_alleycat-5/board.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 1685b12b8478..df3fb6d21645 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Stefan Roese */ -#include +#include #include #include #include diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index a8899af6e5af..6d7042117424 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -3,7 +3,7 @@
