July 2021 - U-Boot

Pull request: u-boot-imx u-boot-imx-20210720
by Stefano Babic 21 Jul '21

21 Jul '21

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit f929ce50727bf1019323d6c199dfd3a5755c5474: Merge branch '2021-07-16-cleanup-image-support' (2021-07-17 11:39:50 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20210720 for you to fetch changes up to bd8e26606db62a0434c7f09adfa6ec666b36985b: imx: imx8mm: Add support for Kontron Electronics SL/BL i.MX8M-Mini boards (N801x) (2021-07-19 23:30:47 +0200) ---------------------------------------------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/8325 - imx8: add support for i.MX8ULP Kontron MX8MM - imx6ul: Kontron mx6ul ---------------------------------------------------------------- Frieder Schrempf (2): imx: imx6ul: Add support for Kontron Electronics SL/BL i.MX6UL/ULL boards (N63xx/N64xx) imx: imx8mm: Add support for Kontron Electronics SL/BL i.MX8M-Mini boards (N801x) Peng Fan (24): arm: imx: add i.MX8ULP basic Kconfig option arm: imx: add i.MX8ULP cpu type and helper arm: imx: sys_proto: move boot mode define to common header arm: imx8ulp: support print cpu info imx: imx8ulp: add get reset cause arm: imx: basic i.MX8ULP support arm: imx: parse-container: guard included header files arm: imx: move container Kconfig under mach-imx net: fec_mxc: support i.MX8ULP driver: serial: fsl_lpuart: support i.MX8ULP arm: imx8ulp: add clock support drivers: mmc: fsl_esdhc_imx: support i.MX8ULP arm: imx8ulp: disable wdog3 arm: imx8ulp: add rdc support arm: imx8ulp: add trdc release request arm: imx8ulp: release trdc and assign lpav from RTD to APD imx8ulp: unify rdc functions arm: imx8ulp: add dummy imx_get_mac_from_fuse arm: imx8ulp: add iomuxc support imx8ulp: soc: correct reset cause imx8ulp: move struct mu_type to common header imx8ulp: add upower api support arm: dts: add i.MX8ULP dtsi arm: imx: add i.MX8ULP EVK support Ye Li (20): arm: imx8: Move container parser and image to mach-imx common folder arm: imx8: Move container image header file to mach-imx arm: imx8ulp: add container support driver: misc: Add MU and S400 API to communicate with Sentinel pinctrl: Add pinctrl driver for imx8ulp arm: imx8ulp: soc: Change to use CMC1 to get bootcfg arm: imx8ulp: Enable full L2 cache in SPL arm: imx8ulp: Update the reset vector in u-boot drivers: misc: s400_api: Update S400_SUCCESS_IND to 0xd6 drivers: misc: imx8ulp: Add S400 API for image authentication drivers: misc: imx8ulp: Update S400 API for release RDC drivers: misc: s400_api: Update API for fuse read and write arm: imx8ulp: release and configure XRDC at early phase arm: imx8ulp: Probe the S400 MU device in arch init arm: iMX8ULP: Add boot device relevant functions arm: imx8ulp: Allocate DCNANO and MIPI_DSI to AD domain driver: misc: imx8ulp: Add fuse driver for imx8ulp imx8ulp: Use DGO_GP5 to get boot config imx8ulp: Add workaround for eMMC boot ddr: Add DDR driver for iMX8ULP arch/arm/Kconfig | 11 ++ arch/arm/Makefile | 4 +- arch/arm/dts/Makefile | 9 +- arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi | 7 ++ arch/arm/dts/imx6ul-kontron-n631x-s.dts | 17 +++ arch/arm/dts/imx6ul-kontron-n631x-som.dtsi | 14 +++ arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi | 98 +++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi | 420 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 124 ++++++++++++++++++++++ arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi | 7 ++ arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 +++ arch/arm/dts/imx6ull-kontron-n641x-som.dtsi | 13 +++ arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 ++++++++++++++++++++ arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 237 +++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8mm-kontron-n801x-s.dts | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 40 +++++++ arch/arm/dts/imx8ulp-evk.dts | 223 +++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8ulp-pinfunc.h | 978 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8ulp.dtsi | 728 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-imx/cpu.h | 4 + arch/arm/include/asm/arch-imx8ulp/cgc.h | 130 +++++++++++++++++++++++ arch/arm/include/asm/arch-imx8ulp/clock.h | 41 ++++++++ arch/arm/include/asm/arch-imx8ulp/ddr.h | 38 +++++++ arch/arm/include/asm/arch-imx8ulp/gpio.h | 20 ++++ arch/arm/include/asm/arch-imx8ulp/imx-regs.h | 162 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h | 60 +++++++++++ arch/arm/include/asm/arch-imx8ulp/iomux.h | 82 +++++++++++++++ arch/arm/include/asm/arch-imx8ulp/mu_hal.h | 12 +++ arch/arm/include/asm/arch-imx8ulp/pcc.h | 139 ++++++++++++++++++++++++ arch/arm/include/asm/arch-imx8ulp/rdc.h | 27 +++++ arch/arm/include/asm/arch-imx8ulp/s400_api.h | 41 ++++++++ arch/arm/include/asm/arch-imx8ulp/sys_proto.h | 19 ++++ arch/arm/include/asm/arch-imx8ulp/upower.h | 15 +++ arch/arm/include/asm/arch-mx7ulp/sys_proto.h | 9 -- arch/arm/include/asm/global_data.h | 5 + arch/arm/include/asm/{arch-imx8 => mach-imx}/image.h | 2 + arch/arm/include/asm/mach-imx/sys_proto.h | 13 ++- arch/arm/mach-imx/Kconfig | 15 ++- arch/arm/mach-imx/Makefile | 5 + arch/arm/mach-imx/cmd_dek.c | 2 +- arch/arm/mach-imx/{imx8/image.c => image-container.c} | 51 +++++++-- arch/arm/mach-imx/imx8/Kconfig | 13 --- arch/arm/mach-imx/imx8/Makefile | 3 - arch/arm/mach-imx/imx8/ahab.c | 2 +- arch/arm/mach-imx/imx8m/Kconfig | 8 ++ arch/arm/mach-imx/imx8ulp/Kconfig | 23 ++++ arch/arm/mach-imx/imx8ulp/Makefile | 11 ++ arch/arm/mach-imx/imx8ulp/cgc.c | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/clock.c | 397 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/iomux.c | 58 ++++++++++ arch/arm/mach-imx/imx8ulp/lowlevel_init.S | 26 +++++ arch/arm/mach-imx/imx8ulp/pcc.c | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/rdc.c | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/soc.c | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/upower/Makefile | 6 ++ arch/arm/mach-imx/imx8ulp/upower/upower_api.c | 485 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/upower/upower_api.h | 258 +++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8ulp/upower/upower_hal.c | 179 +++++++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 9 ++ arch/arm/mach-imx/{imx8 => }/parse-container.c | 4 +- arch/arm/mach-imx/spl_imx_romapi.c | 172 +++++++++++++++++++++++------- board/freescale/imx8ulp_evk/Kconfig | 14 +++ board/freescale/imx8ulp_evk/MAINTAINERS | 6 ++ board/freescale/imx8ulp_evk/Makefile | 7 ++ board/freescale/imx8ulp_evk/ddr_init.c | 207 ++++++++++++++++++++++++++++++++++++ board/freescale/imx8ulp_evk/imx8ulp_evk.c | 67 ++++++++++++ board/freescale/imx8ulp_evk/lpddr4_timing.c | 1158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8ulp_evk/spl.c | 115 ++++++++++++++++++++ board/kontron/sl-mx6ul/Kconfig | 15 +++ board/kontron/sl-mx6ul/MAINTAINERS | 9 ++ board/kontron/sl-mx6ul/Makefile | 8 ++ board/kontron/sl-mx6ul/kontron_mx6ul.c | 85 +++++++++++++++ board/kontron/sl-mx6ul/spl.c | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/kontron/sl-mx8mm/Kconfig | 15 +++ board/kontron/sl-mx8mm/MAINTAINERS | 7 ++ board/kontron/sl-mx8mm/Makefile | 9 ++ board/kontron/sl-mx8mm/imximage.cfg | 9 ++ board/kontron/sl-mx8mm/kontron_mx8mm.c | 102 ++++++++++++++++++ board/kontron/sl-mx8mm/lpddr4_timing.c | 1846 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/kontron/sl-mx8mm/spl.c | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/imx8ulp_evk_defconfig | 103 ++++++++++++++++++ configs/kontron_mx6ul_defconfig | 109 +++++++++++++++++++ configs/kontron_mx8mm_defconfig | 124 ++++++++++++++++++++++ drivers/Makefile | 1 + drivers/ddr/imx/Kconfig | 1 + drivers/ddr/imx/imx8ulp/Kconfig | 11 ++ drivers/ddr/imx/imx8ulp/Makefile | 9 ++ drivers/ddr/imx/imx8ulp/ddr_init.c | 217 ++++++++++++++++++++++++++++++++++++++ drivers/misc/Makefile | 1 + drivers/misc/imx8ulp/Makefile | 4 + drivers/misc/imx8ulp/fuse.c | 198 ++++++++++++++++++++++++++++++++++ drivers/misc/imx8ulp/imx8ulp_mu.c | 234 +++++++++++++++++++++++++++++++++++++++++ drivers/misc/imx8ulp/s400_api.c | 244 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/Kconfig | 2 +- drivers/mmc/fsl_esdhc_imx.c | 12 ++- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/pinctrl/nxp/Kconfig | 14 +++ drivers/pinctrl/nxp/Makefile | 1 + drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 44 ++++++++ include/configs/imx8ulp_evk.h | 107 +++++++++++++++++++ include/configs/kontron_common.h | 86 +++++++++++++++ include/configs/kontron_mx6ul.h | 52 +++++++++ include/configs/kontron_mx8mm.h | 66 ++++++++++++ include/dt-bindings/clock/imx8ulp-clock.h | 247 +++++++++++++++++++++++++++++++++++++++++++ include/fsl_lpuart.h | 2 +- 108 files changed, 14758 insertions(+), 87 deletions(-) create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-som.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s.dts create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-som.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s.dts create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-som.dtsi create mode 100644 arch/arm/dts/imx8ulp-evk-u-boot.dtsi create mode 100644 arch/arm/dts/imx8ulp-evk.dts create mode 100644 arch/arm/dts/imx8ulp-pinfunc.h create mode 100644 arch/arm/dts/imx8ulp.dtsi create mode 100644 arch/arm/include/asm/arch-imx8ulp/cgc.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/clock.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/ddr.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/gpio.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/imx-regs.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/iomux.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/mu_hal.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/pcc.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/rdc.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/s400_api.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/sys_proto.h create mode 100644 arch/arm/include/asm/arch-imx8ulp/upower.h rename arch/arm/include/asm/{arch-imx8 => mach-imx}/image.h (95%) rename arch/arm/mach-imx/{imx8/image.c => image-container.c} (79%) create mode 100644 arch/arm/mach-imx/imx8ulp/Kconfig create mode 100644 arch/arm/mach-imx/imx8ulp/Makefile create mode 100644 arch/arm/mach-imx/imx8ulp/cgc.c create mode 100644 arch/arm/mach-imx/imx8ulp/clock.c create mode 100644 arch/arm/mach-imx/imx8ulp/iomux.c create mode 100644 arch/arm/mach-imx/imx8ulp/lowlevel_init.S create mode 100644 arch/arm/mach-imx/imx8ulp/pcc.c create mode 100644 arch/arm/mach-imx/imx8ulp/rdc.c create mode 100644 arch/arm/mach-imx/imx8ulp/soc.c create mode 100644 arch/arm/mach-imx/imx8ulp/upower/Makefile create mode 100644 arch/arm/mach-imx/imx8ulp/upower/upower_api.c create mode 100644 arch/arm/mach-imx/imx8ulp/upower/upower_api.h create mode 100644 arch/arm/mach-imx/imx8ulp/upower/upower_hal.c rename arch/arm/mach-imx/{imx8 => }/parse-container.c (98%) create mode 100644 board/freescale/imx8ulp_evk/Kconfig create mode 100644 board/freescale/imx8ulp_evk/MAINTAINERS create mode 100644 board/freescale/imx8ulp_evk/Makefile create mode 100644 board/freescale/imx8ulp_evk/ddr_init.c create mode 100644 board/freescale/imx8ulp_evk/imx8ulp_evk.c create mode 100644 board/freescale/imx8ulp_evk/lpddr4_timing.c create mode 100644 board/freescale/imx8ulp_evk/spl.c create mode 100644 board/kontron/sl-mx6ul/Kconfig create mode 100644 board/kontron/sl-mx6ul/MAINTAINERS create mode 100644 board/kontron/sl-mx6ul/Makefile create mode 100644 board/kontron/sl-mx6ul/kontron_mx6ul.c create mode 100644 board/kontron/sl-mx6ul/spl.c create mode 100644 board/kontron/sl-mx8mm/Kconfig create mode 100644 board/kontron/sl-mx8mm/MAINTAINERS create mode 100644 board/kontron/sl-mx8mm/Makefile create mode 100644 board/kontron/sl-mx8mm/imximage.cfg create mode 100644 board/kontron/sl-mx8mm/kontron_mx8mm.c create mode 100644 board/kontron/sl-mx8mm/lpddr4_timing.c create mode 100644 board/kontron/sl-mx8mm/spl.c create mode 100644 configs/imx8ulp_evk_defconfig create mode 100644 configs/kontron_mx6ul_defconfig create mode 100644 configs/kontron_mx8mm_defconfig create mode 100644 drivers/ddr/imx/imx8ulp/Kconfig create mode 100644 drivers/ddr/imx/imx8ulp/Makefile create mode 100644 drivers/ddr/imx/imx8ulp/ddr_init.c create mode 100644 drivers/misc/imx8ulp/Makefile create mode 100644 drivers/misc/imx8ulp/fuse.c create mode 100644 drivers/misc/imx8ulp/imx8ulp_mu.c create mode 100644 drivers/misc/imx8ulp/s400_api.c create mode 100644 drivers/pinctrl/nxp/pinctrl-imx8ulp.c create mode 100644 include/configs/imx8ulp_evk.h create mode 100644 include/configs/kontron_common.h create mode 100644 include/configs/kontron_mx6ul.h create mode 100644 include/configs/kontron_mx8mm.h create mode 100644 include/dt-bindings/clock/imx8ulp-clock.h Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

4 5

Help wanted: Adding OpenSSL in FSL HAB
by Daniel D 21 Jul '21

21 Jul '21

Hi, I would like to compile U-Boot with OpenSSL library and I'm using OpenSSL functions in Freescale's " hab.c ". I do not know how to add the ssl & crypto libraries to U-Boot's makefile (as there are many). I'm quite new to these kind of work, hence I request someone to provide some detailed explanation. I've also raised my concern in NXP community and I'm linking that here for your reference. Any help would be much appreciated. Kind regards, Daniel Selvan D. Senior Systems Engineer | Jasmin Infotech -- P Please consider the environment before printing this email.

2 4

[PATCH] build: remove the variable NM in gen_ll_addressable_symbols.sh
by Patrick Delaunay 21 Jul '21

21 Jul '21

With LTO activated, the buildman tools failed with an error on my configuration (Ubuntu 20.04, stm32mp15_trusted_defconfig) with the error: ../arm-linux-gnueabi/bin/nm: scripts/gen_ll_addressable_symbols.sh: file format not recognized It seems the shell variable initialization NM=$(NM) is not correctly interpreted when shell is started in the Makefile, but I have not this issue when I compile the same target without buildman. I don't found the root reason of the problem but I solve it by providing $(NM) as script parameter instead using a shell variable. The command executed is identical: cmd_keep-syms-lto.c := NM=arm-none-linux-gnueabihf-gcc-nm \ u-boot/scripts/gen_ll_addressable_symbols.sh arch/arm/cpu/built-in.o \ .... net/built-in.o >keep-syms-lto.c cmd_keep-syms-lto.c := u-boot/scripts/gen_ll_addressable_symbols.sh \ arm-none-linux-gnueabihf-gcc-nm arch/arm/cpu/built-in.o \ ... net/built-in.o > keep-syms-lto.c Serie-cc: Marek Behún <marek.behun(a)nic.cz> Serie-cc: sjg Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Makefile | 2 +- scripts/Makefile.spl | 2 +- scripts/gen_ll_addressable_symbols.sh | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ca2432c8ce..140dea09f4 100644 --- a/Makefile +++ b/Makefile @@ -1736,7 +1736,7 @@ u-boot-keep-syms-lto_c := $(patsubst %.o,%.c,$(u-boot-keep-syms-lto)) quiet_cmd_keep_syms_lto = KSL $@ cmd_keep_syms_lto = \ - NM=$(NM) $(srctree)/scripts/gen_ll_addressable_symbols.sh $^ >$@ + $(srctree)/scripts/gen_ll_addressable_symbols.sh $(NM) $^ > $@ quiet_cmd_keep_syms_lto_cc = KSLCC $@ cmd_keep_syms_lto_cc = \ diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 5be1a9ba1b..25a3e7fa52 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -459,7 +459,7 @@ u-boot-spl-keep-syms-lto_c := \ quiet_cmd_keep_syms_lto = KSL $@ cmd_keep_syms_lto = \ - NM=$(NM) $(srctree)/scripts/gen_ll_addressable_symbols.sh $^ >$@ + $(srctree)/scripts/gen_ll_addressable_symbols.sh $(NM) $^ > $@ quiet_cmd_keep_syms_lto_cc = KSLCC $@ cmd_keep_syms_lto_cc = \ diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh index 3978a39d97..b8840dd011 100755 --- a/scripts/gen_ll_addressable_symbols.sh +++ b/scripts/gen_ll_addressable_symbols.sh @@ -5,8 +5,11 @@ # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO # does not optimize these symbols away +# The expected parameter of this script is the command requested to have +# the U-Boot symbols to parse, for example: $(NM) $(u-boot-main) + set -e echo '#include <common.h>' -$NM "$@" 2>/dev/null | grep -oe '_u_boot_list_2_[a-zA-Z0-9_]*_2_[a-zA-Z0-9_]*' | \ +$@ 2>/dev/null | grep -oe '_u_boot_list_2_[a-zA-Z0-9_]*_2_[a-zA-Z0-9_]*' | \ sort -u | sed -e 's/^$.*$/extern char \1[];\n__ADDRESSABLE(\1);/' -- 2.25.1

3 2

[PATCH v2] serial: pl011: Enable DEBUG_UART_PL011 in SPL
by Chen Baozi 21 Jul '21

21 Jul '21

Commit b81406db51a6 ("arm: serial: Add debug UART capability to the pl01x driver") add supports to use pl01x as a debug UART. However, due to CONFIG_IS_ENABLED macro requires CONFIG_SPL_* prefix, the _debug_uart_init() would not choose TYPE_PL011 in SPL build. This patch fixes the bug by judging CONFIG_DEBUG_UART_PL011 explicitly. Signed-off-by: Chen Baozi <chenbaozi(a)phytium.com.cn> --- drivers/serial/serial_pl01x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 8ff19acf33..9322a8a6f6 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -404,8 +404,12 @@ static void _debug_uart_init(void) { #ifndef CONFIG_DEBUG_UART_SKIP_INIT struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE; - enum pl01x_type type = CONFIG_IS_ENABLED(DEBUG_UART_PL011) ? - TYPE_PL011 : TYPE_PL010; + enum pl01x_type type; + + if (IS_ENABLED(CONFIG_DEBUG_UART_PL011)) + pl01x_type type = TYPE_PL011; + else + pl01x_type type = TYPE_PL010; pl01x_generic_serial_init(regs, type); pl01x_generic_setbrg(regs, type, -- 2.28.0

1 0

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

21 Jul '21

The following changes since commit dd3dfa50d88cffeb244485594a7bf18c58ae6d63: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2021-07-19 08:41:04 -0400) are available in the Git repository at: git://source.denx.de/u-boot-sh.git master for you to fetch changes up to cd7f92a096a46e5c2a54ca461a5b30739e3fa3e4: ARM: dts: rmobile: Remove multiple unused DT properties on R-Car Gen3 (2021-07-20 23:33:54 +0200) ---------------------------------------------------------------- Marek Vasut (7): sysinfo: rcar3: Add Renesas R-Car Gen3 sysinfo driver ARM: dts: rmobile: Add sysinfo extras on R-Car Gen3 ARM: rmobile: Enable I2C EEPROM support on R-Car Gen3 ARM: rmobile: Enable sysinfo on R-Car Gen3 ARM: rmobile: Align CPU: print with other prints ARM: dts: rmobile: Disable RPC HF by default ARM: dts: rmobile: Remove multiple unused DT properties on R-Car Gen3 arch/arm/dts/r8a77950-salvator-x-u-boot.dts | 19 ++++++++- arch/arm/dts/r8a77950-ulcb-u-boot.dts | 20 ++++++++- arch/arm/dts/r8a77960-salvator-x-u-boot.dts | 19 ++++++++- arch/arm/dts/r8a77960-ulcb-u-boot.dts | 20 ++++++++- arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 19 ++++++++- arch/arm/dts/r8a77965-ulcb-u-boot.dts | 20 ++++++++- arch/arm/dts/r8a77990-ebisu-u-boot.dts | 25 +++++++++++- arch/arm/dts/r8a77995-draak-u-boot.dts | 2 +- arch/arm/mach-rmobile/cpu_info.c | 2 +- configs/r8a77970_eagle_defconfig | 2 + configs/r8a77980_condor_defconfig | 2 + configs/r8a77990_ebisu_defconfig | 10 +++++ configs/r8a77995_draak_defconfig | 2 + configs/rcar3_salvator-x_defconfig | 10 +++++ configs/rcar3_ulcb_defconfig | 10 +++++ drivers/sysinfo/Kconfig | 7 ++++ drivers/sysinfo/Makefile | 1 + drivers/sysinfo/rcar3.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 18 files changed, 378 insertions(+), 9 deletions(-) create mode 100644 drivers/sysinfo/rcar3.c

2 1

[PATCH 1/9] net: eqos: Add PHY reset control for i.MX platform
by Ye Li 21 Jul '21

21 Jul '21

Parse the "phy-reset-gpios", "phy-reset-post-delay" and "phy-reset-duration" properties from eqos node to control the ethernet PHY reset at driver probe. Reset PHY once is enough that can reduce the time cost to get IP after the first time. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- drivers/net/dwc_eth_qos.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index e8242ca..14aafc6 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -303,6 +303,8 @@ struct eqos_priv { struct eqos_tegra186_regs *tegra186_regs; struct reset_ctl reset_ctl; struct gpio_desc phy_reset_gpio; + uint32_t reset_delay; + uint32_t reset_post_delay; struct clk clk_master_bus; struct clk clk_rx; struct clk clk_ptp_ref; @@ -1880,6 +1882,7 @@ static int eqos_probe_resources_imx(struct udevice *dev) { struct eqos_priv *eqos = dev_get_priv(dev); phy_interface_t interface; + int ret = 0; debug("%s(dev=%p):\n", __func__, dev); @@ -1890,8 +1893,52 @@ static int eqos_probe_resources_imx(struct udevice *dev) return -EINVAL; } + ret = gpio_request_by_name(dev, "phy-reset-gpios", 0, + &eqos->phy_reset_gpio, + GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE); + if (ret) { + pr_debug("gpio_request_by_name(phy reset) failed: %d", ret); + } + + if (dm_gpio_is_valid(&eqos->phy_reset_gpio)) { + eqos->reset_delay = dev_read_u32_default(dev, "phy-reset-duration", 1); + if (eqos->reset_delay > 1000) { + pr_err("phy reset duration should be <= 1000ms\n"); + /* property value wrong, use default value */ + eqos->reset_delay = 1; + } + + mdelay(eqos->reset_delay); + + eqos->reset_post_delay = dev_read_u32_default(dev, + "phy-reset-post-delay", + 0); + if (eqos->reset_post_delay > 1000) { + pr_err("phy reset post delay should be <= 1000ms\n"); + /* property value wrong, use default value */ + eqos->reset_post_delay = 0; + } + + ret = dm_gpio_set_value(&eqos->phy_reset_gpio, 0); + if (ret < 0) { + pr_err("dm_gpio_set_value(phy_reset, deassert) failed: %d", ret); + goto err_free_gpio_phy_reset; + } + + if (eqos->reset_post_delay) + mdelay(eqos->reset_post_delay); + } + debug("%s: OK\n", __func__); return 0; + +err_free_gpio_phy_reset: + if (dm_gpio_is_valid(&eqos->phy_reset_gpio)) { + dm_gpio_free(dev, &eqos->phy_reset_gpio); + } + + debug("%s: returns %d\n", __func__, ret); + return ret; } static phy_interface_t eqos_get_interface_imx(struct udevice *dev) @@ -1951,6 +1998,14 @@ static int eqos_remove_resources_stm32(struct udevice *dev) static int eqos_remove_resources_imx(struct udevice *dev) { + struct eqos_priv *eqos = dev_get_priv(dev); + + debug("%s(dev=%p):\n", __func__, dev); + if (dm_gpio_is_valid(&eqos->phy_reset_gpio)) { + dm_gpio_free(dev, &eqos->phy_reset_gpio); + } + + debug("%s: OK\n", __func__); return 0; } -- 2.7.4

2 10

[PATCH 1/3] efi_capsule: Move signature from DTB to .rodata
by Ilias Apalodimas 20 Jul '21

20 Jul '21

The capsule signature is now part of our DTB. This is problematic when a user is allowed to change/fixup that DTB from U-Boots command line since he can overwrite the signature as well. So Instead of adding the key on the DTB, embed it in the u-boot binary it self as part of it's .rodata. This assumes that the U-Boot binary we load is authenticated by a previous boot stage loader. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- board/emulation/common/Makefile | 1 - board/emulation/common/qemu_capsule.c | 43 --------------------------- include/asm-generic/sections.h | 2 ++ lib/efi_loader/Kconfig | 6 ++++ lib/efi_loader/Makefile | 8 +++++ lib/efi_loader/efi_capsule.c | 18 +++++++++-- lib/efi_loader/efi_capsule_key.S | 8 +++++ 7 files changed, 39 insertions(+), 47 deletions(-) delete mode 100644 board/emulation/common/qemu_capsule.c create mode 100644 lib/efi_loader/efi_capsule_key.S diff --git a/board/emulation/common/Makefile b/board/emulation/common/Makefile index 7ed447a69dce..c5b452e7e341 100644 --- a/board/emulation/common/Makefile +++ b/board/emulation/common/Makefile @@ -2,4 +2,3 @@ obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += qemu_mtdparts.o obj-$(CONFIG_SET_DFU_ALT_INFO) += qemu_dfu.o -obj-$(CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT) += qemu_capsule.o diff --git a/board/emulation/common/qemu_capsule.c b/board/emulation/common/qemu_capsule.c deleted file mode 100644 index 6b8a87022a4c..000000000000 --- a/board/emulation/common/qemu_capsule.c +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2020 Linaro Limited - */ - -#include <common.h> -#include <efi_api.h> -#include <efi_loader.h> -#include <env.h> -#include <fdtdec.h> -#include <asm/global_data.h> - -DECLARE_GLOBAL_DATA_PTR; - -int efi_get_public_key_data(void **pkey, efi_uintn_t *pkey_len) -{ - const void *fdt_blob = gd->fdt_blob; - const void *blob; - const char *cnode_name = "capsule-key"; - const char *snode_name = "signature"; - int sig_node; - int len; - - sig_node = fdt_subnode_offset(fdt_blob, 0, snode_name); - if (sig_node < 0) { - EFI_PRINT("Unable to get signature node offset\n"); - return -FDT_ERR_NOTFOUND; - } - - blob = fdt_getprop(fdt_blob, sig_node, cnode_name, &len); - - if (!blob || len < 0) { - EFI_PRINT("Unable to get capsule-key value\n"); - *pkey = NULL; - *pkey_len = 0; - return -FDT_ERR_NOTFOUND; - } - - *pkey = (void *)blob; - *pkey_len = len; - - return 0; -} diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 267f1db73f23..ec992b0c2e3f 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -27,6 +27,8 @@ extern char __efi_helloworld_begin[]; extern char __efi_helloworld_end[]; extern char __efi_var_file_begin[]; extern char __efi_var_file_end[]; +extern char __efi_capsule_sig_begin[]; +extern char __efi_capsule_sig_end[]; /* Private data used by of-platdata devices/uclasses */ extern char __priv_data_start[], __priv_data_end[]; diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 156b39152112..42f1292fa04b 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -213,6 +213,12 @@ config EFI_CAPSULE_AUTHENTICATE Select this option if you want to enable capsule authentication +config EFI_CAPSULE_KEY_PATH + string "Path to .esl file for capsule authentication" + depends on EFI_CAPSULE_AUTHENTICATE + help + Provide the .esl file used for capsule authentication + config EFI_DEVICE_PATH_TO_TEXT bool "Device path to text protocol" default y diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index fd344cea29b0..9b369430e258 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -20,11 +20,19 @@ always += helloworld.efi targets += helloworld.o endif +ifeq ($(CONFIG_EFI_CAPSULE_AUTHENTICATE),y) +EFI_CAPSULE_KEY_PATH := $(subst $\",,$(CONFIG_EFI_CAPSULE_KEY_PATH)) +ifeq ("$(wildcard $(EFI_CAPSULE_KEY_PATH))","") +$(error .esl cerificate not found. Configure your CONFIG_EFI_CAPSULE_KEY_PATH) +endif +endif + obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += efi_bootmgr.o obj-y += efi_boottime.o obj-y += efi_helper.o obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += efi_capsule.o +obj-$(CONFIG_EFI_CAPSULE_AUTHENTICATE) += efi_capsule_key.o obj-$(CONFIG_EFI_CAPSULE_FIRMWARE) += efi_firmware.o obj-y += efi_console.o obj-y += efi_device_path.o diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index b878e71438b8..50e93cad4ee5 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -16,6 +16,7 @@ #include <mapmem.h> #include <sort.h> +#include <asm/sections.h> #include <crypto/pkcs7.h> #include <crypto/pkcs7_parser.h> #include <linux/err.h> @@ -222,12 +223,23 @@ skip: const efi_guid_t efi_guid_capsule_root_cert_guid = EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; +int efi_get_public_key_data(void **pkey, efi_uintn_t *pkey_len) +{ + const void *blob = __efi_capsule_sig_begin; + const int len = __efi_capsule_sig_end - __efi_capsule_sig_begin; + + *pkey = (void *)blob; + *pkey_len = len; + + return 0; +} + efi_status_t efi_capsule_authenticate(const void *capsule, efi_uintn_t capsule_size, void **image, efi_uintn_t *image_size) { u8 *buf; int ret; - void *fdt_pkey, *pkey; + void *stored_pkey, *pkey; efi_uintn_t pkey_len; uint64_t monotonic_count; struct efi_signature_store *truststore; @@ -286,7 +298,7 @@ efi_status_t efi_capsule_authenticate(const void *capsule, efi_uintn_t capsule_s goto out; } - ret = efi_get_public_key_data(&fdt_pkey, &pkey_len); + ret = efi_get_public_key_data(&stored_pkey, &pkey_len); if (ret < 0) goto out; @@ -294,7 +306,7 @@ efi_status_t efi_capsule_authenticate(const void *capsule, efi_uintn_t capsule_s if (!pkey) goto out; - memcpy(pkey, fdt_pkey, pkey_len); + memcpy(pkey, stored_pkey, pkey_len); truststore = efi_build_signature_store(pkey, pkey_len); if (!truststore) goto out; diff --git a/lib/efi_loader/efi_capsule_key.S b/lib/efi_loader/efi_capsule_key.S new file mode 100644 index 000000000000..f7047a42e39d --- /dev/null +++ b/lib/efi_loader/efi_capsule_key.S @@ -0,0 +1,8 @@ +.section .rodata.capsule_key.init,"a" +.balign 16 +.global __efi_capsule_sig_begin +__efi_capsule_sig_begin: +.incbin CONFIG_EFI_CAPSULE_KEY_PATH +__efi_capsule_sig_end: +.global __efi_capsule_sig_end +.balign 16 -- 2.32.0.rc0

7 19

[PATCH] serial: pl011: Enable DEBUG_UART_PL011 in SPL
by Chen Baozi 20 Jul '21

20 Jul '21

Commit b81406db51a6 ("arm: serial: Add debug UART capability to the pl01x driver") add supports to use pl01x as a debug UART. However, due to CONFIG_IS_ENABLED macro requires CONFIG_SPL_* prefix, the _debug_uart_init() would not choose TYPE_PL011 in SPL build. This patch fixes the bug by judging CONFIG_DEBUG_UART_PL011 explicitly. Signed-off-by: Chen Baozi <chenbaozi(a)phytium.com.cn> --- drivers/serial/serial_pl01x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 17b26aed81..f00663a814 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -404,8 +404,11 @@ static void _debug_uart_init(void) { #ifndef CONFIG_DEBUG_UART_SKIP_INIT struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE; - enum pl01x_type type = CONFIG_IS_ENABLED(DEBUG_UART_PL011) ? - TYPE_PL011 : TYPE_PL010; +#if defined(CONFIG_DEBUG_UART_PL011) + enum pl01x_type type = TYPE_PL011; +#else + enum pl01x_type type = TYPE_PL010; +#endif pl01x_generic_serial_init(regs, type); pl01x_generic_setbrg(regs, type, -- 2.28.0

2 1

[PATCH 0/9] tpm: Enhance sandbox tpm2 emulation
by Simon Glass 20 Jul '21

20 Jul '21

At present the TPM2 emulator lacks the ability to load and save the state. This means it cannot be used for verify-boot flow that includes multiple phases (e.g. VPL and SPL). It also lacks support for non-volatile data storage. This series adds these features to the TPM2 emulator, with some code from TPM1 moving into a common file. A few other clean-ups are included to make the two emulators more similar. Simon Glass (9): sandbox: tpm: Split out common nvdata code sandbox: tpm: Tidy up reading and writing of device state sandbox: tpm: Support the define-space command sandbox: tpm: Correct handling of get-capability sandbox: tpm: Finish comments for struct sandbox_tpm2 sandbox: tpm: Track whether the state is valid sandbox: tpm: Support nvdata in TPM2 sandbox: tpm: Support storing device state in tpm2 sandbox: tpm: Support extending a PCR multiple times drivers/tpm/Makefile | 4 +- drivers/tpm/sandbox_common.c | 77 ++++++++++ drivers/tpm/sandbox_common.h | 108 ++++++++++++++ drivers/tpm/tpm2_tis_sandbox.c | 256 +++++++++++++++++++++++++++++++-- drivers/tpm/tpm_tis_sandbox.c | 171 ++++++---------------- include/tpm-v2.h | 2 + 6 files changed, 479 insertions(+), 139 deletions(-) create mode 100644 drivers/tpm/sandbox_common.c create mode 100644 drivers/tpm/sandbox_common.h -- 2.32.0.93.g670b81a890-goog

2 17

[PATCH 0/6] Convert MIPS Malta boards to PCI DM
by Daniel Schwierzeck 20 Jul '21

20 Jul '21

This series converts the PCI host controller drivers used by MIPS Malta and the board-specific PCI setup code to PCI driver model. Because the AMD PCNET driver is already converted to ETH driver model, simply enable CONFIG_DM_ETH as well. A patch in PCI uclass core is currently required for MIPS wanting to use PCI DM (except Octeon MIPS64) due to CONFIG_SYS_SDRAM_BASE being used as a virtual address on all MIPS boards. The series for now is only tested with Qemu and the GT64120 PCI controller. The Malta Qemu tests are already covered by U-Boot CI Support for the MSC01 controller is prepared. The used PCI controller depends on the plugged core card (Qemu emulates the CoreLV card with GT64120). Dynamic selection of the according PCI DT nodes via CONFIG_OF_BOARD_FIXUP is prepared but not yet enabled. This requires fixing of the call order of fix_fdt() in board_init_f, otherwise the passed-in rw_fdt_blob pointer will point to a read-only NOR flash address. I'll send a separate RFC patch for this. I'll send a cleanup series for removing non-DM code after the merge windows has closed and the PCI DM conversion deadline has been enforced. Daniel Schwierzeck (6): dm: pci: add option to map virtual system memory base address pci: gt64120: convert to driver model pci: msc01: convert to driver model MIPS: malta: add DT bindings for PCI host controller MIPS: malta: add support for PCI driver model MIPS: malta: enable PCI driver model arch/mips/Kconfig | 4 ++ arch/mips/dts/mti,malta.dts | 28 +++++++++++++ board/imgtec/malta/malta.c | 84 ++++++++++++++++++++++++++++++++++++- drivers/pci/Kconfig | 13 ++++++ drivers/pci/pci-uclass.c | 9 ++-- drivers/pci/pci_gt64120.c | 72 ++++++++++++++++++++++++++++++- drivers/pci/pci_msc01.c | 70 ++++++++++++++++++++++++++++++- 7 files changed, 274 insertions(+), 6 deletions(-) -- 2.32.0

3 21