February 2019 - U-Boot

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 01 Mar '19

01 Mar '19

SoCFPGA cache/gpio fixes: The following changes since commit afd46c5f13d0c93c44008bd7040227d0b84e31b9: Merge branch '2019-02-22-master-imports' (2019-02-22 22:40:24 -0500) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to 4a9743f73c10a4b3801be3b662a892f61617256e: ARM: socfpga: Clear PL310 early in SPL (2019-02-25 16:07:36 +0100) ---------------------------------------------------------------- Julien Béraud (1): gpio: altera_pio: fix get_value Marek Vasut (3): ARM: cache: Fix incorrect bitwise operation ARM: socfpga: Configure PL310 latencies ARM: socfpga: Clear PL310 early in SPL arch/arm/lib/cache-pl310.c | 2 +- arch/arm/mach-socfpga/misc.c | 3 +++ arch/arm/mach-socfpga/spl_gen5.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/gpio/altera_pio.c | 2 +- 4 files changed, 63 insertions(+), 2 deletions(-)

2 1

[U-Boot] [PULL] u-boot-sh/master
by Marek Vasut 01 Mar '19

01 Mar '19

Gen2/Gen3 fixes for warnings and sdhi: The following changes since commit afd46c5f13d0c93c44008bd7040227d0b84e31b9: Merge branch '2019-02-22-master-imports' (2019-02-22 22:40:24 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to ba41c45ec3402178520ca59d5d847c1c94ae25c4: mmc: renesas: Unconditionally set DTCNTL TAPNUM to 8 (2019-02-25 16:07:41 +0100) ---------------------------------------------------------------- Marek Vasut (9): ARM: rmobile: Imply clock drivers per SoC ARM: rmobile: Imply pinctrl drivers per SoC clk: rmobile: Drop def_bool per SoC pinctrl: renesas: Drop def_bool per SoC ARM: rmobile: Imply SoC per board ARM: rmobile: Sync Gen3 defconfigs ARM: rmobile: Convert Gen2 to OF_SEPARATE mmc: tmio: Clear BUSWIDTH bit when WMODE bit is set mmc: renesas: Unconditionally set DTCNTL TAPNUM to 8 arch/arm/mach-rmobile/Kconfig.32 | 10 ++++++++++ arch/arm/mach-rmobile/Kconfig.64 | 24 ++++++++++++++++++++---- configs/alt_defconfig | 1 - configs/blanche_defconfig | 1 - configs/gose_defconfig | 1 - configs/koelsch_defconfig | 1 - configs/lager_defconfig | 1 - configs/porter_defconfig | 1 - configs/r8a77965_salvator-x_defconfig | 1 - configs/r8a7796_salvator-x_defconfig | 1 - configs/r8a7796_ulcb_defconfig | 1 - configs/silk_defconfig | 1 - configs/stout_defconfig | 1 - drivers/clk/renesas/Kconfig | 10 ---------- drivers/mmc/renesas-sdhi.c | 2 +- drivers/mmc/tmio-common.c | 2 +- drivers/pinctrl/renesas/Kconfig | 10 ---------- 17 files changed, 32 insertions(+), 37 deletions(-) -- Best regards, Marek Vasut

2 1

[U-Boot] [BUG] booting on the Tinker Board (tinker-rk3288_defconfig) is broken
by Heinrich Schuchardt 01 Mar '19

01 Mar '19

Hello Simon, hello Philipp, since patch Merge tag 'for-master-20190201' of git://git.denx.de/u-boot-rockchip e5fd39c886485e3dec77f4438a6e364c2987cf5f booting on the Tinker Board (tinker-rk3288_defconfig) is broken. There is not even any UART output from SPL. Best regards Heinrich

7 37

[U-Boot] [PATCH v3 0/8] arm: socfpga: implement proper peripheral reset handling
by Simon Goldschmidt 01 Mar '19

01 Mar '19

This series implements peripheral reset handling for socfpga gen5. It moves from enabling all peripherals during SPL startup to using the socfpga reset driver from all peripherals and enabling peripherals when they are used. As Linux cannot even handle this in 4.20, the reset driver implements a compatibility mode where it takes all peripherals out of reset before jumpint to the OS if an environment variable "socfpga_permodrst_ungate=1" is found. This is enabled by default for socfpga gen5 boards, but should be moved to default off in the near future once a Linux kernel supports reset handling for all drivers. Changes in v3: - centralize u-boot,dem-pre-reloc for soc, rst and sdr into one common file - rename env var to socfpga_legacy_reset_compat - add env var to CONFIG_EXTRA_ENV_SETTINGS without further ifdefs - changed the order of patches to keep things bisectable - fix falcon mode in SPL should work, too - change env var name "socfpga_permodrst_ungate" to "socfpga_legacy_reset_compat" - in compat mode, don't reset peripherals once they are enabled - add DM_FLAG_OS_PREPARE flag - add DM_FLAG_OS_PREPARE flag - keep the call to enable fpga bridges in SPL Changes in v2: - cleanly merged Linux dts (moved change of SDR controller base address to a separate patch) - this patch is new in v2 - moved from Kernel option "OLD_SOCFPGA_KERNEL_COMPAT" to environment variable "socfpga_permodrst_ungate" - port DDR driver to DM UCLASS_RAM - don't change DDR calibration training driver (code got too big) - use reset.h code instead of socfpga_per_reset() - fix copy/paste issues - add .remove callback to release the resets - add .remove callback to release the resets - removed Kconfig option OLD_SOCFPGA_KERNEL_COMPAT since compatibility now uses an environment variable Simon Goldschmidt (8): arm: socfpga: gen5: sync devicetrees to Linux arm: socfpga: gen5: add reset & sdr node to SPL devicetrees arm: socfpga: gen5: deassert peripheral reset by default reset: socfpga: add reset handling for old kernels arm: socfpga: move gen5 SDR driver to DM mtd: rawnand: denali: add reset handling spi: cadence_qspi: add reset handling arm: socfpga: implement proper peripheral reset arch/arm/Kconfig | 2 + arch/arm/dts/socfpga-common-u-boot.dtsi | 19 +++ arch/arm/dts/socfpga.dtsi | 23 ++- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 6 +- arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 +- .../socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 6 +- arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 +- arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 5 +- .../dts/socfpga_cyclone5_socdk-u-boot.dtsi | 6 +- .../dts/socfpga_cyclone5_sockit-u-boot.dtsi | 6 +- .../dts/socfpga_cyclone5_socrates-u-boot.dtsi | 6 +- arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 - arch/arm/dts/socfpga_cyclone5_sr1500.dts | 5 +- .../socfpga_cyclone5_vining_fpga-u-boot.dtsi | 6 +- .../mach-socfpga/include/mach/sdram_gen5.h | 4 - arch/arm/mach-socfpga/misc_gen5.c | 10 -- arch/arm/mach-socfpga/spl_gen5.c | 38 ++--- drivers/ddr/altera/Kconfig | 1 + drivers/ddr/altera/sdram_gen5.c | 143 ++++++++++++++++-- drivers/ddr/altera/sequencer.c | 9 +- drivers/ddr/altera/sequencer.h | 35 +++++ drivers/mtd/nand/raw/denali.h | 2 + drivers/mtd/nand/raw/denali_dt.c | 15 ++ drivers/reset/reset-socfpga.c | 44 ++++++ drivers/spi/cadence_qspi.c | 17 +++ drivers/spi/cadence_qspi.h | 4 + include/configs/socfpga_common.h | 1 + 28 files changed, 322 insertions(+), 108 deletions(-) create mode 100644 arch/arm/dts/socfpga-common-u-boot.dtsi -- 2.17.1

2 16

[U-Boot] [PATCH 1/3] arm: socfpga: fix comment about SPL memory layout
by Simon Goldschmidt 01 Mar '19

01 Mar '19

The comment about SPL memory layout for socfpga gen5 is outdated: the initial malloc memory is now at the end of the SRAM, gd is below it (see board_init_f_alloc_reserve). Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- include/configs/socfpga_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index c9cbf8f5e3..a3fbca0a5d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -237,9 +237,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * * 0xFFFF_0000 ...... Start of SRAM * 0xFFFF_xxxx ...... Top of stack (grows down) - * 0xFFFF_yyyy ...... Malloc area - * 0xFFFF_zzzz ...... Global Data - * 0xFFFF_FF00 ...... End of SRAM + * 0xFFFF_yyyy ...... Global Data + * 0xFFFF_zzzz ...... Malloc area + * 0xFFFF_FFFF ...... End of SRAM * * SRAM Memory layout for Arria 10: * 0xFFE0_0000 ...... Start of SRAM (bottom) -- 2.17.1

2 8

[U-Boot] [PATCH] spl: add debug print for early malloc usage
by Simon Goldschmidt 01 Mar '19

01 Mar '19

To find out how big the early malloc heap must be in SPL, add a debug print statement that dumps its usage before switching to relocated heap in spl_relocate_stack_gd() via CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- common/spl/spl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index 2e2af1b28e..88d4b8a9bf 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -728,6 +728,8 @@ ulong spl_relocate_stack_gd(void) #if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN) if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) { + debug("SPL malloc() before relocation used 0x%lx bytes (%ld KB)\n", + gd->malloc_ptr, gd->malloc_ptr / 1024); ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN; gd->malloc_base = ptr; gd->malloc_limit = CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN; -- 2.17.1

3 5

[U-Boot] [PATCH 1/1] efi_loader: HII protocols: informative error message
by Heinrich Schuchardt 01 Mar '19

01 Mar '19

When package types are not supported an error message is displayed. Unfortunately there is no hint in the messages that they concern the HII protocols. Furthermore they are indent by tab for no obvious reason. Prefix the messages by "HII: " instead of "\t". Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_hii.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c index d63d2d84184..6ee386596a5 100644 --- a/lib/efi_loader/efi_hii.c +++ b/lib/efi_loader/efi_hii.c @@ -387,7 +387,7 @@ add_packages(struct efi_hii_packagelist *hii, (struct efi_hii_guid_package *)package); break; case EFI_HII_PACKAGE_FORMS: - printf("\tForm package not supported\n"); + printf("HII: Form package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_STRINGS: @@ -395,19 +395,19 @@ add_packages(struct efi_hii_packagelist *hii, (struct efi_hii_strings_package *)package); break; case EFI_HII_PACKAGE_FONTS: - printf("\tFont package not supported\n"); + printf("HII: Font package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_IMAGES: - printf("\tImage package not supported\n"); + printf("HII: Image package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_SIMPLE_FONTS: - printf("\tSimple font package not supported\n"); + printf("HII: Simple font package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_DEVICE_PATH: - printf("\tDevice path package not supported\n"); + printf("HII: Device path package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_KEYBOARD_LAYOUT: @@ -415,7 +415,7 @@ add_packages(struct efi_hii_packagelist *hii, (struct efi_hii_keyboard_package *)package); break; case EFI_HII_PACKAGE_ANIMATIONS: - printf("\tAnimation package not supported\n"); + printf("HII: Animation package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_END: @@ -522,33 +522,33 @@ update_package_list(const struct efi_hii_database_protocol *this, remove_guid_package(hii); break; case EFI_HII_PACKAGE_FORMS: - printf("\tForm package not supported\n"); + printf("HII: Form package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_STRINGS: remove_strings_package(hii); break; case EFI_HII_PACKAGE_FONTS: - printf("\tFont package not supported\n"); + printf("HII: Font package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_IMAGES: - printf("\tImage package not supported\n"); + printf("HII: Image package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_SIMPLE_FONTS: - printf("\tSimple font package not supported\n"); + printf("HII: Simple font package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_DEVICE_PATH: - printf("\tDevice path package not supported\n"); + printf("HII: Device path package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_KEYBOARD_LAYOUT: remove_keyboard_package(hii); break; case EFI_HII_PACKAGE_ANIMATIONS: - printf("\tAnimation package not supported\n"); + printf("HII: Animation package not supported\n"); ret = EFI_INVALID_PARAMETER; break; case EFI_HII_PACKAGE_END: @@ -609,7 +609,7 @@ list_package_lists(const struct efi_hii_database_protocol *this, break; continue; case EFI_HII_PACKAGE_FORMS: - printf("\tForm package not supported\n"); + printf("HII: Form package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_STRINGS: @@ -617,19 +617,19 @@ list_package_lists(const struct efi_hii_database_protocol *this, break; continue; case EFI_HII_PACKAGE_FONTS: - printf("\tFont package not supported\n"); + printf("HII: Font package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_IMAGES: - printf("\tImage package not supported\n"); + printf("HII: Image package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_SIMPLE_FONTS: - printf("\tSimple font package not supported\n"); + printf("HII: Simple font package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_DEVICE_PATH: - printf("\tDevice path package not supported\n"); + printf("HII: Device path package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_KEYBOARD_LAYOUT: @@ -637,7 +637,7 @@ list_package_lists(const struct efi_hii_database_protocol *this, break; continue; case EFI_HII_PACKAGE_ANIMATIONS: - printf("\tAnimation package not supported\n"); + printf("HII: Animation package not supported\n"); ret = EFI_INVALID_PARAMETER; continue; case EFI_HII_PACKAGE_END: -- 2.20.1

2 1

[U-Boot] [PATCH v2 1/2] imx8mq_evk/README: add missing firmware extract step
by Baruch Siach 01 Mar '19

01 Mar '19

Tested-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- board/freescale/imx8mq_evk/README | 1 + 1 file changed, 1 insertion(+) diff --git a/board/freescale/imx8mq_evk/README b/board/freescale/imx8mq_evk/README index 1da6eaf24277..004fa3fb3cf6 100644 --- a/board/freescale/imx8mq_evk/README +++ b/board/freescale/imx8mq_evk/README @@ -18,6 +18,7 @@ Get the ddr and hdmi firmware Note: srctree is U-Boot source directory $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.9.bin $ chmod +x firmware-imx-7.9.bin +$ ./firmware-imx-7.9.bin $ cp firmware-imx-7.9/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $(srctree) $ cp firmware-imx-7.9/firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(srctee) -- 2.20.1

2 3

[U-Boot] [PATCH 1/2] imx8mq_evk: Move CONFIG_ENV_IS_IN_MMC to Kconfig
by Fabio Estevam 01 Mar '19

01 Mar '19

Currently the command "saveenv" is not available. The CONFIG_ENV_IS_IN_MMC symbol has been converted to Kconfig, so fix the problem by moving it to the defconfig. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- configs/imx8mq_evk_defconfig | 1 + include/configs/imx8mq_evk.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 53025e45bc..889d8f1484 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mq-evk" +CONFIG_ENV_IS_IN_MMC=y CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DM_GPIO=y CONFIG_DM_I2C=y diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f0430224cb..a9e38a70e6 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -187,7 +187,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_SIZE 0x1000 -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -- 2.17.1

2 3

[U-Boot] [PATCH 1/2] kbuild: make arch-dtbs target PHONY
by Stephen Warren 01 Mar '19

01 Mar '19

From: Stephen Warren <swarren(a)nvidia.com> Without this, the arch-dtbs target only gets evaluated when building U-Boot the first time, not when re-building (incrementally building) U-Boot. Thus incremental builds ignore changes to DTB files. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- dts/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/dts/Makefile b/dts/Makefile index a7a604303cc6..4970223b3d2e 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -40,6 +40,7 @@ endif echo >&2; \ /bin/false) +PHONY += arch-dtbs arch-dtbs: $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs -- 2.20.1

3 9