September 2021 - U-Boot

[BISECTED] arm: dts: Resync BeagleBone device trees
by Matwey V. Kornilov 11 Sep '21

11 Sep '21

Hello, I've found that the following commit breaks USB on BeagleBone Black board (am335x based): commit 942853dd96df5de1c0a2a61c877c1cf1c24f1e91 Author: Paul Barker <paul.barker(a)sancloud.com> Date: Mon Jul 12 21:14:09 2021 +0100 arm: dts: Resync BeagleBone device trees When commit is applied then I see the following: starting USB... No working controllers found USB is stopped. Please issue 'usb start' first. starting USB... No working controllers found Before the commit USB was working as expected: starting USB... Bus usb@47401800: scanning bus usb@47401800 for devices... 1 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found Device 0: Vendor: Rev: PMAP Prod: USB DISK Pro Type: Removable Hard Disk Capacity: 7381.2 MB = 7.2 GB (15116736 x 512) ... is now current device -- With best regards, Matwey V. Kornilov

5 10

[PATCH 0/3] AM64: Add support for booting to kernel from USB MSC device
by Aswath Govindraju 11 Sep '21

11 Sep '21

The following series of patches add support for booting to kernel using USB MSC device as the boot media, in AM64 Aswath Govindraju (3): board: ti: am64x: Add support for fixing dr_mode while booting from USB environment: ti: mmc.h: Make the finduuid generic for usage across different device types include: configs: am64x_evm: Add env variables for booting to kernel using USB MSC device board/ti/am64x/evm.c | 32 ++++++++++++++++++++++++++++++++ include/configs/am64x_evm.h | 31 ++++++++++++++++++++++++++++++- include/environment/ti/mmc.h | 2 +- 3 files changed, 63 insertions(+), 2 deletions(-) -- 2.17.1

2 6

[PATCH] ARM: omap3: evm: Enable booting 'fitImage' with DEFAULT_FIT_TI_ARGS
by Derald D. Woods 11 Sep '21

11 Sep '21

This commit uses the existing DEFAULT_MMC_TI_ARGS and DEFAULT_FIT_TI_ARGS defintions to replace the 'mmc*' environment variables in the configuration. The check for the 'boot_fit' is handled like the 'am335x_*' boards with 'CONFIG_BOOTCOMMAND'. Signed-off-by: Derald D. Woods <woods.technical(a)gmail.com> --- configs/omap3_evm_defconfig | 1 + include/configs/omap3_evm.h | 45 +++++-------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 4d96505e36..6a6bf64526 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_TARGET_OMAP3_EVM=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run envboot; run distro_bootcmd" CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index e2e871a9cb..2ce3c867cb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -50,9 +50,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_MTD_RAW_NAND */ -#define MEM_LAYOUT_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV - #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ "setenv mmcdev " #instance "; " \ @@ -88,8 +85,12 @@ #include <config_distro_bootcmd.h> +#include <environment/ti/mmc.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ - MEM_LAYOUT_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ + DEFAULT_FIT_TI_ARGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ @@ -102,42 +103,6 @@ "bootubivol=rootfs\0" \ "bootubipart=rootfs\0" \ "optargs=\0" \ - "mmcdev=0\0" \ - "mmcpart=2\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${mtdparts} " \ - "${optargs} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ - "env import -t ${loadaddr} ${filesize}\0" \ - "mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \ - "mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ - "run loadbootenv && run importbootenv; " \ - "run ext4bootenv && run importbootenv; " \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...; " \ - "run uenvcmd; " \ - "fi; " \ - "fi\0" \ - "loadimage=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loaddtb=ext4load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ - "mmcboot=run mmcbootenv; " \ - "if run loadimage && run loaddtb; then " \ - "echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} ...; " \ - "run mmcargs; " \ - "if test ${bootfile} = uImage; then " \ - "bootm ${loadaddr} - ${fdtaddr}; " \ - "fi; " \ - "if test ${bootfile} = zImage; then " \ - "bootz ${loadaddr} - ${fdtaddr}; " \ - "fi; " \ - "fi\0" \ "nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd\0" \ "nandrootfstype=ubifs rootwait\0" \ "nandargs=setenv bootargs console=${console} " \ -- 2.32.0

3 2

[PATCH] arm: am335x: Enable SPL_OF_CONTROL on some configs
by Tom Rini 11 Sep '21

11 Sep '21

Both am335x_boneblack_vboot and am335x_evm_spiboot require SPL_OF_CONTROL to function but are currently missing this option. Add it. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index e720e1d553e8..d7c1a76b0392 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_SPL=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_DNS2=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index b106141eafd6..9de317c6e928 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -32,6 +32,7 @@ CONFIG_BOOTP_DNS2=y CONFIG_CMD_MTDPARTS=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" CONFIG_ENV_OVERWRITE=y # CONFIG_ENV_IS_IN_FAT is not set -- 2.17.1

1 1

[PATCH] efi_loader: boot_service_capability_min should be capitalized
by Masahisa Kojima 11 Sep '21

11 Sep '21

boot_service_capability_min is constant, it should be capitalized. Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- include/efi_tcg2.h | 2 +- lib/efi_loader/efi_tcg2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index c99384fb00..5a1a36212e 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -130,7 +130,7 @@ struct efi_tcg2_boot_service_capability { }; /* up to and including the vendor ID (manufacturer_id) field */ -#define boot_service_capability_min \ +#define BOOT_SERVICE_CAPABILITY_MIN \ offsetof(struct efi_tcg2_boot_service_capability, number_of_pcr_banks) #define TCG_EFI_SPEC_ID_EVENT_SIGNATURE_03 "Spec ID Event03" diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index b268a02976..62ae102033 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -607,8 +607,8 @@ efi_tcg2_get_capability(struct efi_tcg2_protocol *this, goto out; } - if (capability->size < boot_service_capability_min) { - capability->size = boot_service_capability_min; + if (capability->size < BOOT_SERVICE_CAPABILITY_MIN) { + capability->size = BOOT_SERVICE_CAPABILITY_MIN; efi_ret = EFI_BUFFER_TOO_SMALL; goto out; } -- 2.17.1

3 2

[PATCH v2 1/1] x86: tangier: acpi: Add GPIO card detection to SDHCI #2
by Andy Shevchenko 11 Sep '21

11 Sep '21

On Intel Tangier the SDHCI #2 provides SD card connection. Add GPIO card detection for it. Fixes: 39665beed6f7 ("x86: tangier: Enable ACPI support for Intel Tangier") BugLink: https://github.com/edison-fw/meta-intel-edison/issues/135 Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Acked-by: Bin Meng <bmeng.cn(a)gmail.com> --- v2: switched to pull up bias (WA against some PCBs), added tag (Bin) .../asm/arch-tangier/acpi/southcluster.asl | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index 01077293bb91..e6bbef108a7b 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -97,6 +97,38 @@ Device (PCI0) } } + Device (SDHB) + { + Name (_ADR, 0x00010002) + Name (_DEP, Package () + { + GPIO + }) + + Name (RBUF, ResourceTemplate() + { + GpioInt(Edge, ActiveBoth, SharedAndWake, PullUp, 10000, + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 77 } + }) + + Method (_CRS, 0, Serialized) + { + Return (RBUF) + } + + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "cd-gpios", Package () { ^SDHB, 0, 0, 0 } }, + } + }) + + Method (_STA) + { + Return (STA_VISIBLE) + } + } + Device (SDHC) { Name (_ADR, 0x00010003) -- 2.33.0

2 2

[PATCH v1 1/1] x86: tangier: acpi: Add GPIO card detection to SDHCI #2
by Andy Shevchenko 10 Sep '21

10 Sep '21

On Intel Tangier the SDHCI #2 provides SD card connection. Add GPIO card detection for it. Fixes: 39665beed6f7 ("x86: tangier: Enable ACPI support for Intel Tangier") BugLink: https://github.com/edison-fw/meta-intel-edison/issues/135 Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- .../asm/arch-tangier/acpi/southcluster.asl | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index 01077293bb91..41facdde6a3d 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -97,6 +97,38 @@ Device (PCI0) } } + Device (SDHB) + { + Name (_ADR, 0x00010002) + Name (_DEP, Package () + { + GPIO + }) + + Name (RBUF, ResourceTemplate() + { + GpioInt(Edge, ActiveBoth, SharedAndWake, PullNone, 10000, + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 77 } + }) + + Method (_CRS, 0, Serialized) + { + Return (RBUF) + } + + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "cd-gpios", Package () { ^SDHB, 0, 0, 0 } }, + } + }) + + Method (_STA) + { + Return (STA_VISIBLE) + } + } + Device (SDHC) { Name (_ADR, 0x00010003) -- 2.33.0

3 4

Please pull u-boot-marvell/master
by Stefan Roese 10 Sep '21

10 Sep '21

Hi Tom, I'll be on vacation for a bit over a week. Please pull the next batch of Marvell MVEBU related patches. Here the summary log of the most important parts: ---------------------------------------------------------------- - mvebu: dts: Armada8k enable mdio (Sven) - a37xx: pci: Fix / enhance error handling (Pali) - mvebu: espressobin/turris_: Enable GPT partition support (Pali) - mvebu: sata_mv: Probe all ports (Tony) - a37xx: pci: Don't spam about PIO Response Status (Marek) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=113&view=results Thanks, Stefan The following changes since commit 4412fd8ba2ce5945d04f4b181a96e05576c46bf2: Merge branch '2021-09-08-fix-FIT-hash-algos-in-SPL' (2021-09-08 21:23:55 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 157bc52b0fa9d75611aeca9668c5227d6e64e05e: arm: a37xx: pci: Don't spam about PIO Response Status (2021-09-10 09:01:51 +0200) ---------------------------------------------------------------- Marek Behún (1): arm: a37xx: pci: Don't spam about PIO Response Status Pali Rohár (5): arm: a37xx: pci: Disable returning CRS response arm: a37xx: pci: Implement re-issuing config requests on CRS response arm: mvebu: turris_{omnia, mox}: GPT partition support arm: mvebu: espressobin: Enable GPT partition support arm: mvebu: a38x: Fix 5200000 baudrate Sven Auhagen (1): arm: mvebu: dts: Armada8k enable mdio Tony Dinh (3): arm: kirkwood: Sheevaplug: Update board maintainer arm: mvebu : sata_mv should probe all ports arm: marvell: Dreamplug: fix typo in eth1 name arch/arm/dts/armada-7040-db.dts | 1 + arch/arm/dts/armada-8040-clearfog-gt-8k.dts | 1 + arch/arm/dts/armada-8040-db.dts | 1 + arch/arm/dts/armada-8040-mcbin.dts | 1 + board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/sheevaplug/MAINTAINERS | 2 +- configs/mvebu_espressobin-88f3720_defconfig | 1 + configs/turris_mox_defconfig | 1 + configs/turris_omnia_defconfig | 1 + drivers/ata/sata_mv.c | 14 ++++-- drivers/pci/pci-aardvark.c | 73 ++++++++++++++++++++++------- include/configs/mv-common.h | 2 +- 12 files changed, 76 insertions(+), 24 deletions(-)

2 1

[PATCH] MAINTAINERS: Update ARM TI entry
by Lokesh Vutla 10 Sep '21

10 Sep '21

Move TI maintainership to Tom. Updated with the following commands: find ./ -name MAINTAINERS | xargs sed -i s/"Lokesh Vutla <lokeshvutla(a)ti.com>"/"Tom Rini <trini(a)konsulko.com>"/g Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- MAINTAINERS | 2 +- board/davinci/da8xxevm/MAINTAINERS | 2 +- board/ti/am43xx/MAINTAINERS | 2 +- board/ti/am57xx/MAINTAINERS | 2 +- board/ti/am64x/MAINTAINERS | 2 +- board/ti/am65x/MAINTAINERS | 2 +- board/ti/dra7xx/MAINTAINERS | 2 +- board/ti/j721e/MAINTAINERS | 2 +- board/ti/omap5_uevm/MAINTAINERS | 2 +- board/ti/panda/MAINTAINERS | 2 +- board/ti/sdp4430/MAINTAINERS | 2 +- doc/git-mailrc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4cf0c33c5d..40a0e7ac72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -490,7 +490,7 @@ F: arch/arm/mach-tegra/ F: arch/arm/include/asm/arch-tegra*/ ARM TI -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-ti.git F: arch/arm/mach-davinci/ diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS index 16f1032661..993b22f2f6 100644 --- a/board/davinci/da8xxevm/MAINTAINERS +++ b/board/davinci/da8xxevm/MAINTAINERS @@ -8,7 +8,7 @@ F: configs/da850evm_nand_defconfig F: configs/da850evm_direct_nor_defconfig OMAPL138_LCDK BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: include/configs/omap1l38_lcdk.h F: configs/omapl138_lcdk_defconfig diff --git a/board/ti/am43xx/MAINTAINERS b/board/ti/am43xx/MAINTAINERS index ab9da22c64..5478dd7104 100644 --- a/board/ti/am43xx/MAINTAINERS +++ b/board/ti/am43xx/MAINTAINERS @@ -1,5 +1,5 @@ AM43XX BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/am43xx/ F: include/configs/am43xx_evm.h diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS index 47b694eb4b..a6f4f168fc 100644 --- a/board/ti/am57xx/MAINTAINERS +++ b/board/ti/am57xx/MAINTAINERS @@ -1,5 +1,5 @@ AM57XX EVM -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/am57xx/ F: include/configs/am57xx_evm.h diff --git a/board/ti/am64x/MAINTAINERS b/board/ti/am64x/MAINTAINERS index d384a330df..eaca2b865f 100644 --- a/board/ti/am64x/MAINTAINERS +++ b/board/ti/am64x/MAINTAINERS @@ -1,6 +1,6 @@ AM64x BOARD M: Dave Gerlach <d-gerlach(a)ti.com> -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/am64x/ F: include/configs/am64x_evm.h diff --git a/board/ti/am65x/MAINTAINERS b/board/ti/am65x/MAINTAINERS index 6da4182d9f..c52f7c9112 100644 --- a/board/ti/am65x/MAINTAINERS +++ b/board/ti/am65x/MAINTAINERS @@ -1,5 +1,5 @@ AM65x BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/am65x/ F: include/configs/am65x_evm.h diff --git a/board/ti/dra7xx/MAINTAINERS b/board/ti/dra7xx/MAINTAINERS index 46b6e82b36..ba3d06dab9 100644 --- a/board/ti/dra7xx/MAINTAINERS +++ b/board/ti/dra7xx/MAINTAINERS @@ -1,5 +1,5 @@ DRA7XX BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/dra7xx/ F: include/configs/dra7xx_evm.h diff --git a/board/ti/j721e/MAINTAINERS b/board/ti/j721e/MAINTAINERS index 4b13f46ddc..f5ca7d06a3 100644 --- a/board/ti/j721e/MAINTAINERS +++ b/board/ti/j721e/MAINTAINERS @@ -1,5 +1,5 @@ J721E BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/j721e F: include/configs/j721e_evm.h diff --git a/board/ti/omap5_uevm/MAINTAINERS b/board/ti/omap5_uevm/MAINTAINERS index 280ea2f91f..ce544828f8 100644 --- a/board/ti/omap5_uevm/MAINTAINERS +++ b/board/ti/omap5_uevm/MAINTAINERS @@ -1,5 +1,5 @@ OMAP5_UEVM BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/omap5_uevm/ F: include/configs/omap5_uevm.h diff --git a/board/ti/panda/MAINTAINERS b/board/ti/panda/MAINTAINERS index 2142368271..8b8cf7daf6 100644 --- a/board/ti/panda/MAINTAINERS +++ b/board/ti/panda/MAINTAINERS @@ -1,5 +1,5 @@ PANDA BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/panda/ F: include/configs/omap4_panda.h diff --git a/board/ti/sdp4430/MAINTAINERS b/board/ti/sdp4430/MAINTAINERS index ac4d0ccc19..d8b8fe600e 100644 --- a/board/ti/sdp4430/MAINTAINERS +++ b/board/ti/sdp4430/MAINTAINERS @@ -1,5 +1,5 @@ SDP4430 BOARD -M: Lokesh Vutla <lokeshvutla(a)ti.com> +M: Tom Rini <trini(a)konsulko.com> S: Maintained F: board/ti/sdp4430/ F: include/configs/omap4_sdp4430.h diff --git a/doc/git-mailrc b/doc/git-mailrc index 001681c899..410be387be 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -74,7 +74,7 @@ alias socfpga uboot, marex, dinh, simongoldschmidt, tienfong alias sunxi uboot, jagan, apritzel alias tegra uboot, sjg, Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com> alias tegra2 tegra -alias ti uboot, lokeshvutla +alias ti uboot, trini alias uniphier uboot, masahiro alias zynq uboot, monstr alias rockchip uboot, sjg, kevery, ptomsich -- 2.31.1

3 3

[PATCH] Kconfig: Drop duplicate 'select SHA512' instances
by Tom Rini 10 Sep '21

10 Sep '21

When dropping SHA512_ALGO in general, we didn't catch some cases where an option was selecting both SHA512 and SHA512_ALGO and caused them to select SHA512 twice. Kconfig doesn't complain, but this is still wrong and should be corrected. Fixes: e60e44993120 ("lib: Drop SHA512_ALGO in lieu of SHA512") Reported-by: Andreas Schwab <schwab(a)suse.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- lib/crypt/Kconfig | 1 - lib/efi_loader/Kconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/crypt/Kconfig b/lib/crypt/Kconfig index 6a5002964224..a59d5c7d1d54 100644 --- a/lib/crypt/Kconfig +++ b/lib/crypt/Kconfig @@ -20,7 +20,6 @@ config CRYPT_PW_SHA256 config CRYPT_PW_SHA512 bool "Provide sha512crypt" select SHA512 - select SHA512 help Enables support for the sha512crypt password-hashing algorithm. The prefix is "$6$". diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 08463251cdf1..edd4ae29f163 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -323,7 +323,6 @@ config EFI_TCG2_PROTOCOL depends on TPM_V2 select SHA1 select SHA256 - select SHA512 select SHA384 select SHA512 select HASH -- 2.17.1

2 2