June 2023 - U-Boot

[PATCH] lib/zlib: Fix a bug when getting a gzip header extra field
by Oleksandr Suvorov 15 Jul '23

15 Jul '23

This fixes CVE-2022-37434 [1] and bases on 2 commits from Mark Adler's zlib master repo - the original fix of CVE bug [2] and the fix for the fix [3]. [1] https://github.com/advisories/GHSA-cfmr-vrgj-vqwv [2] https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166be… [3] https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd… Fixes: e89516f031d ("zlib: split up to match original source tree") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> --- lib/zlib/inflate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/zlib/inflate.c b/lib/zlib/inflate.c index 30dfe155995..8f767b7b9d2 100644 --- a/lib/zlib/inflate.c +++ b/lib/zlib/inflate.c @@ -455,8 +455,9 @@ int ZEXPORT inflate(z_streamp strm, int flush) if (copy > have) copy = have; if (copy) { if (state->head != Z_NULL && - state->head->extra != Z_NULL) { - len = state->head->extra_len - state->length; + state->head->extra != Z_NULL && + (len = state->head->extra_len - state->length) < + state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy); -- 2.40.1

2 1

[PATCH] net: ti: am65-cpsw-nuss: Use dedicated port mode control registers
by Andreas Dannenberg 15 Jul '23

15 Jul '23

The different CPSW sub-system Ethernet ports have different PHY mode control registers. In order to allow the modes to get configured independently only the register for the port in question must be accessed, otherwise we would just be re-configuring the mode for port 1, while leaving all others at their power-on defaults. Fix this issue by adding a port-number based offset to the mode control base register address based on the fact that the control registers for the different ports are spaced exactly 0x4 bytes apart. Fixes: 9d0dca1199d1 ("net: ethernet: ti: Introduce am654 gigabit eth switch subsystem driver") Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> Reviewed-by: Siddharth Vadapalli <s-vadapalli(a)ti.com> --- Driver changes bench-tested on an SK-AM62 EVM by iterating through different variations of RGMII and RMII modes for CPSW ports 1 and 2 and checking operation as well as CTRL_ENET1_CTRL and CTRL_ENET2_CTRL control register contents from the U-Boot command line via 'md.l'. Testing was done on top of today's 'next' branch. drivers/net/ti/am65-cpsw-nuss.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index f674b0baa3..523a4c9f91 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -223,6 +223,8 @@ out: return phy->link; } +#define AM65_GMII_SEL_PORT_OFFS(x) (0x4 * ((x) - 1)) + #define AM65_GMII_SEL_MODE_MII 0 #define AM65_GMII_SEL_MODE_RMII 1 #define AM65_GMII_SEL_MODE_RGMII 2 @@ -233,11 +235,12 @@ static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv, phy_interface_t phy_mode, int slave) { struct am65_cpsw_common *common = priv->cpsw_common; + fdt_addr_t gmii_sel = common->gmii_sel + AM65_GMII_SEL_PORT_OFFS(slave); u32 reg; u32 mode = 0; bool rgmii_id = false; - reg = readl(common->gmii_sel); + reg = readl(gmii_sel); dev_dbg(common->dev, "old gmii_sel: %08x\n", reg); @@ -273,9 +276,9 @@ static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv, reg = mode; dev_dbg(common->dev, "gmii_sel PHY mode: %u, new gmii_sel: %08x\n", phy_mode, reg); - writel(reg, common->gmii_sel); + writel(reg, gmii_sel); - reg = readl(common->gmii_sel); + reg = readl(gmii_sel); if (reg != mode) dev_err(common->dev, "gmii_sel PHY mode NOT SET!: requested: %08x, gmii_sel: %08x\n", -- 2.34.1

3 3

[v1] disable NFS support by default
by Peter Robinson 15 Jul '23

15 Jul '23

While NFS is widely used in data centres, and private networks it's quite a nuanced usecase for device firmware. A lot of devices already disable it. Various network protocols should really be opt in, not opt out, because they add extra size and are potential attack vectors from a security PoV. In the NFS case it doesn't really make sense for a lot of devices like tables, SBCs etc. It's also something we don't really want for SystemReady-IR due to security concerns. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- v1: drop RFC tag cmd/Kconfig | 1 - configs/10m50_defconfig | 1 - configs/3c120_defconfig | 1 - configs/CMPC885_defconfig | 1 - configs/CMPCPRO_defconfig | 1 - configs/apalis-tk1_defconfig | 1 - configs/apalis_imx6_defconfig | 1 - configs/apalis_t30_defconfig | 1 - configs/bayleybay_defconfig | 1 - configs/beaver_defconfig | 1 - configs/bitmain_antminer_s9_defconfig | 1 - configs/brppt1_mmc_defconfig | 1 - configs/brppt2_defconfig | 1 - configs/brsmarc1_defconfig | 1 - configs/brxre1_defconfig | 1 - configs/cardhu_defconfig | 1 - configs/cei-tk1-som_defconfig | 1 - configs/cherryhill_defconfig | 1 - configs/chromebook_link64_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/chromebook_samus_defconfig | 1 - configs/chromebox_panther_defconfig | 1 - configs/cm_t43_defconfig | 1 - configs/colibri_imx6_defconfig | 1 - configs/colibri_t20_defconfig | 1 - configs/colibri_t30_defconfig | 1 - configs/colibri_vf_defconfig | 1 - configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 - configs/conga-qeval20-qa3-e3845_defconfig | 1 - configs/coreboot64_defconfig | 1 - configs/coreboot_defconfig | 1 - configs/corstone1000_defconfig | 1 - configs/cougarcanyon2_defconfig | 1 - configs/crownbay_defconfig | 1 - configs/dalmore_defconfig | 1 - configs/dfi-bt700-q7x-151_defconfig | 1 - configs/edison_defconfig | 1 - configs/efi-x86_payload32_defconfig | 1 - configs/efi-x86_payload64_defconfig | 1 - configs/galileo_defconfig | 1 - configs/gazerbeam_defconfig | 1 - configs/ge_bx50v3_defconfig | 1 - configs/harmony_defconfig | 1 - configs/jetson-tk1_defconfig | 1 - configs/malta64_defconfig | 1 - configs/malta64el_defconfig | 1 - configs/malta_defconfig | 1 - configs/maltael_defconfig | 1 - configs/medcom-wide_defconfig | 1 - configs/minnowmax_defconfig | 1 - configs/mscc_jr2_defconfig | 1 - configs/mscc_luton_defconfig | 1 - configs/mscc_ocelot_defconfig | 1 - configs/mscc_serval_defconfig | 1 - configs/mscc_servalt_defconfig | 1 - configs/mt7620_mt7530_rfb_defconfig | 1 - configs/mt7620_rfb_defconfig | 1 - configs/mt7621_nand_rfb_defconfig | 1 - configs/mt7621_rfb_defconfig | 1 - configs/mt7623a_unielec_u7623_02_defconfig | 1 - configs/mt7623n_bpir2_defconfig | 1 - configs/mt7628_rfb_defconfig | 1 - configs/mt7629_rfb_defconfig | 1 - configs/nyan-big_defconfig | 1 - configs/odroid_defconfig | 1 - configs/omap4_panda_defconfig | 1 - configs/omap4_sdp4430_defconfig | 1 - configs/p2371-0000_defconfig | 1 - configs/p2371-2180_defconfig | 1 - configs/p2571_defconfig | 1 - configs/p2771-0000-000_defconfig | 1 - configs/p2771-0000-500_defconfig | 1 - configs/p3450-0000_defconfig | 1 - configs/paz00_defconfig | 1 - configs/plutux_defconfig | 1 - configs/qemu-x86_64_defconfig | 1 - configs/qemu-x86_defconfig | 1 - configs/seaboard_defconfig | 1 - configs/smdkv310_defconfig | 1 - configs/sniper_defconfig | 1 - configs/socrates_defconfig | 1 - configs/som-db5800-som-6867_defconfig | 1 - configs/tec-ng_defconfig | 1 - configs/tec_defconfig | 1 - configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 - configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 - configs/theadorable-x86-dfi-bt700_defconfig | 1 - configs/trimslice_defconfig | 1 - configs/venice2_defconfig | 1 - configs/ventana_defconfig | 1 - configs/vexpress_ca9x4_defconfig | 1 - 91 files changed, 91 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 365371fb511..a193929cec4 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1848,7 +1848,6 @@ config CMD_RARP config CMD_NFS bool "nfs" - default y help Boot image via network using NFS protocol. diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index 54a67c5aa98..b76f31b009f 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_ITEST is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index fc73c0613d0..13da353d7eb 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_ITEST is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/CMPC885_defconfig b/configs/CMPC885_defconfig index f5bc6d6c004..54873daa156 100644 --- a/configs/CMPC885_defconfig +++ b/configs/CMPC885_defconfig @@ -51,7 +51,6 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_MTD=y CONFIG_CMD_NAND=y CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_MII_INIT=y CONFIG_CMD_PING=y diff --git a/configs/CMPCPRO_defconfig b/configs/CMPCPRO_defconfig index 80913e653be..d817274a936 100644 --- a/configs/CMPCPRO_defconfig +++ b/configs/CMPCPRO_defconfig @@ -136,7 +136,6 @@ CONFIG_CMD_MTD=y CONFIG_CMD_NAND=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y # CONFIG_CMD_SLEEP is not set diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 36d28a249cd..fda85c2d6ae 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -43,7 +43,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index d7342c4968b..eff4039b008 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -65,7 +65,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 516552584c7..83aab2450be 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 4e59d513cdc..a44c9b714be 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -37,7 +37,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 3820a333ecb..0d8a74be7aa 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index c38ba15cd03..3995d41ce1b 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -55,7 +55,6 @@ CONFIG_CMD_PART=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 2c9b0662159..653620263cd 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -64,7 +64,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_ITEST is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig index 00ef3d9908e..05ee4c5797e 100644 --- a/configs/brppt2_defconfig +++ b/configs/brppt2_defconfig @@ -56,7 +56,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_CACHE=y diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index 1e55ed7c60d..94943fccf1a 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -73,7 +73,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_ITEST is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 1c437e9743c..b50aef0aad9 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -63,7 +63,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_ITEST is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_MAY_FAIL=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 00fea793f92..4fe4621f037 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig index c00e6bec5a3..b920ac2ae40 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig index 4137b1c77e9..00799715e8f 100644 --- a/configs/cherryhill_defconfig +++ b/configs/cherryhill_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 8c75d654290..558609e13d6 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 3098857d6e1..96c26f1c377 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -37,7 +37,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 0d20891d2bc..4019c169a4c 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -39,7 +39,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 96c739cbfbc..f050d066be4 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index a307e83d1d4..12d010ab64b 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -62,7 +62,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_NFS is not set CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index e25cde9e5fa..3e193349e23 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -64,7 +64,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index cdf9e8b1d01..eb2e202f6f2 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index fed867a8eb2..8098ff7abc1 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index c47bfc801a2..4d4d0e4aaf4 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -51,7 +51,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT4=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 14f00b6212e..656d575998c 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -44,7 +44,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 613dcd3ca59..54dc59e8a13 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index 60a1924e9e5..8aadaa68c27 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index 058caf008f9..0f3512d23c6 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig index 2d391048cd6..112d502e91f 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_LOADM=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_RTC=y CONFIG_CMD_TIME=y diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 47834bb6fef..da5ff5573d0 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 69ad017f987..70e1a50a244 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 936787bb39c..92f4436eebd 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 14e6e6c2d84..9313e7fbd12 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/edison_defconfig b/configs/edison_defconfig index 00342aace9a..8692a8a9995 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIMER=y CONFIG_CMD_HASH=y CONFIG_CMD_EXT4=y diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig index a5c629b46f3..4149eea6cf6 100644 --- a/configs/efi-x86_payload32_defconfig +++ b/configs/efi-x86_payload32_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index 5cde04a5ac9..d41f73cccfc 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 0d2ebdab926..c6d989ea6ef 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -29,7 +29,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig index c8c8469d8a6..7901a195aa7 100644 --- a/configs/gazerbeam_defconfig +++ b/configs/gazerbeam_defconfig @@ -123,7 +123,6 @@ CONFIG_SYS_LOADS_BAUD_CHANGE=y CONFIG_CMD_MMC=y CONFIG_CMD_AXI=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index f005e91e0bc..2ef560ccaa4 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index b1d9399b860..8b49505a650 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index b2a39e0c844..d8086281582 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index 03de1616840..a69e1934fe8 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_IDE=y CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 3ea9fa9857e..21a291d341c 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_IDE=y CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 317b422a6b6..8c76ebbb155 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_IDE=y CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 3e4d2beda2f..4abd3b15580 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_IDE=y CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index 47fcf1574e4..e99bb8f5b52 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 6082b8d70d6..8347a9dcecf 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -43,7 +43,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index b30b804dbf2..e3ff906098a 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -44,7 +44,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y # CONFIG_NET_TFTP_VARS is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi_flash" diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index 9a1e0c3e064..e811bc97e1f 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -46,7 +46,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y # CONFIG_NET_TFTP_VARS is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_MTDPARTS=y diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index a372b21f66b..f3246f22196 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -44,7 +44,6 @@ CONFIG_CMD_MTD=y CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y # CONFIG_NET_TFTP_VARS is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi_flash" diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index 055ed68305a..4ff7933717b 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y # CONFIG_NET_TFTP_VARS is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi_flash" diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 6e225a69389..5f6ed73c2ed 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y # CONFIG_NET_TFTP_VARS is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi_flash" diff --git a/configs/mt7620_mt7530_rfb_defconfig b/configs/mt7620_mt7530_rfb_defconfig index 96f10926b13..af9df547d57 100644 --- a/configs/mt7620_mt7530_rfb_defconfig +++ b/configs/mt7620_mt7530_rfb_defconfig @@ -38,7 +38,6 @@ CONFIG_SYS_BOOTM_LEN=0x1000000 CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SPI=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y # CONFIG_CMD_MDIO is not set CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt-parent interrupts resets reset-names" diff --git a/configs/mt7620_rfb_defconfig b/configs/mt7620_rfb_defconfig index d96da91df36..fe57fd1892d 100644 --- a/configs/mt7620_rfb_defconfig +++ b/configs/mt7620_rfb_defconfig @@ -39,7 +39,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y # CONFIG_CMD_MDIO is not set CONFIG_CMD_FAT=y diff --git a/configs/mt7621_nand_rfb_defconfig b/configs/mt7621_nand_rfb_defconfig index 5291bb300e4..368bf800968 100644 --- a/configs/mt7621_nand_rfb_defconfig +++ b/configs/mt7621_nand_rfb_defconfig @@ -49,7 +49,6 @@ CONFIG_CMD_MTD=y CONFIG_CMD_PART=y # CONFIG_CMD_PINMUX is not set CONFIG_CMD_USB=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/mt7621_rfb_defconfig b/configs/mt7621_rfb_defconfig index b50fbec92dd..49c9e7411d8 100644 --- a/configs/mt7621_rfb_defconfig +++ b/configs/mt7621_rfb_defconfig @@ -47,7 +47,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PART=y # CONFIG_CMD_PINMUX is not set CONFIG_CMD_SPI=y -# CONFIG_CMD_NFS is not set CONFIG_DOS_PARTITION=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_ISO_PARTITION is not set diff --git a/configs/mt7623a_unielec_u7623_02_defconfig b/configs/mt7623a_unielec_u7623_02_defconfig index a7687b54f0c..20c84d65df7 100644 --- a/configs/mt7623a_unielec_u7623_02_defconfig +++ b/configs/mt7623a_unielec_u7623_02_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_READ=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 62a17f2cbc7..5e7c1fefadb 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_READ=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/mt7628_rfb_defconfig b/configs/mt7628_rfb_defconfig index 0e100fca498..7e5b76c590a 100644 --- a/configs/mt7628_rfb_defconfig +++ b/configs/mt7628_rfb_defconfig @@ -37,7 +37,6 @@ CONFIG_SYS_BOOTM_LEN=0x1000000 CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SPI=y -# CONFIG_CMD_NFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index ea8d77c0a26..0e3bd4ffa7b 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -48,7 +48,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index a9c10cdbb0b..cc64facd5f2 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -45,7 +45,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index ce0c47e505d..b1943cfd39b 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_PMIC=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index e27e27d0143..5571722ea6d 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 909f10ee790..0a8a1c77ea4 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -29,7 +29,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 7e75f44c743..dcfd3eb99a5 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 2543a2d11f8..5b91631367b 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 47a0a62d252..7e2829e3a0d 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -29,7 +29,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig index e3b978eb1ed..ae235058afd 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig index c99a24eef40..0ea47192dda 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig index e280be8f2ec..b0d538f0f83 100644 --- a/configs/p3450-0000_defconfig +++ b/configs/p3450-0000_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_PREFER_SERVERIP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index fadf7fdeb07..8c125c39b2f 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 4fee9df94f8..ab9aef5e478 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index f29a5aa0f81..6a539a859e0 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -47,7 +47,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 9bf29647fe5..a7c37b8b0e1 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIME=y CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 00cca911710..f8759f25546 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index cc0ecad11b3..2f466d23a54 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -27,7 +27,6 @@ CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_SLEEP is not set CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index f6b59a6e9b8..c762d75aec1 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_I2C_LEGACY=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index 6b67021064a..7727e4669d7 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -57,7 +57,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index ad95274879a..4a149133db6 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 442cee33a9f..4776e92683d 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -34,7 +34,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/tec_defconfig b/configs/tec_defconfig index 461c46c725d..8a5d959a5c0 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 43dab09316e..69499e17f4c 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index 5aec52733e6..e2e64b74349 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -37,7 +37,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index d5a28a2df4b..751ae3497ec 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index d94a0b408b5..9ec08bda883 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index fd538da3ac5..ebd1754fc8b 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 5e2ff877ca8..2da8ba94d62 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -29,7 +29,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 4ee64c332b3..5cacecc7cbc 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y -# CONFIG_CMD_NFS is not set # CONFIG_CMD_SLEEP is not set CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y -- 2.41.0

3 3

[PATCH] env: mmc: statically set the environment partition name
by Emmanuel Di Fede 15 Jul '23

15 Jul '23

The new opt-out setting, CONFIG_ENV_MMC_PARTITION, statically sets the MMC environment partition name. Prior to this patch, the only way to declare this partition name was by creating a 'u-boot,mmc-env-partition' parameter in the device-tree's /config node. This setting provides additional flexibility, particularly in cases where accessing the device-tree is not straightforward (e.g. QEMU). If undeclared, the device-tree's setting will be used. Signed-off-by: Emmanuel Di Fede <emmanuel.difede(a)cysec.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- doc/device-tree-bindings/config.txt | 2 ++ env/Kconfig | 8 ++++++++ env/mmc.c | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/device-tree-bindings/config.txt b/doc/device-tree-bindings/config.txt index 3151778b2c..f50c68bbdc 100644 --- a/doc/device-tree-bindings/config.txt +++ b/doc/device-tree-bindings/config.txt @@ -76,6 +76,8 @@ u-boot,mmc-env-partition (int) precedence. In that case, only if the partition is not found, mmc-env-offset* will be tried. + Note that CONFIG_ENV_MMC_PARTITION overrides this device-tree setting. + u-boot,no-apm-finalize (bool) For x86 devices running on coreboot, this tells U-Boot not to lock down the Intel Management Engine (ME) registers. This allows U-Boot to diff --git a/env/Kconfig b/env/Kconfig index 2bbe4c466a..de38b00bd1 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -659,6 +659,14 @@ config SYS_MMC_ENV_PART partition 0 or the first boot partition, which is 1 or some other defined partition. +config ENV_MMC_PARTITION + string "mmc environment partition name" + depends on ENV_IS_IN_MMC + help + MMC partition name used to save environment variables. + If this variable is unset, u-boot will try to get the env partition name + from the DTB's /config node. + config ENV_MMC_USE_DT bool "Read partition name and offset in DT" depends on ENV_IS_IN_MMC && OF_CONTROL diff --git a/env/mmc.c b/env/mmc.c index 7a5836ad66..887df61fbe 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -114,8 +114,13 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy) if (IS_ENABLED(CONFIG_SYS_MMC_ENV_PART)) hwpart = mmc_get_env_part(mmc); - /* look for the partition in mmc CONFIG_SYS_MMC_ENV_DEV */ - str = ofnode_conf_read_str(dt_prop.partition); + if (IS_ENABLED(CONFIG_ENV_MMC_PARTITION)) { + str = CONFIG_ENV_MMC_PARTITION; + } else { + /* look for the partition in mmc CONFIG_SYS_MMC_ENV_DEV */ + str = ofnode_conf_read_str(dt_prop.partition); + } + if (str) { /* try to place the environment at end of the partition */ err = mmc_offset_try_partition(str, copy, &val); -- 2.41.0

3 3

[PATCH] firmware: scmi: return a right errno for SCMI status code
by AKASHI Takahiro 15 Jul '23

15 Jul '23

scmi_to_linux_errno() is set to return an appropriate errno which corresponds to a given SCMI status code. But the current implementation always returns the same value. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- drivers/firmware/scmi/scmi_agent-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c index 54d563d929b8..02de692d66f3 100644 --- a/drivers/firmware/scmi/scmi_agent-uclass.c +++ b/drivers/firmware/scmi/scmi_agent-uclass.c @@ -46,7 +46,7 @@ int scmi_to_linux_errno(s32 scmi_code) for (n = 0; n < ARRAY_SIZE(scmi_linux_errmap); n++) if (scmi_code == scmi_linux_errmap[n].scmi) - return scmi_linux_errmap[1].errno; + return scmi_linux_errmap[n].errno; return -EPROTO; } -- 2.41.0

2 2

[PATCH] hash: fix a memory leak
by Sergei Antonov 15 Jul '23

15 Jul '23

memalign() returns a pointer which is to be freed by free(). To call unmap_sysmem() is incorrect, furthermore it was called in a wrong scope. Also add a check for allocation error. Fixes: d7af2baa49c6 ("crypto/fsl: Fix HW accelerated hash commands") Cc: Breno Lima <breno.lima(a)nxp.com> Signed-off-by: Sergei Antonov <saproj(a)gmail.com> --- common/hash.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/hash.c b/common/hash.c index 9a52d6073ceb..cbffdfd6db36 100644 --- a/common/hash.c +++ b/common/hash.c @@ -586,6 +586,8 @@ int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, output = memalign(ARCH_DMA_MINALIGN, sizeof(uint32_t) * HASH_MAX_DIGEST_SIZE); + if (!output) + return CMD_RET_FAILURE; buf = map_sysmem(addr, len); algo->hash_func_ws(buf, len, output, algo->chunk_size); @@ -602,6 +604,7 @@ int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, flags & HASH_FLAG_ENV)) { printf("ERROR: %s does not contain a valid " "%s sum\n", *argv, algo->name); + free(output); return 1; } if (memcmp(output, vsum, algo->digest_size) != 0) { @@ -612,6 +615,7 @@ int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, for (i = 0; i < algo->digest_size; i++) printf("%02x", vsum[i]); puts(" ** ERROR **\n"); + free(output); return 1; } } else { @@ -622,10 +626,10 @@ int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, store_result(algo, output, *argv, flags & HASH_FLAG_ENV); } - unmap_sysmem(output); - } + free(output); + /* Horrible code size hack for boards that just want crc32 */ } else { ulong crc; -- 2.37.2

3 2

[PATCH] clk: scmi: claim the dependency on CONFIG_CLK
by AKASHI Takahiro 15 Jul '23

15 Jul '23

Without CONFIG_CLK, the build fails with the following message: LD u-boot aarch64-none-linux-gnu-ld.bfd: drivers/firmware/scmi/scmi_agent-uclass.o: \ in function `scmi_bind_protocols': .../drivers/firmware/scmi/scmi_agent-uclass.c:79: undefined reference to \ `_u_boot_list_2_driver_2_scmi_clock' Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- drivers/clk/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 3ad5af964f3f..29859cdfa158 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -160,6 +160,7 @@ config SANDBOX_CLK_CCF config CLK_SCMI bool "Enable SCMI clock driver" + depends on CLK depends on SCMI_FIRMWARE help Enable this option if you want to support clock devices exposed -- 2.41.0

3 3

[PATCH v1 0/4] fix type error and add feature to boot to kernel
by Jim Liu 15 Jul '23

15 Jul '23

fix type error and add feature to boot to kernel Jim Liu (4): ARM: config: Enable config to decompress the FIT image board: nuvoton: add env setting for boot to linux ARM: dts: npcm8xx: fix dts node error misc: nuvoton: fix type error arch/arm/dts/nuvoton-npcm8xx-u-boot.dtsi | 33 ++++++++++++------------ board/nuvoton/poleg_evb/poleg_evb.c | 7 +++++ configs/poleg_evb_defconfig | 3 +++ drivers/misc/npcm_otp.c | 2 +- include/configs/poleg.h | 2 ++ 5 files changed, 30 insertions(+), 17 deletions(-) -- 2.17.1

2 5

[PATCH] stdio: Remove stdio_init()
by Masahiro Yamada 15 Jul '23

15 Jul '23

This function is not used by anyone. Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> --- common/stdio.c | 8 -------- include/stdio_dev.h | 7 ------- 2 files changed, 15 deletions(-) diff --git a/common/stdio.c b/common/stdio.c index cbedfdda53..894cbd3fb4 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -386,11 +386,3 @@ int stdio_add_devices(void) return 0; } - -int stdio_init(void) -{ - stdio_init_tables(); - stdio_add_devices(); - - return 0; -} diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 3105928970..77bf8a8970 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -84,13 +84,6 @@ int stdio_init_tables(void); */ int stdio_add_devices(void); -/** - * stdio_init() - Sets up stdio ready for use - * - * This calls stdio_init_tables() and stdio_add_devices() - */ -int stdio_init(void); - void stdio_print_current_devices(void); /** -- 2.39.2

3 4

[PATCH v2 0/9] rockchip: Fix PCIe and NVMe support on RK3568
by Jonas Karlman 15 Jul '23

15 Jul '23

This series fixes and enables PCIe and NVMe support on RK3568. Patch 1 adds a dev_read_addr_size_index_ptr function. Patch 2-3 fixes main issue in the driver to be usable on RK3568. Patch 4 fixes a long wait time during probe when no device is attached. Patch 5 hides BARs of the root complex that could claim the entire memory region during PCI autoconfig. Patch 6 adds support for the gpios prop to the fixed regulators driver. Patch 7 adds a missing clock to the clock driver. Patch 8 enables PCIe and NVMe support on rk3568-rock-3a. Patch 9 updates the device tree with new reg and ranges values. For a clean apply of patch 8, the series at [1] may be needed. I have tested that a Samsung 970 EVO NVMe is detected on a ROCK 3A, BusDevFun VendorId DeviceId Device Class Sub-Class 00.00.00 0x1d87 0x3566 Bridge device 0x04 01.00.00 0x144d 0xa808 Mass storage controller 0x08 and I have also verified that the network controller continues to be detected on a ROCK 5B. BusDevFun VendorId DeviceId Device Class Sub-Class 00.00.00 0x1d87 0x3588 Bridge device 0x04 01.00.00 0x10ec 0x8125 Network controller 0x00 Changes in v2: - Rebased on custodians/u-boot-rockchip master branch and the defconfig and spi v2 series at [1]. - Drop dependency on basic reference counting of gpio regulators series, pcie2x1 is disabled for rk3568-rock-3a to avoid a system freeze due to disable of a shared vpcie3v3-supply regulator while in use by pcie3x2. - Add and use dev_read_addr_size_index_ptr function. - Update commit messages. - Collect r-b tags. This series can also be found at [2]. [1] https://patchwork.ozlabs.org/project/uboot/cover/20230517182624.1765359-1-j… [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-pcie-v2 Jonas Karlman (9): core: read: add dev_read_addr_size_index_ptr function pci: pcie_dw_rockchip: Get config region from reg prop pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed pci: pcie_dw_rockchip: Speed up link probe pci: pcie_dw_rockchip: Hide BARs of the root complex regulator: fixed: Add support for gpios prop rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support rockchip: rk3568-rock-3a: Enable PCIe and NVMe support rockchip: rk356x: Update PCIe config, IO and memory regions arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 16 ++++ arch/arm/dts/rk3568.dtsi | 14 +-- arch/arm/dts/rk356x.dtsi | 7 +- configs/rock-3a-rk3568_defconfig | 4 + drivers/clk/rockchip/clk_rk3568.c | 1 + drivers/core/read.c | 11 +++ drivers/pci/pcie_dw_common.c | 10 +- drivers/pci/pcie_dw_rockchip.c | 120 +++++++++++++++--------- drivers/power/regulator/fixed.c | 5 +- include/dm/read.h | 21 +++++ 10 files changed, 153 insertions(+), 56 deletions(-) -- 2.40.1

2 15