May 2020 - U-Boot

[PATCH 1/1] efi_loader: remove redundant assignment in dp_fill()
by Heinrich Schuchardt 06 May '20

06 May '20

The value of dp is overwritten without being used. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_device_path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 73f1fe75a8..f9349484a6 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -530,7 +530,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #ifdef CONFIG_SANDBOX case UCLASS_ROOT: { /* stop traversing parents at this point: */ - struct efi_device_path_vendor *dp = buf; + struct efi_device_path_vendor *dp; struct blk_desc *desc = dev_get_uclass_platdata(dev); dp_fill(buf, dev->parent); -- 2.26.2

1 0

[PATCH] sifive: fix palmer's email address
by Pragnesh Patel 06 May '20

06 May '20

Fix Palmer's email address Signed-off-by: Pragnesh Patel <pragnesh.patel(a)sifive.com> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> --- board/sifive/fu540/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sifive/fu540/MAINTAINERS b/board/sifive/fu540/MAINTAINERS index 702d803ad8..5381fc0639 100644 --- a/board/sifive/fu540/MAINTAINERS +++ b/board/sifive/fu540/MAINTAINERS @@ -1,6 +1,6 @@ SiFive FU540 BOARD M: Paul Walmsley <paul.walmsley(a)sifive.com> -M: Palmer Dabbelt <palmer(a)sifive.com> +M: Palmer Dabbelt <palmer(a)dabbelt.com> M: Anup Patel <anup.patel(a)wdc.com> M: Atish Patra <atish.patra(a)wdc.com> S: Maintained -- 2.17.1

2 1

[PATCH] lib/crypto, efi_loader: avoid multiple inclusions of header files
by AKASHI Takahiro 06 May '20

06 May '20

By adding extra symbols, we can now avoid including x509_parser and pkcs7_parser.h files multiple times. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/crypto/pkcs7_parser.h | 4 ++++ lib/crypto/x509_parser.h | 4 ++++ lib/efi_loader/efi_image_loader.c | 1 + lib/efi_loader/efi_signature.c | 1 + 4 files changed, 10 insertions(+) diff --git a/lib/crypto/pkcs7_parser.h b/lib/crypto/pkcs7_parser.h index 6565fdc2d4ca..b8234da45a6a 100644 --- a/lib/crypto/pkcs7_parser.h +++ b/lib/crypto/pkcs7_parser.h @@ -5,6 +5,9 @@ * Written by David Howells (dhowells(a)redhat.com) */ +#ifndef _PKCS7_PARSER_H +#define _PKCS7_PARSER_H + #include <linux/oid_registry.h> #include <crypto/pkcs7.h> #include "x509_parser.h" @@ -63,3 +66,4 @@ struct pkcs7_message { size_t data_hdrlen; /* Length of Data ASN.1 header */ const void *data; /* Content Data (or 0) */ }; +#endif /* _PKCS7_PARSER_H */ diff --git a/lib/crypto/x509_parser.h b/lib/crypto/x509_parser.h index c233f136fb35..4cbdc1d6612d 100644 --- a/lib/crypto/x509_parser.h +++ b/lib/crypto/x509_parser.h @@ -5,6 +5,9 @@ * Written by David Howells (dhowells(a)redhat.com) */ +#ifndef _X509_PARSER_H +#define _X509_PARSER_H + #include <linux/time.h> #include <crypto/public_key.h> #include <keys/asymmetric-type.h> @@ -55,3 +58,4 @@ extern int x509_decode_time(time64_t *_t, size_t hdrlen, */ extern int x509_get_sig_params(struct x509_certificate *cert); extern int x509_check_for_self_signed(struct x509_certificate *cert); +#endif /* _X509_PARSER_H */ diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 6c270ce94f44..899adf8493d0 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -14,6 +14,7 @@ #include <pe.h> #include <sort.h> #include "../lib/crypto/pkcs7_parser.h" +#include "../lib/crypto/x509_parser.h" const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID; const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID; diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 658e3547da37..6ad09e4acbd7 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -15,6 +15,7 @@ #include <u-boot/rsa.h> #include <u-boot/sha256.h> #include "../lib/crypto/pkcs7_parser.h" +#include "../lib/crypto/x509_parser.h" const efi_guid_t efi_guid_image_security_database = EFI_IMAGE_SECURITY_DATABASE_GUID; -- 2.25.2

2 5

[PATCH] lib/crypto, efi_loader: move some headers to include/crypto
by AKASHI Takahiro 06 May '20

06 May '20

Pkcs7_parse.h and x509_parser.h are used in UEFI subsystem, in particular, secure boot. So move them to include/crypto to avoid relative paths. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- {lib => include}/crypto/pkcs7_parser.h | 0 {lib => include}/crypto/x509_parser.h | 0 lib/crypto/pkcs7_parser.c | 4 ++++ lib/crypto/x509_cert_parser.c | 4 ++++ lib/crypto/x509_public_key.c | 6 ++++-- lib/efi_loader/efi_image_loader.c | 4 ++-- lib/efi_loader/efi_signature.c | 4 ++-- lib/efi_loader/efi_variable.c | 2 +- test/lib/asn1.c | 4 ++-- 9 files changed, 19 insertions(+), 9 deletions(-) rename {lib => include}/crypto/pkcs7_parser.h (100%) rename {lib => include}/crypto/x509_parser.h (100%) diff --git a/lib/crypto/pkcs7_parser.h b/include/crypto/pkcs7_parser.h similarity index 100% rename from lib/crypto/pkcs7_parser.h rename to include/crypto/pkcs7_parser.h diff --git a/lib/crypto/x509_parser.h b/include/crypto/x509_parser.h similarity index 100% rename from lib/crypto/x509_parser.h rename to include/crypto/x509_parser.h diff --git a/lib/crypto/pkcs7_parser.c b/lib/crypto/pkcs7_parser.c index f5dda1179f8a..0ee207b6b1c8 100644 --- a/lib/crypto/pkcs7_parser.c +++ b/lib/crypto/pkcs7_parser.c @@ -20,7 +20,11 @@ #include <linux/err.h> #include <linux/oid_registry.h> #include <crypto/public_key.h> +#ifdef __UBOOT__ +#include <crypto/pkcs7_parser.h> +#else #include "pkcs7_parser.h" +#endif #include "pkcs7.asn1.h" MODULE_DESCRIPTION("PKCS#7 parser"); diff --git a/lib/crypto/x509_cert_parser.c b/lib/crypto/x509_cert_parser.c index 4e41cffd2301..18f5407a076c 100644 --- a/lib/crypto/x509_cert_parser.c +++ b/lib/crypto/x509_cert_parser.c @@ -18,7 +18,11 @@ #include <linux/string.h> #endif #include <crypto/public_key.h> +#ifdef __UBOOT__ +#include <crypto/x509_parser.h> +#else #include "x509_parser.h" +#endif #include "x509.asn1.h" #include "x509_akid.asn1.h" diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c index 676c0df17410..571af9a0adf9 100644 --- a/lib/crypto/x509_public_key.c +++ b/lib/crypto/x509_public_key.c @@ -16,15 +16,17 @@ #include <linux/module.h> #endif #include <linux/kernel.h> -#ifndef __UBOOT__ +#ifdef __UBOOT__ +#include <crypto/x509_parser.h> +#else #include <linux/slab.h> #include <keys/asymmetric-subtype.h> #include <keys/asymmetric-parser.h> #include <keys/system_keyring.h> #include <crypto/hash.h> #include "asymmetric_keys.h" -#endif #include "x509_parser.h" +#endif /* * Set up the signature parameters in an X.509 certificate. This involves diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 899adf8493d0..f59b9a01140e 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -13,8 +13,8 @@ #include <malloc.h> #include <pe.h> #include <sort.h> -#include "../lib/crypto/pkcs7_parser.h" -#include "../lib/crypto/x509_parser.h" +#include "crypto/pkcs7_parser.h" +#include "crypto/x509_parser.h" const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID; const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID; diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 6ad09e4acbd7..0ead10203aeb 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -10,12 +10,12 @@ #include <image.h> #include <hexdump.h> #include <malloc.h> +#include <crypto/pkcs7_parser.h> +#include <crypto/x509_parser.h> #include <linux/compat.h> #include <linux/oid_registry.h> #include <u-boot/rsa.h> #include <u-boot/sha256.h> -#include "../lib/crypto/pkcs7_parser.h" -#include "../lib/crypto/x509_parser.h" const efi_guid_t efi_guid_image_security_database = EFI_IMAGE_SECURITY_DATABASE_GUID; diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 7df881a74b44..0c6d1deb58eb 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -12,9 +12,9 @@ #include <malloc.h> #include <rtc.h> #include <search.h> +#include <crypto/pkcs7_parser.h> #include <linux/compat.h> #include <u-boot/crc.h> -#include "../lib/crypto/pkcs7_parser.h" enum efi_secure_mode { EFI_MODE_SETUP, diff --git a/test/lib/asn1.c b/test/lib/asn1.c index d2b3f67e68da..8661fdd30687 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -13,10 +13,10 @@ #include <test/ut.h> #ifdef CONFIG_PKCS7_MESSAGE_PARSER -#include "../../lib/crypto/pkcs7_parser.h" +#include <crypto/pkcs7_parser.h> #else #ifdef CONFIG_X509_CERTIFICATE_PARSER -#include "../../lib/crypto/x509_parser.h" +#include <crypto/x509_parser.h> #endif #endif -- 2.25.2

2 5

[PATCH] efi_loader: fixe unreachable statement in efi_sigstore_parse_siglist
by AKASHI Takahiro 06 May '20

06 May '20

"if (left < esl->signature_size)" is not reachable in a while loop. But it is still valuable in case that a given signature database is somehow corrupted. So fix the while loop condition. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_signature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 0ead10203aeb..b392e72fefcd 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -668,7 +668,7 @@ efi_sigstore_parse_siglist(struct efi_signature_list *esl) esd = (struct efi_signature_data *) ((u8 *)esl + sizeof(*esl) + esl->signature_header_size); - while ((left > 0) && left >= esl->signature_size) { + while (left > 0) { /* Signature must exist if there is remaining data. */ if (left < esl->signature_size) { debug("Certificate is too small\n"); -- 2.25.2

3 2

[PATCH] efi_loader: factor out the common code from efi_transfer_secure_state()
by AKASHI Takahiro 06 May '20

06 May '20

efi_set_secure_stat() provides the common code for each stat transition caused by efi_transfer_secure_state(). Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_variable.c | 194 +++++++++++----------------------- 1 file changed, 64 insertions(+), 130 deletions(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 0c6d1deb58eb..c275684278a1 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -176,6 +176,59 @@ static efi_status_t efi_set_variable_internal(u16 *variable_name, const void *data, bool ro_check); +/** + * efi_set_secure_state - modify secure boot state variables + * @sec_boot: value of SecureBoot + * @setup_mode: value of SetupMode + * @audit_mode: value of AuditMode + * @deployed_mode: value of DeployedMode + * + * Modify secure boot stat-related variables as indicated. + * + * Return: EFI_SUCCESS on success, status code (negative) on error + */ +static efi_status_t efi_set_secure_state(int sec_boot, int setup_mode, + int audit_mode, int deployed_mode) +{ + u32 attributes; + efi_status_t ret; + + attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS | + READ_ONLY; + ret = efi_set_variable_internal(L"SecureBoot", + &efi_global_variable_guid, + attributes, + sizeof(sec_boot), &sec_boot, + false); + if (ret != EFI_SUCCESS) + goto err; + + ret = efi_set_variable_internal(L"SetupMode", + &efi_global_variable_guid, + attributes, + sizeof(setup_mode), &setup_mode, + false); + if (ret != EFI_SUCCESS) + goto err; + + ret = efi_set_variable_internal(L"AuditMode", + &efi_global_variable_guid, + attributes, + sizeof(audit_mode), &audit_mode, + false); + if (ret != EFI_SUCCESS) + goto err; + + ret = efi_set_variable_internal(L"DeployedMode", + &efi_global_variable_guid, + attributes, + sizeof(deployed_mode), &deployed_mode, + false); +err: + return ret; +} + /** * efi_transfer_secure_state - handle a secure boot state transition * @mode: new state @@ -188,157 +241,38 @@ static efi_status_t efi_set_variable_internal(u16 *variable_name, */ static efi_status_t efi_transfer_secure_state(enum efi_secure_mode mode) { - u32 attributes; - u8 val; efi_status_t ret; - debug("Secure state from %d to %d\n", efi_secure_mode, mode); + debug("Switching secure state from %d to %d\n", efi_secure_mode, mode); - attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_RUNTIME_ACCESS; if (mode == EFI_MODE_DEPLOYED) { - val = 1; - ret = efi_set_variable_internal(L"SecureBoot", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"SetupMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"AuditMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 1; - ret = efi_set_variable_internal(L"DeployedMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); + ret = efi_set_secure_state(1, 0, 0, 1); if (ret != EFI_SUCCESS) goto err; efi_secure_boot = true; } else if (mode == EFI_MODE_AUDIT) { - ret = efi_set_variable_internal(L"PK", - &efi_global_variable_guid, - attributes, - 0, NULL, - false); + ret = efi_set_variable_internal( + L"PK", &efi_global_variable_guid, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS, + 0, NULL, false); if (ret != EFI_SUCCESS) goto err; - val = 0; - ret = efi_set_variable_internal(L"SecureBoot", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 1; - ret = efi_set_variable_internal(L"SetupMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 1; - ret = efi_set_variable_internal(L"AuditMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"DeployedMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); + + ret = efi_set_secure_state(0, 1, 1, 0); if (ret != EFI_SUCCESS) goto err; efi_secure_boot = true; } else if (mode == EFI_MODE_USER) { - val = 1; - ret = efi_set_variable_internal(L"SecureBoot", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"SetupMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"AuditMode", - &efi_global_variable_guid, - attributes, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"DeployedMode", - &efi_global_variable_guid, - attributes, - sizeof(val), &val, - false); + ret = efi_set_secure_state(1, 0, 0, 0); if (ret != EFI_SUCCESS) goto err; efi_secure_boot = true; } else if (mode == EFI_MODE_SETUP) { - val = 0; - ret = efi_set_variable_internal(L"SecureBoot", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 1; - ret = efi_set_variable_internal(L"SetupMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"AuditMode", - &efi_global_variable_guid, - attributes, - sizeof(val), &val, - false); - if (ret != EFI_SUCCESS) - goto err; - val = 0; - ret = efi_set_variable_internal(L"DeployedMode", - &efi_global_variable_guid, - attributes | READ_ONLY, - sizeof(val), &val, - false); + ret = efi_set_secure_state(0, 1, 0, 0); if (ret != EFI_SUCCESS) goto err; } else { -- 2.25.2

3 2

[PULL] u-boot-usb/master
by Marek Vasut 05 May '20

05 May '20

The following changes since commit c693f212c5b0433b3a49a89d87cbff28bf78eb87: Merge branch '2020-05-01-master-imports' (2020-05-01 16:43:15 -0400) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to c01a7773a5e71322d3458f20560344ff475cd26c: MAINTAINERS: MediaTek: add USB related files (2020-05-02 12:32:28 +0200) ---------------------------------------------------------------- Chunfeng Yun (14): dm: core: Add function to get child count of ofnode or device test: dm: add test item for ofnode_get_child_count() phy: Add API for a bulk of phys test: dm: phy: add a test item for the phy_bulk API usb: dwc3: use the phy bulk API to get phys usb: dwc2_udc_otg: use the phy bulk API to get phys phy: phy-mtk-tphy: add support USB phys phy: phy-mtk-tphy: add support new version phy: phy-mtk-tphy: add a new reference clock xhci: mediatek: Add support for MTK xHCI host controller arm: dts: mt7629: add usb related nodes dt-bindings: phy-mtk-tphy: add properties of address mapping and clocks dt-bindings: usb: mtk-xhci: Add binding for MediaTek xHCI host controller MAINTAINERS: MediaTek: add USB related files MAINTAINERS | 3 + arch/arm/dts/mt7629-rfb.dts | 8 +++ arch/arm/dts/mt7629.dtsi | 41 +++++++++++ arch/sandbox/dts/test.dts | 29 ++++++++ doc/device-tree-bindings/phy/phy-mtk-tphy.txt | 78 +++++++++++++++++--- doc/device-tree-bindings/usb/mediatek,mtk-xhci.txt | 40 +++++++++++ drivers/core/ofnode.c | 11 +++ drivers/core/read.c | 5 ++ drivers/phy/phy-mtk-tphy.c | 316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- drivers/phy/phy-uclass.c | 97 +++++++++++++++++++++++++ drivers/usb/dwc3/core.c | 87 +++++------------------ drivers/usb/dwc3/dwc3-generic.c | 7 +- drivers/usb/gadget/dwc2_udc_otg.c | 93 +++++------------------- drivers/usb/host/Kconfig | 6 ++ drivers/usb/host/Makefile | 1 + drivers/usb/host/xhci-dwc3.c | 7 +- drivers/usb/host/xhci-mtk.c | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/xhci.c | 10 +++ include/dm/ofnode.h | 8 +++ include/dm/read.h | 13 ++++ include/dwc3-uboot.h | 11 ++- include/generic-phy.h | 92 ++++++++++++++++++++++++ include/usb/xhci.h | 3 + test/dm/ofnode.c | 21 ++++++ test/dm/phy.c | 33 +++++++++ 25 files changed, 1135 insertions(+), 188 deletions(-) create mode 100644 doc/device-tree-bindings/usb/mediatek,mtk-xhci.txt create mode 100644 drivers/usb/host/xhci-mtk.c

2 1

Pull request for UEFI sub-system for efi-2020-07-rc2 (2)
by Heinrich Schuchardt 05 May '20

05 May '20

The following changes since commit c693f212c5b0433b3a49a89d87cbff28bf78eb87: Merge branch '2020-05-01-master-imports' (2020-05-01 16:43:15 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2020-07-rc2-2 for you to fetch changes up to 16ad946f41d3dc3e475d8313f4acbba0df527a2a: efi_loader: change setup sequence (2020-05-04 12:26:12 +0200) No problems where reported by Gitlab and Travis: https://gitlab.denx.de/u-boot/custodians/u-boot-efi/pipelines/3072 https://travis-ci.org/github/xypron2/u-boot/builds/682864922 ---------------------------------------------------------------- Pull request for UEFI sub-system for efi-2020-07-rc2-2 This patch contains error corrections and code simplifications for the UEFI sub-system. ---------------------------------------------------------------- AKASHI Takahiro (5): lib/crypto, efi_loader: avoid multiple inclusions of header files lib/crypto, efi_loader: move some headers to include/crypto efi_loader: fix unreachable statement in efi_sigstore_parse_siglist efi_loader: factor out the common code from efi_transfer_secure_state() efi_loader: disk: add efi_disk_is_system_part() Heinrich Schuchardt (6): cmd: efidebug: simplify UEFI protocol calls efi_loader: eliminate efi_get_(non)volatile_variable efi_loader: eliminate efi_set_(non)volatile_variable efi_loader: correct comments for efi_status_t test: stabilize test_efi_secboot efi_loader: change setup sequence cmd/efidebug.c | 40 ++- {lib => include}/crypto/pkcs7_parser.h | 4 + {lib => include}/crypto/x509_parser.h | 4 + include/efi_loader.h | 2 + lib/crypto/pkcs7_parser.c | 4 + lib/crypto/x509_cert_parser.c | 4 + lib/crypto/x509_public_key.c | 6 +- lib/efi_loader/efi_disk.c | 29 +++ lib/efi_loader/efi_image_loader.c | 2 +- lib/efi_loader/efi_setup.c | 12 +- lib/efi_loader/efi_signature.c | 6 +- lib/efi_loader/efi_variable.c | 325 ++++++------------------ test/lib/asn1.c | 4 +- test/py/tests/test_efi_secboot/test_authvar.py | 8 +- test/py/tests/test_efi_secboot/test_signed.py | 4 +- test/py/tests/test_efi_secboot/test_unsigned.py | 6 +- 16 files changed, 174 insertions(+), 286 deletions(-) rename {lib => include}/crypto/pkcs7_parser.h (96%) rename {lib => include}/crypto/x509_parser.h (96%)

2 1

[PATCH v5 0/2] add brcm iproc gpio driver
by Rayagonda Kokatanur 05 May '20

05 May '20

Add support for broadcom iproc gpio driver. Changes from v4: -Address review comments from Simon Glass, Check for function return value. Changes from v3: -Address review comments from Simon Glass, Rearrange header file, Add struct comment taking about members, Use clrsetbits_le32(), Add new line before return etc. Changes from v2: -remove ununsed variable "node" in iproc_get_gpio_pctrl_mapping() func to fix compilation warning. Changes from v1: -Address review comments from Simon Glass, Use dev_read_...() instead of fdtdec_...(). Rayagonda Kokatanur (2): drivers: gpio: add broadcom iproc gpio driver support gpio: do not include <asm/arch/gpio.h> on TARGET_BCMNS3 arch/arm/include/asm/gpio.h | 2 +- drivers/gpio/Kconfig | 11 ++ drivers/gpio/Makefile | 1 + drivers/gpio/iproc_gpio.c | 275 ++++++++++++++++++++++++++++++++++++ 4 files changed, 288 insertions(+), 1 deletion(-) create mode 100644 drivers/gpio/iproc_gpio.c -- 2.17.1

2 7

pull request of u-boot-mpc85xx for v2020.07
by Priyanka Jain 05 May '20

05 May '20

Dear Tom, Please find my pull-request for u-boot-mpc85xx https://travis-ci.org/github/p-priyanka-jain/u-boot/builds/682767731 Summary Add DM model for P1010RDB Add I2C DM Model support for P1010RDB, T1042RDB, T2080, T4240RDB, MPC8548CDS, T1024RDB, P4080, P3041DS, P2041RDB, P2020RDB, P1020RDB, P5040DS Fix reference to READM.qe_firmware Thanks Priyanka -------------------------------------------------------------- The following changes since commit c693f212c5b0433b3a49a89d87cbff28bf78eb87: Merge branch '2020-05-01-master-imports' (2020-05-01 16:43:15 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx.git HEAD for you to fetch changes up to 9e36eae1249f477275a607736eda75e663d1b57c: powerpc: dts: p1010: add i2c node (2020-05-04 09:12:37 +0530) ---------------------------------------------------------------- Biwen Li (28): rtc: ds1337: Add driver model support rtc: pt7c4338: Add driver model support powerpc: create dts component of i2c to build up an SoC dm: powerpc: P5040DS: add i2c DM support configs: P5040DS: enable DM_I2C dm: powerpc: P1020: add i2c DM support configs: P1020RDB: enable DM_I2C and DM_RTC dts: powerpc: P2020RDB: add i2c node configs: P2020RDB: enable DM_I2C and DM_RTC dm: powerpc: P2041RDB: add i2c DM support config: P2041RDB: enable DM_I2C powerpc: dts: P3041: add i2c node configs: P3041DS: enable DM_I2C powerpc: dts: P4080: add i2c node configs: P4080DS: enable DM_I2C dm: powerpc: T1023/T1024: add i2c DM support configs: T1024RDB: enable DM_I2C and DM_RTC dm: ppc: p1010: add i2c DM support configs: P1010: Enable DM_I2C and DM_RTC dm: ppc: MPC8548CDS: add i2c DM support configs: MPC8548CDS: enable DM_I2C dm: ppc: T4240: add i2c DM support configs: T4240RDB: enable DM_I2C dm: powerpc: T2080/T2081: add i2c DM support configs: T2080: enable DM_I2C dm: powerpc: T1040/T1042: add i2c DM support configs: T1042D4RDB: enable DM_I2C and DM_RTC powerpc: dts: p1010: add i2c node Heinrich Schuchardt (1): doc: fix references to README.qe_firmware Hou Zhiqiang (4): powerpc: Enable device tree support for P1010RDB powerpc: P1010RDB: Compile legacy PCIe routines conditionally powerpc: P1010RDB: Disable legacy PCIe driver when DM_PCI is enabled configs: P1010RDB: Enable PCIe driver arch/powerpc/dts/Makefile | 2 + arch/powerpc/dts/p1010rdb-pa.dts | 17 ++ arch/powerpc/dts/p1010rdb-pa_36b.dts | 17 ++ arch/powerpc/dts/p1010rdb-pb.dts | 18 ++ arch/powerpc/dts/p1010rdb-pb_36b.dts | 18 ++ arch/powerpc/dts/p1010rdb.dtsi | 14 ++ arch/powerpc/dts/p1010rdb_32b.dtsi | 22 +++ arch/powerpc/dts/p1010rdb_36b.dtsi | 22 +++ arch/powerpc/dts/p1010si-post.dtsi | 48 +++++ arch/powerpc/dts/p1010si-pre.dtsi | 27 +++ arch/powerpc/dts/p1020-post.dtsi | 2 + arch/powerpc/dts/p2020-post.dtsi | 3 + arch/powerpc/dts/p2041.dtsi | 5 +- arch/powerpc/dts/p3041.dtsi | 4 +- arch/powerpc/dts/p4080.dtsi | 4 +- arch/powerpc/dts/p5040.dtsi | 5 +- arch/powerpc/dts/pq3-i2c-0.dtsi | 15 ++ arch/powerpc/dts/pq3-i2c-1.dtsi | 15 ++ arch/powerpc/dts/qoriq-i2c-0.dtsi | 25 +++ arch/powerpc/dts/qoriq-i2c-1.dtsi | 25 +++ arch/powerpc/dts/t102x.dtsi | 4 +- arch/powerpc/dts/t104x.dtsi | 4 +- arch/powerpc/dts/t2080.dtsi | 4 +- arch/powerpc/dts/t4240.dtsi | 5 +- board/freescale/common/sys_eeprom.c | 3 +- board/freescale/common/vsc3316_3308.c | 258 ++++++++++++++++++++++++++- board/freescale/p1010rdb/p1010rdb.c | 160 ++++++++++++++++- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 24 ++- board/freescale/t102xqds/t102xqds.c | 95 +++++++++- board/freescale/t102xqds/t102xqds.h | 3 +- board/freescale/t102xrdb/t102xrdb.c | 71 +++++++- board/freescale/t1040qds/diu.c | 5 +- board/freescale/t1040qds/t1040qds.c | 18 +- board/freescale/t1040qds/t1040qds.h | 3 +- board/freescale/t208xqds/t208xqds.c | 19 +- board/freescale/t4qds/t4240qds.c | 45 ++++- configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 9 +- configs/P1010RDB-PA_36BIT_NOR_defconfig | 10 +- configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 9 +- configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 9 +- configs/P1010RDB-PA_NAND_defconfig | 9 +- configs/P1010RDB-PA_NOR_defconfig | 10 +- configs/P1010RDB-PA_SDCARD_defconfig | 9 +- configs/P1010RDB-PA_SPIFLASH_defconfig | 9 +- configs/P1010RDB-PB_36BIT_NAND_defconfig | 9 +- configs/P1010RDB-PB_36BIT_NOR_defconfig | 10 +- configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 9 +- configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 9 +- configs/P1010RDB-PB_NAND_defconfig | 9 +- configs/P1010RDB-PB_NOR_defconfig | 10 +- configs/P1010RDB-PB_SDCARD_defconfig | 9 +- configs/P1010RDB-PB_SPIFLASH_defconfig | 9 +- configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 + configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 2 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 2 + configs/P1020RDB-PC_36BIT_defconfig | 2 + configs/P1020RDB-PC_NAND_defconfig | 2 + configs/P1020RDB-PC_SDCARD_defconfig | 2 + configs/P1020RDB-PC_SPIFLASH_defconfig | 2 + configs/P1020RDB-PC_defconfig | 2 + configs/P1020RDB-PD_NAND_defconfig | 2 + configs/P1020RDB-PD_SDCARD_defconfig | 2 + configs/P1020RDB-PD_SPIFLASH_defconfig | 2 + configs/P1020RDB-PD_defconfig | 2 + configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 + configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 2 + configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 2 + configs/P2020RDB-PC_36BIT_defconfig | 2 + configs/P2020RDB-PC_NAND_defconfig | 2 + configs/P2020RDB-PC_SDCARD_defconfig | 2 + configs/P2020RDB-PC_SPIFLASH_defconfig | 2 + configs/P2020RDB-PC_defconfig | 2 + configs/P2041RDB_NAND_defconfig | 1 + configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/P3041DS_NAND_defconfig | 1 + configs/P3041DS_SDCARD_defconfig | 1 + configs/P3041DS_SPIFLASH_defconfig | 1 + configs/P3041DS_defconfig | 1 + configs/P4080DS_SDCARD_defconfig | 1 + configs/P4080DS_SPIFLASH_defconfig | 1 + configs/P4080DS_defconfig | 1 + configs/P5040DS_NAND_defconfig | 1 + configs/P5040DS_SDCARD_defconfig | 1 + configs/P5040DS_SPIFLASH_defconfig | 1 + configs/P5040DS_defconfig | 1 + configs/T1024RDB_NAND_defconfig | 2 + configs/T1024RDB_SDCARD_defconfig | 2 + configs/T1024RDB_SPIFLASH_defconfig | 2 + configs/T1024RDB_defconfig | 2 + configs/T1042D4RDB_NAND_defconfig | 2 + configs/T1042D4RDB_SDCARD_defconfig | 2 + configs/T1042D4RDB_SPIFLASH_defconfig | 2 + configs/T1042D4RDB_defconfig | 2 + configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/T2080RDB_NAND_defconfig | 1 + configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + drivers/qe/qe.c | 6 +- drivers/rtc/ds1337.c | 128 +++++++++++++ drivers/rtc/pt7c4338.c | 100 +++++++++++ include/configs/MPC8548CDS.h | 9 +- include/configs/P1010RDB.h | 50 ++++-- include/configs/P1022DS.h | 4 +- include/configs/P2041RDB.h | 9 +- include/configs/T102xQDS.h | 10 +- include/configs/T102xRDB.h | 8 +- include/configs/T1040QDS.h | 7 + include/configs/T104xRDB.h | 10 +- include/configs/T208xQDS.h | 7 +- include/configs/T208xRDB.h | 10 +- include/configs/T4240QDS.h | 13 ++ include/configs/T4240RDB.h | 9 +- include/configs/corenet_ds.h | 8 +- include/configs/p1_p2_rdb_pc.h | 9 +- include/fsl_qe.h | 3 +- 128 files changed, 1580 insertions(+), 83 deletions(-) create mode 100644 arch/powerpc/dts/p1010rdb-pa.dts create mode 100644 arch/powerpc/dts/p1010rdb-pa_36b.dts create mode 100644 arch/powerpc/dts/p1010rdb-pb.dts create mode 100644 arch/powerpc/dts/p1010rdb-pb_36b.dts create mode 100644 arch/powerpc/dts/p1010rdb.dtsi create mode 100644 arch/powerpc/dts/p1010rdb_32b.dtsi create mode 100644 arch/powerpc/dts/p1010rdb_36b.dtsi create mode 100644 arch/powerpc/dts/p1010si-post.dtsi create mode 100644 arch/powerpc/dts/p1010si-pre.dtsi create mode 100644 arch/powerpc/dts/pq3-i2c-0.dtsi create mode 100644 arch/powerpc/dts/pq3-i2c-1.dtsi create mode 100644 arch/powerpc/dts/qoriq-i2c-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-i2c-1.dtsi

2 1