January 2022 - U-Boot

[PATCH v2 0/5] DFU: Update dfu_alt_info parser etc.
by Masami Hiramatsu 10 Aug '22

10 Aug '22

Hi, Here is the 2nd version of improving DFU subsystem series. This improves dfu_alt_info parser and fixing documents etc. In this version I fixed a build error of cmd/dfu.c so that it can be build without DFU_OVER_USB and DFU_OVER_TFTP (in this case, the platform will use the DFU only for EFI capsule update.) When I was debuging my patch for updating dfu_alt_info on the DeveloperBox platform, I found that dfu_alt_info parser didn't accept redundant spaces and tabs. Also the dfu.rst description seems wrong. Moreover, there is no way to check whether the parser parses the dfu_alt_info correctly. These patches fixes such issues. [1/5] is just for avoiding buffer overrun, [2/5] and [3/5] improves dfu_alt_info parser to accept redundant spaces and tabs, and check the number of arguments strictly so that the parser (and user) can notice any unexpected parameters. [4/5] fixes the documents (there seems some wrong description maybe coming from copy&paste). [5/5] allows user to run 'dfu list' even if the platform doesn't support DFU_OVER_USB nor DFU_OVER_TFTP. Thank you, --- Masami Hiramatsu (5): DFU: Do not copy the entity name over the buffer size DFU: Accept redundant spaces and tabs in dfu_alt_info DFU: Check the number of arguments and argument string strictly doc: usage: DFU: Fix dfu_alt_info document cmd/dfu: Enable 'dfu list' command without DFU_OVER_USB cmd/dfu.c | 8 +++---- doc/usage/dfu.rst | 57 ++++++++++++++++++++++++++++++++++-------------- drivers/dfu/dfu.c | 37 ++++++++++++++++++++++++------- drivers/dfu/dfu_mmc.c | 55 +++++++++++++++++++++++++++------------------- drivers/dfu/dfu_mtd.c | 34 +++++++++++++++++++---------- drivers/dfu/dfu_nand.c | 34 ++++++++++++++++++----------- drivers/dfu/dfu_ram.c | 24 ++++++++++---------- drivers/dfu/dfu_sf.c | 34 ++++++++++++++++++----------- drivers/dfu/dfu_virt.c | 5 +++- include/dfu.h | 33 ++++++++++++++++++---------- 10 files changed, 205 insertions(+), 116 deletions(-) -- Masami Hiramatsu <masami.hiramatsu(a)linaro.org>

4 12

[PATCH] net: bootp: Make root path (option 17) length configurable
by Andre Kalb 08 Aug '22

08 Aug '22

to adjust the root path length. Eg to 256 from Linux Kernel Signed-off-by: Andre Kalb <andre.kalb(a)sma.de> --- include/net.h | 2 +- net/Kconfig | 6 ++++++ net/bootp.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/net.h b/include/net.h index b02e4f630c..6f3f3dfcd4 100644 --- a/include/net.h +++ b/include/net.h @@ -540,7 +540,7 @@ extern struct in_addr net_dns_server2; #endif extern char net_nis_domain[32]; /* Our IS domain */ extern char net_hostname[32]; /* Our hostname */ -extern char net_root_path[64]; /* Our root path */ +extern char net_root_path[CONFIG_BOOTP_MAX_ROOT_PATH_LEN]; /* Our root path */ /** END OF BOOTP EXTENTIONS **/ extern u8 net_ethaddr[ARP_HLEN]; /* Our ethernet address */ extern u8 net_server_ethaddr[ARP_HLEN]; /* Boot server enet address */ diff --git a/net/Kconfig b/net/Kconfig index 2ae9d6a020..553e271ce9 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -123,4 +123,10 @@ config BOOTP_SERVERIP variable, not the BOOTP server. This affects the operation of both bootp and tftp. +config BOOTP_MAX_ROOT_PATH_LEN + int "Option 17 root path length" + default 64 + help + Select maximal length of option 17 root path. + endif # if NET diff --git a/net/bootp.c b/net/bootp.c index d83e4eb0ba..1566fc5495 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -64,7 +64,7 @@ ulong bootp_start; ulong bootp_timeout; char net_nis_domain[32] = {0,}; /* Our NIS domain */ char net_hostname[32] = {0,}; /* Our hostname */ -char net_root_path[64] = {0,}; /* Our bootpath */ +char net_root_path[CONFIG_BOOTP_MAX_ROOT_PATH_LEN] = {0,}; /* Our bootpath */ static ulong time_taken_max; -- 2.31.1

3 2

[ANN] U-Boot v2022.01-rc3 released
by Tom Rini 06 Jul '22

06 Jul '22

Hey all, It's been two weeks since v2022.01-rc2, so here's -rc3. To repeat what I said with -rc2, we've enabled issue tracking on our gitlab instance. You can sign up and then be able to file issues at: https://source.denx.de/groups/u-boot/-/issues This is intended for everyone to be able to use, both custodians for their own needs (you can see for example Heinrich has filed something for UEFI and LMB) as well as users to just report bugs so they don't feel like they're lost in the mailing list. As noted with the last release, the -next branch is open and I'll sync in -rc3 shortly. Please feel free to get a PR ready now if you're able. In terms of a changelog, git log --merges v2022.01-rc2..v2022.01-rc3 contains what I've pulled but as always, better PR messages and tags will provide better results here. So we're now looking at regular releases every other Monday, and with final release on January 10th, 2022. Thanks all! -- Tom

2 5

[RFC PATCH] tools: kwbimage: Allow to disable compilation of kwbimage on non-mvebu platforms
by Pali Rohár 27 Jun '22

27 Jun '22

kwbimage depends on libcrypto. 32-bit mvebu platforms (except Orion and Discovery, which are not in mach-mvebu) require kwimage for building SPL. Some users want to compile u-boot tools without libcrypto. Therefore add a new symbol CONFIG_TOOLS_KWBIMAGE which controls compilation of kwbimage and define correct dependences between mvebu, kwbimage and libcrypto targets. This allows disabling of kwbimage compilation on non-mvebu platforms. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- arch/arm/mach-mvebu/Kconfig | 1 + tools/Kconfig | 5 +++++ tools/Makefile | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 54dff9986b41..1ccbccea1dda 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -15,6 +15,7 @@ config ARMADA_32BIT select SPL_SIMPLE_BUS if SPL select SUPPORT_SPL select TRANSLATION_OFFSET + select TOOLS_KWBIMAGE if SPL config ARMADA_64BIT bool diff --git a/tools/Kconfig b/tools/Kconfig index 91ce8ae3e516..40866c5713d9 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -25,6 +25,11 @@ config TOOLS_LIBCRYPTO This selection does not affect target features, such as runtime FIT signature verification. +config TOOLS_KWBIMAGE + bool "Enable kwbimage support in host tools" + default y + depends on TOOLS_LIBCRYPTO + config TOOLS_FIT def_bool y help diff --git a/tools/Makefile b/tools/Makefile index 75d8fe71d668..08f1f5a51fb3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -118,7 +118,6 @@ dumpimage-mkimage-objs := aisimage.o \ imximage.o \ imx8image.o \ imx8mimage.o \ - kwbimage.o \ lib/md5.o \ lpc32xximage.o \ mxsimage.o \ @@ -150,6 +149,10 @@ dumpimage-mkimage-objs := aisimage.o \ $(RSA_OBJS-y) \ $(AES_OBJS-y) +ifdef CONFIG_TOOLS_KWBIMAGE +dumpimage-mkimage-objs += kwbimage.o +endif + dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o mkimage-objs := $(dumpimage-mkimage-objs) mkimage.o fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o -- 2.20.1

3 7

[BUG] RockPro64 not booting since 3ae64582fb
by Aleksei 05 Jun '22

05 Jun '22

Hi U-boot developers, I'm booting RockPro64 by writing compiled u-boot-rockchip.bin to SD card offset 64 as described in doc/board/rockchip/rockchip.rst. There is a USB flash drive plugged into USB2 port containing ext4 filesystem with extlinux/exlinux.conf and a kernel+initrd images. This setup boots fine on 02ce99ec91 but not on the next 3ae64582fb. It gets stuck on "Booting using the fdt blob at 0x1f000000". Let me know if I can help debug this. I have a "daily driver" RockPro64 v2.1, can pull from git repos/branches or apply patches to source tree - whichever you prefer. Best regards, Aleksei, U-boot user

4 5

[PATCH] cmd: pxe_utils: Check fdtcontroladdr in label_boot
by Peter Hoyes 23 May '22

23 May '22

From: Peter Hoyes <Peter.Hoyes(a)arm.com> If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too. We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup. Signed-off-by: Peter Hoyes <Peter.Hoyes(a)arm.com> --- cmd/pxe_utils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 067c24e5ff..8f8e69ca97 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) * Scenario 2: If there is an fdt_addr specified, pass it along to * bootm, and adjust argc appropriately. * - * Scenario 3: fdt blob is not available. + * Scenario 3: If there is an fdtcontroladdr specified, pass it along to + * bootm, and adjust argc appropriately. + * + * Scenario 4: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (!bootm_argv[3]) + bootm_argv[3] = env_get("fdtcontroladdr"); + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; -- 2.25.1

7 12

[U-Boot] [PATCH 1/2] rockchip: rk3399: fix force power on reset
by Vasily Khoruzhick 19 May '22

19 May '22

Currently code doesn't even compile since it uses wrong define for ifdef. Fix that and also add missing include Fixes: 07586ee4322a ("rockchip: rk3399: Support common spl_board_init") Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- arch/arm/mach-rockchip/rk3399/rk3399.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 863024d071..eeb99dd11b 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -11,6 +11,7 @@ #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> #include <asm/arch-rockchip/gpio.h> #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/hardware.h> @@ -213,7 +214,7 @@ void spl_perform_fixups(struct spl_image_info *spl_image) "u-boot,spl-boot-device", boot_ofpath); } -#if defined(SPL_GPIO_SUPPORT) +#if defined(CONFIG_SPL_GPIO_SUPPORT) static void rk3399_force_power_on_reset(void) { ofnode node; @@ -239,7 +240,7 @@ static void rk3399_force_power_on_reset(void) void spl_board_init(void) { -#if defined(SPL_GPIO_SUPPORT) +#if defined(CONFIG_SPL_GPIO_SUPPORT) struct rk3399_cru *cru = rockchip_get_cru(); /* -- 2.24.0

5 23

[PATCH 1/4] Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
by Marek Behún 18 May '22

18 May '22

From: Marek Behún <marek.behun(a)nic.cz> In preparation for moving this option to Kconfig, rename it to be consistent with other USB EHCI Kconfig options. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> --- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- drivers/usb/host/ehci-hcd.c | 2 +- include/configs/clearfog.h | 2 +- include/configs/controlcenterdc.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/ds414.h | 2 +- include/configs/helios4.h | 2 +- include/configs/mxs.h | 2 +- include/configs/nas220.h | 2 +- include/configs/tegra114-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra210-common.h | 2 +- include/configs/tegra30-common.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/tplink_wdr4300.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/x530.h | 2 +- include/configs/zynq-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index 9002e26d75..f262d70b14 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -66,7 +66,7 @@ * USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ /* diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index ba75c27d04..e6355263cb 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -108,7 +108,7 @@ static struct descriptor { }, }; -#if defined(CONFIG_EHCI_IS_TDI) +#if defined(CONFIG_USB_EHCI_IS_TDI) #define ehci_is_TDI() (1) #else #define ehci_is_TDI() (0) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 705217067b..a12e1582d6 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -19,7 +19,7 @@ */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_ENV_MIN_ENTRIES 128 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index efd04c6fb8..12e9b8d06d 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -28,7 +28,7 @@ CONFIG_SYS_SCSI_MAX_LUN) /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h index 3feaa60eda..5300467a76 100644 --- a/include/configs/crs3xx-98dx3236.h +++ b/include/configs/crs3xx-98dx3236.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 95f5cf0056..76c02f6656 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -20,7 +20,7 @@ #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* Environment in SPI NOR flash */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 41216b8b4f..c5f0a1d2e0 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -11,7 +11,7 @@ */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6bae063ae4..ecda30bab5 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -23,7 +23,7 @@ CONFIG_SYS_SCSI_MAX_LUN) /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 48471993b8..defe480613 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -21,7 +21,7 @@ #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* Environment in SPI NOR flash */ diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h index 2c543fe12a..206afae590 100644 --- a/include/configs/db-xc3-24g4xg.h +++ b/include/configs/db-xc3-24g4xg.h @@ -13,7 +13,7 @@ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 58ecc5f699..85abed5d3b 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -25,7 +25,7 @@ #endif /* USB/EHCI/XHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/helios4.h b/include/configs/helios4.h index b5814ed55c..7ed70602d1 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -19,7 +19,7 @@ */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_ENV_MIN_ENTRIES 128 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index b5c525dc78..330ac42402 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -129,7 +129,7 @@ /* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI_MXS -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif #endif /* __CONFIGS_MXS_H__ */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 16bbc9b049..f071ee6e1c 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -65,7 +65,7 @@ */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ /* diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index f714c52bb5..06b687d556 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -58,7 +58,7 @@ #define CONFIG_SPL_STACK 0x800ffffc /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 #endif /* _TEGRA114_COMMON_H_ */ diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index 4a92954c9b..de78ac9924 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -60,7 +60,7 @@ #define CONFIG_SPL_STACK 0x800ffffc /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 /* GPU needs setup */ diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 19934a4cf0..d2bed64ccd 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -78,7 +78,7 @@ * packets depending on the buffer address and size. */ #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_SYS_NAND_SELF_INIT diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index b9e04147be..6c58ccc3d5 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -47,7 +47,7 @@ "ramdisk_addr_r=0x83200000\0" /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 /* GPU needs setup */ diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 0ee13a226d..56b2671e43 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -55,7 +55,7 @@ #define CONFIG_SPL_STACK 0x800ffffc /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 #endif /* _TEGRA30_COMMON_H_ */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 64b7f25092..073855592b 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -29,7 +29,7 @@ #define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* Environment in SPI NOR flash */ diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index f9a0b7d1aa..ede94e95f7 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -41,7 +41,7 @@ /* USB, USB storage, USB ethernet */ #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* * Diagnostics diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 8646633ea4..4d8a7c37de 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -18,7 +18,7 @@ */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/x530.h b/include/configs/x530.h index d6aec6d7f2..23b1121460 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -46,7 +46,7 @@ /* Additional FS support/configuration */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 0c87f19ac3..f3c8512641 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -55,7 +55,7 @@ #endif #ifdef CONFIG_USB_EHCI_ZYNQ -# define CONFIG_EHCI_IS_TDI +# define CONFIG_USB_EHCI_IS_TDI # define DFU_DEFAULT_POLL_TIMEOUT 300 # define CONFIG_THOR_RESET_OFF diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 02d86d79cf..682f597f37 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -246,7 +246,6 @@ CONFIG_EDB93XX_SDCS3 CONFIG_EFLASH_PROTSECTORS CONFIG_EHCI_DESC_BIG_ENDIAN CONFIG_EHCI_HCD_INIT_AFTER_RESET -CONFIG_EHCI_IS_TDI CONFIG_EHCI_MMIO_BIG_ENDIAN CONFIG_EHCI_MXS_PORT0 CONFIG_EHCI_MXS_PORT1 @@ -3036,6 +3035,7 @@ CONFIG_USB_EHCI_BASE CONFIG_USB_EHCI_BASE_LIST CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY +CONFIG_USB_EHCI_IS_TDI CONFIG_USB_EHCI_KIRKWOOD CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_TXFIFO_THRESH -- 2.32.0

3 9

[PATCH] w1: w1-gpio: Loosen timings to improve cold boot reliability
by Chris Morgan 05 May '22

05 May '22

From: Chris Morgan <macromorgan(a)hotmail.com> On my NTC CHIP whenever I do a cold boot any attached DIPs cannot be found. Rebooting on the other hand appears to fix the issue. I found that if I modified the timing slightly (but still within spec) the w1 identification on cold boot became far more reliable. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- drivers/w1/w1-gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 9346f810ce..5565de2a92 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -22,8 +22,8 @@ #define W1_TIMING_E 9 #define W1_TIMING_F 55 #define W1_TIMING_G 0 -#define W1_TIMING_H 480 -#define W1_TIMING_I 70 +#define W1_TIMING_H 600 +#define W1_TIMING_I 100 #define W1_TIMING_J 410 struct w1_gpio_pdata { -- 2.30.2

3 6

[PATCH 0/7] sunxi: Fix U-Boot proper SPI operation
by Andre Przywara 05 May '22

05 May '22

Hi, despite U-Boot supporting SPI on Allwinner chips and SPI flash in general for a while, it wasn't really working well for many sunxi boards. Booting from SPI is handled by separate SPL code, which works fine, but the "sf" command in U-Boot proper is often just not operational. This series tries to improve the situation, by: - cleaning up the SPI Kconfig situation for sunxi (patch 2) - adding support for environment in SPI flash (patch 3-5) - trying to enable more boards for U-Boot-proper SPI flash (patch 6) As an added bonus there is some whacky code to make the SPI flash usable in Linux on H6 boards. Marking this as RFC. Actually even after this series many boards still miss out, because they are lacking the required "spi0" alias in the DT. We could go with *-u-boot.dtsi fixes for now (as the SoPine does), but even mainline DT support wouldn't help, as we are somewhat stuck with DT updates. But that's a story for another time, let's get this SPI support fixed first. Cheers, Andre Andre Przywara (6): sunxi: Kconfig: Fix up SPI configuration env: sunxi: Define location in SPI flash sunxi: use boot source for determining environment location env: sunxi: enable ENV_IS_IN_SPI_FLASH sunxi: boards: Enable SPI flash support in U-Boot proper sunxi: H6: Enable SPI0 in DT when no eMMC is used Daniel Wagenknecht (1): sunxi: SPI: fix pinmuxing for Allwinner H6 SoCs arch/arm/Kconfig | 2 + arch/arm/mach-sunxi/Kconfig | 13 ++- board/sunxi/board.c | 101 +++++++++++++++++++++-- configs/libretech_all_h3_it_h5_defconfig | 2 - configs/libretech_all_h5_cc_h5_defconfig | 2 - configs/oceanic_5205_5inmfd_defconfig | 1 + configs/orangepi_pc2_defconfig | 2 + configs/orangepi_r1_defconfig | 2 + configs/orangepi_win_defconfig | 2 + configs/orangepi_zero2_defconfig | 2 + configs/orangepi_zero_defconfig | 2 + configs/pine64-lts_defconfig | 2 + configs/pine_h64_defconfig | 3 + configs/pinecube_defconfig | 2 + configs/sopine_baseboard_defconfig | 1 + drivers/spi/spi-sunxi.c | 3 +- env/Kconfig | 7 +- 17 files changed, 131 insertions(+), 18 deletions(-) -- 2.25.1

3 19