February 2021 - U-Boot

[PATCH 1/5] spl: mmc: Support OP-TEE payloads in Falcon mode
by Alexandru Gagniuc 08 Feb '21

08 Feb '21

In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an IH_OS_TEE, this isn't necessarily a problem. Of course, a general solution would involve mmc_load_image_raw_os() only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. Accept IH_OS_TEE as a valid OS value. Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- common/spl/spl_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index add2785b4e..bab558d055 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, if (ret) return ret; - if (spl_image->os != IH_OS_LINUX) { - puts("Expected Linux image is not found. Trying to start U-boot\n"); + if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) { + puts("Expected OS image is not found. Instead found "); + puts(genimg_get_os_name(spl_image->os)); + puts(". Trying to start U-boot\n"); return -ENOENT; } -- 2.26.2

3 9

Please pull u-boot-marvell/master
by Stefan Roese 08 Feb '21

08 Feb '21

Hi Tom, please pull the 2nd batch of Marvell MVEBU related patches. Here the summary log: ---------------------------------------------------------------- - Espressobin: Set default env values at runtime (Pali) - Espressobin: Set the maximum slave SPI speed to 40MHz (Pali) - theadorable: PCIe test code enhancement and early deemphasis enabling (Stefan) - pci_mvebu: Disable config access to PCI host bridge ports (Stefan) - mv_sdhci: parse device-tree entry (Baruch) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=69&view=results Thanks, Stefan The following changes since commit 3936fd998668846f77468d8f6a662e906920969c: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2021-02-06 09:45:58 -0500) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 24a0f8cfe5c85aef5a20baf34ee7b77004b07b04: mmc: mv_sdhci: parse device-tree entry (2021-02-08 08:53:14 +0100) ---------------------------------------------------------------- Baruch Siach (1): mmc: mv_sdhci: parse device-tree entry Konstantin Porotchkin (1): arm: mvebu: Espressobin: Set the maximum slave SPI speed to 40MHz Pali Rohár (4): env: Allow to set default_environment[] from board code via compile option DEFAULT_ENV_IS_RW arm: mvebu: Espressobin: Set default value for $fdtfile env variable arm: mvebu: Espressobin: Set default value for $ethNaddr env variable cmd: mvebu/bubt: Fix default options in help Stefan Roese (3): pci: pci_mvebu: Disable config access to PCI host bridge ports arm: mvebu: theadorable: Enhance "pcie" test cmd to check link width/speed arm: mvebu: theadorable: Set deephasis bit in PCIe configs very early board/Marvell/mvebu_armada-37xx/board.c | 38 +++++++- board/theadorable/theadorable.c | 132 +++++++++++++++++++++++----- cmd/mvebu/bubt.c | 6 +- configs/mvebu_espressobin-88f3720_defconfig | 1 + drivers/mmc/mv_sdhci.c | 4 + drivers/pci/pci_mvebu.c | 66 ++++++-------- include/configs/mvebu_armada-37xx.h | 17 +++- include/env_default.h | 2 + include/env_internal.h | 4 + 9 files changed, 202 insertions(+), 68 deletions(-)

2 1

pull request of u-boot-fsl-qoriq for v2021.04
by Priyanka Jain 08 Feb '21

08 Feb '21

Dear Tom, Please find my pull-request for u-boot-fsl-qoriq/master https://github.com/u-boot/u-boot/pull/52/checks Summary Layerscape: Enable gpio Bug fixes & updates related to dspi, qspi, pciep, SVR mask, stream-id, env variables, mdio for LAyerscape Platforms Add SATA, network variant 1, 2 support on sl28 powerpc: T1042: drop CONFIG_VIDEO, Add kmcent2 board supporrt, keymile Bug fixes and updates for keymile, Kontron Thanks Priyanka --------------------------- The following changes since commit 3936fd998668846f77468d8f6a662e906920969c: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2021-02-06 09:45:58 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to 5e7a207ebf8501b4ab1c6a081b7b806698ce0f6d: configs: lx2160aqds: enable CMD_GPIO (2021-02-08 14:22:39 +0530) ---------------------------------------------------------------- Aleksandar Gerasimovski (4): board: keymile: common: fix qrio compilation for arm keymile: common: qrio: print QRIO id and revision number board/km/common: fix pnvramaddr and varaddr board/km: move km i2c deblock declarations to a km/common.h Biwen Li (34): configs: ls1088aqds: add COMMON_ENV to fix distroboot gpio: mpc8xxx_gpio: Fix for litte endian arm: dts: ls1021a: add gpio node arm64: dts: ls1012a: add gpio node arm64: dts: ls1028a: add gpio node arm64: dts: ls1043a: add gpio node arm64: dts: ls1046a: add gpio node arm64: dts: ls1088a: add gpio node arm64: dts: ls208xa: add gpio node configs: ls1012a: enable CONFIG_MPC8XXX_GPIO configs: ls1043a: enable CONFIG_MPC8XXX_GPIO configs: ls1028a: enable CONFIG_MPC8XXX_GPIO configs: ls1088a: enable CONFIG_MPC8XXX_GPIO configs: ls208xa: enable CONFIG_MPC8XXX_GPIO configs: lx2160a: enable CONFIG_MPC8XXX_GPIO configs: ls1046a: enable MPC8XXX_GPIO configs: ls1021atwr: enable CONFIG_MPC8XXX_GPIO configs: ls1021aqds: enable CONFIG_MPC8XXX_GPIO configs: ls1012afrwy: enable CMD_GPIO configs: ls1012ardb: enable CMD_GPIO configs: ls1021aqds: enable CMD_GPIO configs: ls1021atwr: enable CMD_GPIO configs: ls1028aqds: enable CMD_GPIO configs: ls1028ardb: enable CMD_GPIO configs: ls1043aqds: enable CMD_GPIO configs: ls1043ardb: enable CMD_GPIO configs: ls1046ardb: enable CMD_GPIO configs: ls1046aqds: enable CMD_GPIO configs: ls2088ardb: enable DM_GPIO and CMD_GPIO configs: ls2088aqds: enable CMD_GPIO configs: ls1088aqds: enable DM_GPIO and CMD_GPIO configs: ls1088ardb: enable DM_GPIO and CMD_GPIO configs: lx2160ardb: enable CMD_GPIO configs: lx2160aqds: enable CMD_GPIO Hou Zhiqiang (4): pci: layerscape: Remove the shadow SVR definitions pci: kconfig: layerscape: Change LX2162A PCIe node compatible string armv7: ls102xa: Enable I-Cache to speed up the boot time configs: T1042: Drop the CONFIG_VIDEO Ioana Ciornei (1): net: memac_phy: add a timeout to MDIO operations Mathew McBride (3): mem: spi-mem: add declaration for spi_mem_default_supports_op spi: fsl_qspi: Ensure width is respected in spi-mem operations spi: fsl_qspi: apply the same settings for LS1088 as LS208x Michael Walle (6): mtd: spi-nor: add unlock all config option board: kontron: disable flash unlock all board: sl28: move ethernet aliases to variant specific dtsi board: sl28: add network variant 1 support board: sl28: add network variant 2 support board: sl28: add SATA support Niel Fourie (3): PowerPC: dts: Pulled in kmcent2 dts files from Linux 5.10 keymile: common: update to set_env_hex(), fix "pram" radix PowerPC: keymile: Add support for kmcent2 board Nipun Gupta (1): armv8: ls1028a: fix stream id allocation Priyanka Jain (1): mpc8xxx: fsl_pamu: Update data type in config_pamu Wasim Khan (2): armv8: lx2162aqds: disable non existing pcie controllers armv8: lx2: SVR_SOC_VER: Mask CAN_FD and security bit Ye Li (1): net: eqos: Reduce the MDIO wait time Zhao Qiang (1): armv8: dts: fsl-lx2162a: add dspi node into qds dts arch/arm/cpu/armv7/ls102xa/cpu.c | 2 + arch/arm/dts/Makefile | 2 + arch/arm/dts/fsl-ls1012a.dtsi | 20 + arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 62 +- .../dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi | 8 + arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts | 57 ++ .../dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 2 + arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 25 + .../dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi | 6 + .../dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi | 7 + arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 4 + arch/arm/dts/fsl-ls1028a.dtsi | 33 + arch/arm/dts/fsl-ls1043a.dtsi | 40 ++ arch/arm/dts/fsl-ls1046a.dtsi | 40 ++ arch/arm/dts/fsl-ls1088a.dtsi | 47 +- arch/arm/dts/fsl-ls2080a.dtsi | 46 +- arch/arm/dts/fsl-lx2162a-qds.dts | 125 +++- arch/arm/dts/ls1021a.dtsi | 40 ++ .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 10 + arch/arm/include/asm/arch-fsl-layerscape/soc.h | 40 +- .../asm/arch-fsl-layerscape/stream_id_lsch3.h | 4 +- arch/arm/include/asm/arch-fsl-layerscape/svr.h | 42 ++ arch/arm/include/asm/arch-ls102xa/gpio.h | 16 + arch/arm/include/asm/arch-ls102xa/svr.h | 13 + arch/powerpc/cpu/mpc85xx/Kconfig | 4 + arch/powerpc/cpu/mpc8xxx/fsl_pamu.c | 2 +- arch/powerpc/dts/Makefile | 1 + arch/powerpc/dts/elo3-dma-0.dtsi | 55 ++ arch/powerpc/dts/elo3-dma-1.dtsi | 55 ++ arch/powerpc/dts/kmcent2-u-boot.dtsi | 97 +++ arch/powerpc/dts/kmcent2.dts | 338 ++++++++++ arch/powerpc/dts/qoriq-bman1.dtsi | 14 + arch/powerpc/dts/qoriq-duart-0.dtsi | 24 + arch/powerpc/dts/qoriq-duart-1.dtsi | 24 + arch/powerpc/dts/qoriq-esdhc-0.dtsi | 13 + arch/powerpc/dts/qoriq-espi-0.dtsi | 14 + arch/powerpc/dts/qoriq-mpic.dtsi | 79 +++ arch/powerpc/dts/qoriq-qman3.dtsi | 14 + arch/powerpc/dts/qoriq-sata2-0.dtsi | 12 + arch/powerpc/dts/qoriq-sata2-1.dtsi | 12 + arch/powerpc/dts/qoriq-sec5.0-0.dtsi | 83 +++ arch/powerpc/dts/qoriq-usb2-dr-0.dtsi | 14 + arch/powerpc/dts/qoriq-usb2-mph-0.dtsi | 14 + arch/powerpc/dts/t1040si-post.dtsi | 727 +++++++++++++++++++++ arch/powerpc/dts/t104xsi-pre.dtsi | 88 +++ arch/powerpc/include/asm/immap_83xx.h | 13 + board/keymile/Kconfig | 1 + board/keymile/common/common.c | 29 +- board/keymile/common/common.h | 5 + board/keymile/common/ivm.c | 5 + board/keymile/common/qrio.c | 19 +- board/keymile/common/qrio.h | 1 + board/keymile/kmcent2/Kconfig | 17 + board/keymile/kmcent2/MAINTAINERS | 8 + board/keymile/kmcent2/Makefile | 14 + board/keymile/kmcent2/ddr.c | 88 +++ board/keymile/kmcent2/kmcent2.c | 353 ++++++++++ board/keymile/kmcent2/law.c | 23 + board/keymile/kmcent2/tlb.c | 104 +++ board/kontron/sl28/Makefile | 2 +- board/kontron/sl28/common.c | 10 - board/kontron/sl28/sl28.c | 6 + board/kontron/sl28/spl.c | 38 ++ configs/T1042D4RDB_NAND_defconfig | 1 - configs/T1042D4RDB_SDCARD_defconfig | 1 - configs/T1042D4RDB_SECURE_BOOT_defconfig | 1 - configs/T1042D4RDB_SPIFLASH_defconfig | 1 - configs/T1042D4RDB_defconfig | 1 - configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 1 - configs/T1042RDB_PI_NAND_defconfig | 1 - configs/T1042RDB_PI_SDCARD_defconfig | 1 - configs/T1042RDB_PI_SPIFLASH_defconfig | 1 - configs/T1042RDB_PI_defconfig | 1 - configs/kmcent2_defconfig | 92 +++ configs/kontron_sl28_defconfig | 2 + configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_qspi_defconfig | 1 + configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012ardb_tfa_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 1 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_nor_defconfig | 1 + configs/ls1021atwr_nor_lpuart_defconfig | 1 + configs/ls1021atwr_qspi_defconfig | 1 + .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_defconfig | 1 + configs/ls1021atwr_sdcard_qspi_defconfig | 1 + configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_defconfig | 1 + configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 1 + configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_tfa_defconfig | 1 + configs/ls1046aqds_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1046ardb_emmc_defconfig | 1 + configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_qspi_defconfig | 1 + configs/ls1046ardb_qspi_spl_defconfig | 1 + configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_sdcard_defconfig | 1 + configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_tfa_defconfig | 1 + configs/ls1088aqds_defconfig | 2 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088aqds_qspi_defconfig | 2 + configs/ls1088aqds_sdcard_ifc_defconfig | 2 + configs/ls1088aqds_sdcard_qspi_defconfig | 2 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088ardb_qspi_defconfig | 2 + .../ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1088ardb_sdcard_qspi_defconfig | 2 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls2088ardb_qspi_defconfig | 2 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + drivers/gpio/mpc8xxx_gpio.c | 47 +- drivers/mtd/spi/Kconfig | 10 + drivers/mtd/spi/spi-nor-core.c | 9 +- drivers/net/dwc_eth_qos.c | 2 +- drivers/net/fm/memac_phy.c | 76 ++- drivers/pci/Kconfig | 5 +- drivers/pci/pcie_layerscape.h | 12 +- drivers/spi/fsl_qspi.c | 12 +- include/configs/km/km_arm.h | 4 - include/configs/kmcent2.h | 513 +++++++++++++++ include/configs/kmp204x.h | 6 - include/configs/kontron_sl28.h | 1 + include/configs/ls1012a_common.h | 7 + include/configs/ls1021aqds.h | 7 + include/configs/ls1021atwr.h | 7 + include/configs/ls1028a_common.h | 7 + include/configs/ls1043a_common.h | 7 + include/configs/ls1046a_common.h | 7 + include/configs/ls1088a_common.h | 7 + include/configs/ls1088aqds.h | 12 + include/configs/ls2080a_common.h | 7 + include/configs/lx2160a_common.h | 7 + include/spi-mem.h | 3 + 183 files changed, 3894 insertions(+), 192 deletions(-) create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts create mode 100644 arch/arm/include/asm/arch-fsl-layerscape/svr.h create mode 100644 arch/arm/include/asm/arch-ls102xa/svr.h create mode 100644 arch/powerpc/dts/elo3-dma-0.dtsi create mode 100644 arch/powerpc/dts/elo3-dma-1.dtsi create mode 100644 arch/powerpc/dts/kmcent2-u-boot.dtsi create mode 100644 arch/powerpc/dts/kmcent2.dts create mode 100644 arch/powerpc/dts/qoriq-bman1.dtsi create mode 100644 arch/powerpc/dts/qoriq-duart-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-duart-1.dtsi create mode 100644 arch/powerpc/dts/qoriq-esdhc-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-espi-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-mpic.dtsi create mode 100644 arch/powerpc/dts/qoriq-qman3.dtsi create mode 100644 arch/powerpc/dts/qoriq-sata2-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sata2-1.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec5.0-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-usb2-dr-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-usb2-mph-0.dtsi create mode 100644 arch/powerpc/dts/t1040si-post.dtsi create mode 100644 arch/powerpc/dts/t104xsi-pre.dtsi create mode 100644 board/keymile/kmcent2/Kconfig create mode 100644 board/keymile/kmcent2/MAINTAINERS create mode 100644 board/keymile/kmcent2/Makefile create mode 100644 board/keymile/kmcent2/ddr.c create mode 100644 board/keymile/kmcent2/kmcent2.c create mode 100644 board/keymile/kmcent2/law.c create mode 100644 board/keymile/kmcent2/tlb.c delete mode 100644 board/kontron/sl28/common.c create mode 100644 configs/kmcent2_defconfig create mode 100644 include/configs/kmcent2.h

2 1

[PULL] u-boot-sh/master
by Marek Vasut 08 Feb '21

08 Feb '21

The following changes since commit 3936fd998668846f77468d8f6a662e906920969c: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2021-02-06 09:45:58 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 0099dfd5e53703ff94677ec3490134ae436fc8f1: ARM: rmobile: Add Beacon EmbeddedWorks RZG2H Dev Kit (2021-02-07 21:12:57 +0100) ---------------------------------------------------------------- Adam Ford (6): dt-bindings: Sync versaclock.h with upcoming 5.12-rc1 arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1 arm: dts: r8a774e1: Import DTS queued for Linux 5.12-rc1 arm: dts: r8a774b1: Import DTS queued for Linux 5.12-rc1 ARM: rmobile: Add Beacon EmbeddedWorks RZG2N Dev Kit ARM: rmobile: Add Beacon EmbeddedWorks RZG2H Dev Kit arch/arm/dts/Makefile | 2 + arch/arm/dts/beacon-renesom-baseboard.dtsi | 359 ++++++++++++++++----- arch/arm/dts/beacon-renesom-som.dtsi | 57 +++- arch/arm/dts/r8a774a1-beacon-rzg2m-kit.dts | 59 +++- arch/arm/dts/r8a774a1.dtsi | 74 ++++- arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi | 34 ++ arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts | 66 ++++ arch/arm/dts/r8a774b1.dtsi | 76 ++++- arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi | 44 +++ arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts | 71 +++++ arch/arm/dts/r8a774e1.dtsi | 1374 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- arch/arm/mach-rmobile/Kconfig.64 | 10 + board/beacon/beacon-rzg2m/Kconfig | 2 +- board/beacon/beacon-rzg2m/MAINTAINERS | 2 + configs/r8a774b1_beacon_defconfig | 71 +++++ configs/r8a774e1_beacon_defconfig | 67 ++++ include/dt-bindings/clk/versaclock.h | 13 + 17 files changed, 2247 insertions(+), 134 deletions(-) create mode 100644 arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi create mode 100644 arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts create mode 100644 arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi create mode 100644 arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts create mode 100644 configs/r8a774b1_beacon_defconfig create mode 100644 configs/r8a774e1_beacon_defconfig create mode 100644 include/dt-bindings/clk/versaclock.h

2 1

[PULL] u-boot-usb/master
by Marek Vasut 08 Feb '21

08 Feb '21

The following changes since commit 8308a28af821d6498186b3dd7463db9874cd2daf: Merge tag 'ti-v2021.04-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti (2021-02-05 09:39:31 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to adb5daf0905a190375e46d59f1244b13c3cdc640: fastboot: reinit partition after storing GPT or MBR (2021-02-07 19:22:55 +0100) ---------------------------------------------------------------- Heinrich Schuchardt (1): dfu: dfu_sf: use correct print code Patrick Delaunay (4): fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT fastboot: mmc: extend flash/erase for both emmc hwpart 1 and 2 fastboot: add command to select the default emmc hwpart for boot fastboot: add command to select the eMMC boot configuration Roman Kovalivskyi (2): Revert "fastboot: Add default fastboot_set_reboot_flag implementation" fastboot: Implement generic fastboot_set_reboot_flag Roman Stratiienko (1): fastboot: reinit partition after storing GPT or MBR configs/mt8512_bm1_emmc_defconfig | 3 ++- configs/mt8518_ap1_emmc_defconfig | 3 ++- configs/pumpkin_defconfig | 3 ++- doc/android/fastboot.rst | 3 +++ drivers/dfu/dfu_sf.c | 2 +- drivers/fastboot/Kconfig | 72 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------- drivers/fastboot/Makefile | 1 - drivers/fastboot/fb_bcb_impl.c | 43 ------------------------------------------- drivers/fastboot/fb_command.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/fastboot/fb_common.c | 16 +++++++++++++++- drivers/fastboot/fb_mmc.c | 54 ++++++++++++++++++++++++++++++++++++------------------ include/fastboot.h | 15 ++++++--------- 12 files changed, 188 insertions(+), 99 deletions(-) delete mode 100644 drivers/fastboot/fb_bcb_impl.c

2 1

[PATCH 1/3] common: SCP03 control (enable and provision of keys)
by Jorge Ramirez-Ortiz 08 Feb '21

08 Feb '21

This Trusted Application allows enabling and provisioning SCP03 keys on TEE controlled secure element (ie, NXP SE050) For information on SCP03, check the Global Platform HomePage[1] [1] globalplatform.org Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- common/Kconfig | 8 ++++++ common/Makefile | 1 + common/scp03.c | 52 ++++++++++++++++++++++++++++++++++++ include/scp03.h | 19 +++++++++++++ include/tee/optee_ta_scp03.h | 21 +++++++++++++++ 5 files changed, 101 insertions(+) create mode 100644 common/scp03.c create mode 100644 include/scp03.h create mode 100644 include/tee/optee_ta_scp03.h diff --git a/common/Kconfig b/common/Kconfig index 2bb3798f80..482f123534 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -588,6 +588,14 @@ config AVB_BUF_SIZE endif # AVB_VERIFY +config SCP03 + bool "Build SCP03 - Secure Channel Protocol O3 - controls" + depends on OPTEE || SANDBOX + depends on TEE + help + This option allows U-Boot to enable and or provision SCP03 on an OPTEE + controlled Secured Element. + config SPL_HASH bool # "Support hashing API (SHA1, SHA256, etc.)" help diff --git a/common/Makefile b/common/Makefile index daeea67cf2..215b8b26fd 100644 --- a/common/Makefile +++ b/common/Makefile @@ -137,3 +137,4 @@ obj-$(CONFIG_CMD_LOADB) += xyzModem.o obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_AVB_VERIFY) += avb_verify.o +obj-$(CONFIG_SCP03) += scp03.o diff --git a/common/scp03.c b/common/scp03.c new file mode 100644 index 0000000000..c655283387 --- /dev/null +++ b/common/scp03.c @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2021, Foundries.IO + * + */ + +#include <scp03.h> +#include <tee.h> +#include <tee/optee_ta_scp03.h> + +static int scp03_enable(bool provision) +{ + const struct tee_optee_ta_uuid uuid = PTA_SCP03_UUID; + struct tee_open_session_arg session; + struct tee_invoke_arg invoke; + struct tee_param param; + struct udevice *tee = NULL; + + tee = tee_find_device(tee, NULL, NULL, NULL); + if (!tee) + return -ENODEV; + + memset(&session, 0, sizeof(session)); + tee_optee_ta_uuid_to_octets(session.uuid, &uuid); + if (tee_open_session(tee, &session, 0, NULL)) + return -ENODEV; + + memset(&param, 0, sizeof(param)); + param.attr = TEE_PARAM_ATTR_TYPE_VALUE_INPUT; + param.u.value.a = provision; + + memset(&invoke, 0, sizeof(invoke)); + invoke.func = PTA_CMD_ENABLE_SCP03; + invoke.session = session.session; + + if (tee_invoke_func(tee, &invoke, 1, &param)) + return -EIO; + + tee_close_session(tee, session.session); + + return 0; +} + +int tee_enable_scp03(void) +{ + return scp03_enable(false); +} + +int tee_provision_scp03(void) +{ + return scp03_enable(true); +} diff --git a/include/scp03.h b/include/scp03.h new file mode 100644 index 0000000000..034796ada3 --- /dev/null +++ b/include/scp03.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2021, Foundries.IO + * + */ + +#ifndef _SCP03_H +#define _SCP03_H + +/* + * Requests to OPTEE to enable or provision the Secure Channel Protocol on its + * Secure Element + * + * If key provisioning is requested, OPTEE shall generate new SCP03 keys and + * write them to the Secure Element. + */ +int tee_enable_scp03(void); +int tee_provision_scp03(void); +#endif /* _SCP03_H */ diff --git a/include/tee/optee_ta_scp03.h b/include/tee/optee_ta_scp03.h new file mode 100644 index 0000000000..13f9956d98 --- /dev/null +++ b/include/tee/optee_ta_scp03.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ +/* + * (C) Copyright 2021, Foundries.IO + * + */ +#ifndef __TA_SCP03_H +#define __TA_SCP03_H + +#define PTA_SCP03_UUID { 0xbe0e5821, 0xe718, 0x4f77, \ + { 0xab, 0x3e, 0x8e, 0x6c, 0x73, 0xa9, 0xc7, 0x35 } } + +/* + * Enable Secure Channel Protocol functionality (SCP03) on the Secure Element. + * Setting the operation value to something different than NULL will trigger + * the SCP03 provisioning request. + * + * in params[0].a = operation + */ +#define PTA_CMD_ENABLE_SCP03 0 + +#endif /*__TA_SCP03_H*/ -- 2.30.0

3 8

[PATCH v1] test: Allow simple glob pattern in the test name
by Andy Shevchenko 08 Feb '21

08 Feb '21

When run `ut dm [test name]` allow to use simple pattern to run all tests started with given prefix. For example, to run all ACPI test cases: ut dm acpi* Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- test/dm/test-main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 69458d62c869..f15527e13d7b 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -129,17 +129,23 @@ static bool dm_test_run_on_flattree(struct unit_test *test) static bool test_matches(const char *test_name, const char *find_name) { - if (!find_name) + size_t len = find_name ? strlen(find_name) : 0; + + /* Allow glob expansion in the test name */ + if (len && find_name[len - 1] == '*') + len--; + + if (!len) return true; - if (!strcmp(test_name, find_name)) + if (!strncmp(test_name, find_name, len)) return true; /* All tests have this prefix */ if (!strncmp(test_name, "dm_test_", 8)) test_name += 8; - if (!strcmp(test_name, find_name)) + if (!strncmp(test_name, find_name, len)) return true; return false; -- 2.30.0

2 10

[PATCH 0/3] test: Try to deal with some co-dependent tests
by Simon Glass 08 Feb '21

08 Feb '21

Tests are supposed to be independent. With driver model tests, the environment is reset before each test, which ensures that. With Python tests there is no reset of the board between tests, since we want to run all the tests as quickly as possible and without needing the external scripts running constantly. In principle the Python tests can be independent if they each put the world back the way they found it, but it turns out that some are not. This means that some tests cannot be run unless another test is run first. It also means that tests cannot be run in parallel, e.g. on sandbox. This series fixes some of them. Those that remain: test_gpt_swap_partitions - not sure? test_pinmux_status - not sure? test_sqfs_load - cannot be run more than once! test_bind_unbind_with_uclass - relies on previous test The last one would be much better done as a C test, so it doesn't have to deal with the changing driver tree. There isn't a lot of value in running the test on a real board, since sandbox should find any bugs in driver model or the 'bind' command. If the above can be resolved we can enable parallel tests. On my test machine (32 threads) it reduces the time from 38 seconds to 7.5s To use this feature: pip3 install pytest-xdist test/py/test.py -B sandbox --build-dir /tmp/xx -q -k 'not slow' -n32 Simon Glass (3): test: Allow vboot tests to run in parallel test: Allow hush tests to run in parallel test: Allow tpm2 tests to run in parallel test/py/tests/test_hush_if_test.py | 20 ++++-------- test/py/tests/test_tpm2.py | 52 ++++++++++++++++++++++++++---- test/py/tests/test_vboot.py | 30 +++++++++-------- 3 files changed, 69 insertions(+), 33 deletions(-) -- 2.30.0.478.g8a0d178c01-goog

2 5

[PATCH 00/10] smbios: Enhancements for more flexibility
by Simon Glass 08 Feb '21

08 Feb '21

This series includes various patches to allow more flexibility as to where the data for SMBIOS tables comes from: - introduces some standard sysinfo options as a source, e.g. to read strapping pins to determine the board revision - allows the U-Boot version number to be included - allows the version number to be provided programmatically, e.g. to support the build system adding information after U-Boot is built Documentation is added for how to obtain version information. The code is also refactored a little to make it easier to maintain. Simon Glass (10): README: Add doumentation for version information Makefile: Provide numeric versions smbios: Move smbios_write_type to the C file smbios: Use char consistently for the eos member smbios: Set BIOS release version smbios: Use a struct to keep track of context smbios: Drop the eos parameter smbios: Track the end of the string table smbios: Add more options for the BIOS version string smbios: Allow a few values to come from sysinfo Makefile | 4 + README | 92 ++++++++++++ include/asm-generic/global_data.h | 3 + include/smbios.h | 26 ++-- include/sysinfo.h | 11 ++ lib/smbios.c | 240 ++++++++++++++++++++++-------- 6 files changed, 303 insertions(+), 73 deletions(-) -- 2.29.2.729.g45daf8777d-goog

4 16

Wrong check for last block in lib/efi_loader/efi_disk.c?
by Jesper Schmitz Mouridsen 08 Feb '21

08 Feb '21

Hi I was not able to read the last block of my sd card (the gpt backup block) without the following diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index d0aad0252a..ea9d763072 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -147,7 +147,7 @@ static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, (uintptr_t)buffer & (this->media->io_align - 1)) return EFI_INVALID_PARAMETER; if (lba * this->media->block_size + buffer_size > - this->media->last_block * this->media->block_size) + this->media->last_block * this->media->block_size + this->media->block_size) return EFI_INVALID_PARAMETER; Is my math wrong or is my patch correct? With the patch the my efiloader can read the gpt backup block correctly, Thanks /Jesper

1 0