December 2019 - U-Boot

[PATCH] arm64: zynqmp: Add board_boot_order for MMC boot extension
by Michal Simek 16 Jan '20

16 Jan '20

In past SPL_ZYNQMP_TWO_SDHCI symbol was introduced to handle boards with two sdhci controllers. The problem was that U-Boot is registering controllers based on aliases in DT but bootmode targets specific controller ID. That's why on boards with one "second" sdhci controller bootmode was pointing to second controller(MMC2) but alias was setup to mmc0 (the first controller). And SPL requires to point to mmc0 in this case. Long time ago commit f101e4bd3703 ("spl: add support for alternative boot device") added support for handling multiple bootmodes in SPL. Use this functionality and setup second sdhci controller as backup boot device. Below is table with behavior: HW/bootmode bootorder sd0/sd0 mmc0/mmc1 (mmc1 never called) sd1/sd1 mmc1/mmc0 (mmc0 fails and mmc1 is called) sd0+sd1/sd0 mmc0/mmc1 (mmc1 never called) sd0+sd1/sd1 mmc1/mmc0 (mmc0 never called) All other bootmodes are not affected but order can be extended to cover advance boot flows. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-zynqmp/Kconfig | 11 ----------- arch/arm/mach-zynqmp/spl.c | 14 ++++++++++---- ...ltrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - configs/xilinx_zynqmp_p_a2197_00_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig index 6cf17eb94e11..d82a737a699e 100644 --- a/arch/arm/mach-zynqmp/Kconfig +++ b/arch/arm/mach-zynqmp/Kconfig @@ -117,17 +117,6 @@ config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED config ZYNQ_SDHCI_MAX_FREQ default 200000000 -config SPL_ZYNQMP_TWO_SDHCI - bool "Enable booting from both SDHCIs" - depends on SPL - help - This option reflects that board has two SDHCI controllers which - platform can use as boot device. This option ensures that SPL will - setup BOOT_DEVICE_MMC2 for SDHCI1 controller and BOOT_DEVICE_MMC1 for - SDHCI0 controller. Platforms which have only one SDHCI controller - shouldn't enable this option because it for software SDHCI0 or SDHCI1 - are both covered by BOOT_DEVICE_MMC1. - config SPL_ZYNQMP_ALT_BOOTMODE hex default 0x0 if JTAG_MODE diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index 8bb1cdf69e1b..37f690d9b958 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -65,6 +65,16 @@ void spl_board_init(void) } #endif +void board_boot_order(u32 *spl_boot_list) +{ + spl_boot_list[0] = spl_boot_device(); + + if (spl_boot_list[0] == BOOT_DEVICE_MMC1) + spl_boot_list[1] = BOOT_DEVICE_MMC2; + if (spl_boot_list[0] == BOOT_DEVICE_MMC2) + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} + u32 spl_boot_device(void) { u32 reg = 0; @@ -88,11 +98,7 @@ u32 spl_boot_device(void) #ifdef CONFIG_SPL_MMC_SUPPORT case SD_MODE1: case SD1_LSHFT_MODE: /* not working on silicon v1 */ -/* if both controllers enabled, then these two are the second controller */ -#ifdef CONFIG_SPL_ZYNQMP_TWO_SDHCI return BOOT_DEVICE_MMC2; -/* else, fall through, the one SDHCI controller that is enabled is number 1 */ -#endif case SD_MODE: case EMMC_MODE: return BOOT_DEVICE_MMC1; diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 177558db4198..280983d187a1 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -7,7 +7,6 @@ CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_ZYNQMP_TWO_SDHCI=y CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y diff --git a/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig b/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig index ba2cbaba58e9..f206be8a3145 100644 --- a/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig +++ b/configs/xilinx_zynqmp_p_a2197_00_revA_defconfig @@ -9,7 +9,6 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP SC for Versal" CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_ZYNQMP_USB=y -CONFIG_SPL_ZYNQMP_TWO_SDHCI=y CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index 65ce1ff2d337..c7524f630788 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -7,7 +7,6 @@ CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_PMUFW_INIT_FILE="/mnt/disk/u-boot-bins/zynqmp/zynqmp-zc1751-xm015-dc1/pmufw.bin" CONFIG_ZYNQMP_USB=y -CONFIG_SPL_ZYNQMP_TWO_SDHCI=y CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y -- 2.24.0

2 1

[PATCH] arm64: zynqmp: Fix return value of board_fit_config_name_match
by Michal Simek 16 Jan '20

16 Jan '20

Empty implementation should not return 0 (success) because that mean that passed name matches the board configuration. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-zynqmp/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index 37f690d9b958..76bafcdd2a38 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -139,6 +139,6 @@ int board_fit_config_name_match(const char *name) /* Just empty function now - can't decide what to choose */ debug("%s: %s\n", __func__, name); - return 0; + return -1; } #endif -- 2.24.0

2 1

[PATCH] arm: xilinx: Use device tree which can be passed on cmd line
by Michal Simek 16 Jan '20

16 Jan '20

DEVICE_TREE variable has been added by commit 6ab6b2afa091 ("dts: re-write dts/Makefile more simply with Kbuild") where DT can be specified on command line. If it is not then CONFIG_DEFAULT_DEVICE_TREE is used to ensure backward compatibility. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/Makefile | 2 +- board/xilinx/zynqmp/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 8d3301543959..6a2acee108fa 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -14,7 +14,7 @@ spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_F endif ifeq ($(init-objs),) -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +hw-platform-y :=$(shell echo $(DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\ $(hw-platform-y)/ps7_init_gpl.o) endif diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 5ace6cc1b478..174f4ed24be3 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -14,7 +14,7 @@ spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_IN endif ifeq ($(init-objs),) -hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) +hw-platform-y :=$(shell echo $(DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ $(hw-platform-y)/psu_init_gpl.o) endif -- 2.24.0

2 1

[PATCH 0/2] arm64: zynqmp: Cleanup defconfigs
by Michal Simek 16 Jan '20

16 Jan '20

Hi, over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig. Nand still needs to be validated that's why dc2/dc3 are not moved yet. Boards can be build like this: export DEVICE_TREE="avnet-ultra96-rev1" make xilinx_zynqmp_virt_defconfig make -j Series depends on patches sent before that's why here is full tree: https://github.com/michalsimek/u-boot/tree/20191209-mainline Thanks, Michal Michal Simek (2): arm64: zynqmp: Add missing Kconfig options to zynqmp_virt platform arm64: zynqmp: Use zynqmp_virt platform configs/avnet_ultra96_rev1_defconfig | 90 -------------- configs/xilinx_zynqmp_a2197_revA_defconfig | 113 ------------------ .../xilinx_zynqmp_e_a2197_00_revA_defconfig | 111 ----------------- .../xilinx_zynqmp_g_a2197_00_revA_defconfig | 111 ----------------- .../xilinx_zynqmp_m_a2197_01_revA_defconfig | 111 ----------------- .../xilinx_zynqmp_m_a2197_02_revA_defconfig | 111 ----------------- .../xilinx_zynqmp_m_a2197_03_revA_defconfig | 111 ----------------- .../xilinx_zynqmp_p_a2197_00_revA_defconfig | 111 ----------------- configs/xilinx_zynqmp_virt_defconfig | 28 ++++- configs/xilinx_zynqmp_zc1232_revA_defconfig | 50 -------- configs/xilinx_zynqmp_zc1254_revA_defconfig | 50 -------- .../xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 95 --------------- .../xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 68 ----------- .../xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 61 ---------- configs/xilinx_zynqmp_zcu100_revC_defconfig | 87 -------------- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 112 ----------------- configs/xilinx_zynqmp_zcu102_revA_defconfig | 112 ----------------- configs/xilinx_zynqmp_zcu102_revB_defconfig | 111 ----------------- configs/xilinx_zynqmp_zcu104_revA_defconfig | 92 -------------- configs/xilinx_zynqmp_zcu104_revC_defconfig | 96 --------------- configs/xilinx_zynqmp_zcu106_revA_defconfig | 105 ---------------- configs/xilinx_zynqmp_zcu111_revA_defconfig | 94 --------------- configs/xilinx_zynqmp_zcu1275_revA_defconfig | 50 -------- configs/xilinx_zynqmp_zcu1275_revB_defconfig | 59 --------- configs/xilinx_zynqmp_zcu216_revA_defconfig | 95 --------------- 25 files changed, 26 insertions(+), 2208 deletions(-) delete mode 100644 configs/avnet_ultra96_rev1_defconfig delete mode 100644 configs/xilinx_zynqmp_a2197_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_e_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_g_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_01_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_02_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_m_a2197_03_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_p_a2197_00_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig delete mode 100644 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu102_revB_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu1275_revA_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu1275_revB_defconfig delete mode 100644 configs/xilinx_zynqmp_zcu216_revA_defconfig -- 2.24.0

3 8

[PATCH] arm64: zynqmp: Move PANIC to Kconfig
by Michal Simek 16 Jan '20

16 Jan '20

Convert another option Kconfig. Reported-by: Robert P. J. Day <rpjday(a)crashcourse.ca> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_single_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 + include/configs/xilinx_zynqmp.h | 1 - 11 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 280983d187a1..71e0d2726ed0 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -56,5 +56,6 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y +CONFIG_PANIC_HANG=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index e861cf691056..d953c91a66ed 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -49,4 +49,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 644223633bc7..cb2983d2476e 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -55,4 +55,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 5b468f1cfab6..f7bec364c386 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -55,4 +55,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index d490f357b7ac..01e097199155 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -51,4 +51,5 @@ CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y CONFIG_SYS_NAND_MAX_CHIPS=2 +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index 21aafe1d275e..20e76cb11e8b 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -50,4 +50,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ARASAN=y +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 902dceb0f622..c6e03cd256d4 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -62,4 +62,5 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y +CONFIG_PANIC_HANG=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 4047475d3c11..ab46d16791ab 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -123,6 +123,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_WDT=y CONFIG_WDT_CDNS=y +CONFIG_PANIC_HANG=y CONFIG_SPL_GZIP=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index ae85bb480526..0dfd38d46981 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -85,4 +85,5 @@ CONFIG_USB_GADGET_MANUFACTURER="Xilinx" CONFIG_USB_GADGET_VENDOR_NUM=0x03FD CONFIG_USB_GADGET_PRODUCT_NUM=0x0300 CONFIG_USB_FUNCTION_THOR=y +CONFIG_PANIC_HANG=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig index 3532ff27841a..6d27cc761fcc 100644 --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig @@ -80,4 +80,5 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_PANIC_HANG=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e7eb8dbfcb45..b13765e17593 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -94,7 +94,6 @@ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_PANIC_HANG #define CONFIG_SYS_MAXARGS 64 /* Ethernet driver */ -- 2.24.0

2 1

[U-Boot] [PATCH v2 0/2] env: Access Environment in SPI flashes before relocation
by Heiko Schocher 16 Jan '20

16 Jan '20

Add the possibility to access Environment stored in SPI NOR Flash before relocation. This is used in DM/DTS rework for the aristainetos boards. There mutliple DTS are packed into a FIT image and through a variable in the Environment the correct DTS will be selected. For this we need very early access to the Environment. Also may this is good for selecting the console baudrate again through Environment which I think currently does not work for any board based on DM/DTS and with Environment in SPI NOR flash. base: 3ff1ff3ff7 - Merge branch '2019-11-12-migrate-SYS_REDUNDAND_ENVIRONMENT' travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/612239100 (travis has currently some problems...) Therefore I started an build on azure, which worked, see: https://dev.azure.com/hs0298/hs/_build/results?buildId=1&view=results Changes in v2: - patch "env: split env_import_redund into 2 functions" is new in version 2. Idea is to not duplicate too much code as Simon suggested. - env_sf_init_early() always return 0 now. If we do not return 0 in this function, env_set_inited() never get called, which has the consequence that env_load/save/erase never work, because they check if the init bit is set. Heiko Schocher (2): env: split env_import_redund() into 2 functions env: Access Environment in SPI flashes before relocation env/Kconfig | 8 +++++ env/common.c | 40 +++++++++++++++++++------ env/sf.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/env.h | 18 ++++++++++++ 4 files changed, 138 insertions(+), 9 deletions(-) -- 2.21.0

2 6

[PATCH 0/3] RISC-V SiFive FU540 support SPL
by Pragnesh Patel 15 Jan '20

15 Jan '20

This series add support for SPL to FU540. This series depends on https://patchwork.ozlabs.org/patch/1196703/ (riscv: dts: Add hifive-unleashed-a00 dts from Linux) U-Boot SPL can boot from L2 LIM (0x0800_0000) and jump to OpenSBI(FW_DYNAMIC firmware) and U-Boot proper from MMC devices. How to test this patch: 1) Go to OpenSBI-dir : make PLATFORM=sifive/fu540 O=build_dir I=install_dir FW_DYNAMIC=y install 2) cp install_dir/platform/sifive/fu540/firmware/fw_dynamic.bin <u-boot-dir>/ 3) Change to u-boot-dir 4) make sifive_fu540_spl_defconfig 5) make all 6) SD card partition which contains "fw_payload.bin" previously /dev/sdc1 - SiFive bare-metal (or s ->5202) should be now of /dev/sdc1 - 8300 Linux filesystem. 6) sudo dd if=spl/u-boot-spl.bin of=/dev/sdc4 bs=1M 7) sudo dd if=u-boot.itb of=/dev/sdc1 bs=1M Following are the boot messages on FU540 five cores SMP platform: HiFive-U serial #: 05374581 U-Boot SPL 2020.01-rc5-00007-g4a96c4e4ac-dirty (Dec 23 2019 - 16:49:18 +0530) Trying to boot from MMC1 U-Boot 2020.01-rc5-00007-g4a96c4e4ac-dirty (Dec 23 2019 - 16:49:18 +0530) CPU: rv64imafdc Model: SiFive HiFive Unleashed A00 DRAM: 8 GiB MMC: spi@10050000:mmc@0: 0 In: serial@10010000 Out: serial@10010000 Err: serial@10010000 Net: eth0: ethernet@10090000 Hit any key to stop autoboot: 0 => => setenv serverip 172.16.35.74;setenv ipaddr 172.16.35.40;tftpboot 0x83000000 fit.itb;bootm 0x83000000 ethernet@10090000: PHY present at 0 ethernet@10090000: Starting autonegotiation... ethernet@10090000: Autonegotiation complete ethernet@10090000: link up, 100Mbps full-duplex (lpa: 0x41e1) Using ethernet@10090000 device TFTP from server 172.16.35.74; our IP address is 172.16.35.40 Filename 'fit.itb'. Load address: 0x83000000 Loading: ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################### 876 KiB/s done Bytes transferred = 13823823 (d2ef4f hex) ## Loading kernel from FIT Image at 83000000 ... Using 'config-1' configuration Trying 'kernel@1' kernel subimage Description: Linux kernel Type: Kernel Image Compression: uncompressed Data Start: 0x830000d8 Data Size: 9247260 Bytes = 8.8 MiB Architecture: RISC-V OS: Linux Load Address: 0x80200000 Entry Point: 0x80200000 Verifying Hash Integrity ... OK ## Loading ramdisk from FIT Image at 83000000 ... Using 'config-1' configuration Trying 'ramdisk@1' ramdisk subimage Description: ramdisk Type: RAMDisk Image Compression: gzip compressed Data Start: 0x838d3378 Data Size: 4568674 Bytes = 4.4 MiB Architecture: RISC-V OS: Linux Load Address: 0x82000000 Entry Point: unavailable Verifying Hash Integrity ... OK Loading ramdisk from 0x838d3378 to 0x82000000 WARNING: 'compression' nodes for ramdisks are deprecated, please fix your .its file! ## Loading fdt from FIT Image at 83000000 ... Using 'config-1' configuration Trying 'fdt@1' fdt subimage Description: unavailable Type: Flat Device Tree Compression: uncompressed Data Start: 0x838d1b80 Data Size: 6023 Bytes = 5.9 KiB Architecture: RISC-V Verifying Hash Integrity ... OK Booting using the fdt blob at 0x838d1b80 Loading Kernel Image Using Device Tree in place at 00000000838d1b80, end 00000000838d6306 Starting kernel ... [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000 [ 0.000000] Linux version 5.3.0-13236-g97f9a3c4eee5 (pragneshp@sachinj2-OptiPlex-7010) (gcc version 8.2.0 (Buildroot 2018.11-rc2-00003-ga0787e9 [ 0.000000] earlycon: sifive0 at MMIO 0x0000000010010000 (options '') [ 0.000000] printk: bootconsole [sifive0] enabled [ 0.000000] Initial ramdisk at: 0x(____ptrval____) (4568674 bytes) [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000080200000-0x00000000ffffffff] [ 0.000000] Normal [mem 0x0000000100000000-0x000000027fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000080200000-0x000000027fffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x000000027fffffff] [ 0.000000] software IO TLB: mapped [mem 0xfbfff000-0xfffff000] (64MB) [ 0.000000] CPU with hartid=0 is not available [ 0.000000] CPU with hartid=0 is not available [ 0.000000] elf_hwcap is 0x112d [ 0.000000] percpu: Embedded 17 pages/cpu s30680 r8192 d30760 u69632 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 2067975 [ 0.000000] Kernel command line: earlycon=sifive,0x10010000 console=ttySIF0,115200 [ 0.000000] Dentry cache hash table entries: 1048576 (order: 11, 8388608 bytes, linear) [ 0.000000] Inode-cache hash table entries: 524288 (order: 10, 4194304 bytes, linear) [ 0.000000] Sorting __ex_table... [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] Memory: 8179828K/8386560K available (6081K kernel code, 388K rwdata, 2025K rodata, 209K init, 307K bss, 206732K reserved, 0K cma-r) [ 0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1 [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=4. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4 [ 0.000000] NR_IRQS: 0, nr_irqs: 0, preallocated irqs: 0 [ 0.000000] plic: mapped 53 interrupts with 4 handlers for 9 contexts. [ 0.000000] riscv_timer_init_dt: Registering clocksource cpuid [0] hartid [1] [ 0.000000] clocksource: riscv_clocksource: mask: 0xffffffffffffffff max_cycles: 0x1d854df40, max_idle_ns: 3526361616960 ns [ 0.000007] sched_clock: 64 bits at 1000kHz, resolution 1000ns, wraps every 2199023255500ns [ 0.008475] Console: colour dummy device 80x25 [ 0.012817] Calibrating delay loop (skipped), value calculated using timer frequency.. 2.00 BogoMIPS (lpj=4000) [ 0.022843] pid_max: default: 32768 minimum: 301 [ 0.027914] Mount-cache hash table entries: 16384 (order: 5, 131072 bytes, linear) [ 0.035329] Mountpoint-cache hash table entries: 16384 (order: 5, 131072 bytes, linear) [ 0.044790] rcu: Hierarchical SRCU implementation. [ 0.049254] smp: Bringing up secondary CPUs ... [ 0.055029] smp: Brought up 1 node, 4 CPUs [ 0.059661] devtmpfs: initialized [ 0.063822] random: get_random_u32 called from bucket_table_alloc.isra.29+0x4e/0x160 with crng_init=0 [ 0.072594] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns [ 0.082004] futex hash table entries: 1024 (order: 4, 65536 bytes, linear) [ 0.089515] NET: Registered protocol family 16 [ 0.105942] vgaarb: loaded [ 0.108197] SCSI subsystem initialized [ 0.111980] usbcore: registered new interface driver usbfs [ 0.117135] usbcore: registered new interface driver hub [ 0.122519] usbcore: registered new device driver usb [ 0.128108] clocksource: Switched to clocksource riscv_clocksource [ 0.140305] NET: Registered protocol family 2 [ 0.144473] tcp_listen_portaddr_hash hash table entries: 4096 (order: 4, 65536 bytes, linear) [ 0.152647] TCP established hash table entries: 65536 (order: 7, 524288 bytes, linear) [ 0.162267] TCP bind hash table entries: 65536 (order: 8, 1048576 bytes, linear) [ 0.172183] TCP: Hash tables configured (established 65536 bind 65536) [ 0.178366] UDP hash table entries: 4096 (order: 5, 131072 bytes, linear) [ 0.185164] UDP-Lite hash table entries: 4096 (order: 5, 131072 bytes, linear) [ 0.192575] NET: Registered protocol family 1 [ 0.196784] RPC: Registered named UNIX socket transport module. [ 0.202175] RPC: Registered udp transport module. [ 0.206857] RPC: Registered tcp transport module. [ 0.211533] RPC: Registered tcp NFSv4.1 backchannel transport module. [ 0.217963] PCI: CLS 0 bytes, default 64 [ 0.222163] Unpacking initramfs... [ 0.578809] Freeing initrd memory: 4460K [ 0.582984] workingset: timestamp_bits=62 max_order=21 bucket_order=0 [ 0.596653] NFS: Registering the id_resolver key type [ 0.600998] Key type id_resolver registered [ 0.605099] Key type id_legacy registered [ 0.609098] nfs4filelayout_init: NFSv4 File Layout Driver Registering... [ 0.615937] 9p: Installing v9fs 9p2000 file system support [ 0.621588] NET: Registered protocol family 38 [ 0.625709] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 253) [ 0.633058] io scheduler mq-deadline registered [ 0.637568] io scheduler kyber registered [ 0.685647] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled [ 0.692241] 10010000.serial: ttySIF0 at MMIO 0x10010000 (irq = 4, base_baud = 0) is a SiFive UART v0 [ 0.700625] printk: console [ttySIF0] enabled [ 0.700625] printk: console [ttySIF0] enabled [ 0.709285] printk: bootconsole [sifive0] disabled [ 0.709285] printk: bootconsole [sifive0] disabled [ 0.719077] 10011000.serial: ttySIF1 at MMIO 0x10011000 (irq = 1, base_baud = 0) is a SiFive UART v0 [ 0.728423] [drm] radeon kernel modesetting enabled. [ 0.745353] loop: module loaded [ 0.748269] sifive_spi 10040000.spi: mapped; irq=3, cs=1 [ 0.753551] sifive_spi 10050000.spi: mapped; irq=5, cs=1 [ 0.758874] libphy: Fixed MDIO Bus: probed [ 0.762947] macb 10090000.ethernet: Registered clk switch 'sifive-gemgxl-mgmt' [ 0.769704] macb: GEM doesn't support hardware ptp. [ 0.774587] libphy: MACB_mii_bus: probed [ 0.940397] Microsemi VSC8541 SyncE 10090000.ethernet-ffffffff:00: attached PHY driver [Microsemi VSC8541 SyncE] (mii_bus:phy_addr=10090000.et) [ 0.954941] macb 10090000.ethernet eth0: Cadence GEM rev 0x10070109 at 0x10090000 irq 6 (70:b3:d5:b7:f5:81) [ 0.964744] e1000e: Intel(R) PRO/1000 Network Driver - 3.2.6-k [ 0.970464] e1000e: Copyright(c) 1999 - 2015 Intel Corporation. [ 0.976458] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 0.982880] ehci-pci: EHCI PCI platform driver [ 0.987336] ehci-platform: EHCI generic platform driver [ 0.992593] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver [ 0.998695] ohci-pci: OHCI PCI platform driver [ 1.003140] ohci-platform: OHCI generic platform driver [ 1.008604] usbcore: registered new interface driver uas [ 1.013666] usbcore: registered new interface driver usb-storage [ 1.019742] mousedev: PS/2 mouse device common for all mice [ 1.050616] mmc_spi spi1.0: SD/MMC host mmc0, no DMA, no WP, no poweroff, cd polling [ 1.057762] usbcore: registered new interface driver usbhid [ 1.063145] usbhid: USB HID core driver [ 1.067858] NET: Registered protocol family 10 [ 1.072475] Segment Routing with IPv6 [ 1.075421] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 1.081800] NET: Registered protocol family 17 [ 1.085918] 9pnet: Installing 9P2000 support [ 1.090013] Key type dns_resolver registered [ 1.096438] Freeing unused kernel memory: 208K [ 1.100122] This architecture does not have kernel memory protection. [ 1.106536] Run /init as init process Starting syslogd: OK Starting klogd: OK Starting mdev... /etc/init.d/S10mdev: line 9: can't create /proc/sys/kernel/hotplug: nonexistent directory [ 1.167972] mmc0: host does not support reading read-only switch, assuming write-enable [ 1.175230] mmc0: new SDHC card on SPI [ 1.180257] mmcblk0: mmc0:0000 SC16G 14.8 GiB [ 1.214677] mmcblk0: p1 p2 p4 modprobe: can't change directory to '/lib/modules': No such file or directory Initializing random number generator... [ 1.666442] random: dd: uninitialized urandom read (512 bytes read) done. Starting network: udhcpc: started, v1.29.3 udhcpc: sending discover [ 3.756777] macb 10090000.ethernet eth0: link up (100/Full) [ 3.761593] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready udhcpc: sending discover udhcpc: sending select for 172.16.35.21 udhcpc: lease of 172.16.35.21 obtained, lease time 28800 deleting routers adding dns 172.16.34.150 adding dns 172.16.24.25 OK Starting dropbear sshd: [ 4.457029] random: dropbear: uninitialized urandom read (32 bytes read) OK Welcome to Buildroot buildroot login: root Password: # Pragnesh Patel (3): riscv: Add place-holder for FU540 clk and gpio riscv: Add FU540 specific includes riscv: sifive: fu540: add SPL configuration arch/riscv/cpu/u-boot-spl.lds | 1 + arch/riscv/dts/fu540-c000-u-boot.dtsi | 65 + .../dts/hifive-unleashed-a00-u-boot.dtsi | 24 + arch/riscv/include/asm/arch-fu540/cache.h | 43 + arch/riscv/include/asm/arch-fu540/clint.h | 20 + arch/riscv/include/asm/arch-fu540/clk.h | 14 + arch/riscv/include/asm/arch-fu540/gpio.h | 42 + arch/riscv/include/asm/arch-fu540/i2c.h | 48 + arch/riscv/include/asm/arch-fu540/otp.h | 80 ++ arch/riscv/include/asm/arch-fu540/spi.h | 86 ++ arch/riscv/include/asm/arch-fu540/uart.h | 35 + arch/riscv/include/asm/arch-generic/gpio.h | 32 +- arch/riscv/include/asm/csr.h | 2 + board/sifive/fu540/Kconfig | 11 + board/sifive/fu540/MAINTAINERS | 1 + board/sifive/fu540/Makefile | 6 + board/sifive/fu540/ememoryotp.c | 143 ++ board/sifive/fu540/fu540.c | 31 +- board/sifive/fu540/include/ccache.h | 47 + board/sifive/fu540/include/clkutils.h | 75 + board/sifive/fu540/include/ddrregs.h | 622 +++++++++ board/sifive/fu540/include/ememoryotp.h | 24 + board/sifive/fu540/include/fu540-memory-map.h | 427 ++++++ board/sifive/fu540/include/i2c.h | 49 + board/sifive/fu540/include/regconfig-ctl.h | 274 ++++ board/sifive/fu540/include/regconfig-phy.h | 1224 +++++++++++++++++ board/sifive/fu540/include/spi.h | 233 ++++ board/sifive/fu540/include/uart.h | 54 + board/sifive/fu540/include/ux00ddr.h | 268 ++++ board/sifive/fu540/include/ux00prci.h | 206 +++ board/sifive/fu540/spl.c | 321 +++++ board/sifive/fu540/uart.c | 64 + configs/sifive_fu540_spl_defconfig | 23 + include/configs/sifive-fu540.h | 17 + lib/Makefile | 1 + 35 files changed, 4583 insertions(+), 30 deletions(-) create mode 100644 arch/riscv/dts/fu540-c000-u-boot.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi create mode 100644 arch/riscv/include/asm/arch-fu540/cache.h create mode 100644 arch/riscv/include/asm/arch-fu540/clint.h create mode 100644 arch/riscv/include/asm/arch-fu540/clk.h create mode 100644 arch/riscv/include/asm/arch-fu540/gpio.h create mode 100644 arch/riscv/include/asm/arch-fu540/i2c.h create mode 100644 arch/riscv/include/asm/arch-fu540/otp.h create mode 100644 arch/riscv/include/asm/arch-fu540/spi.h create mode 100644 arch/riscv/include/asm/arch-fu540/uart.h create mode 100644 board/sifive/fu540/ememoryotp.c create mode 100644 board/sifive/fu540/include/ccache.h create mode 100644 board/sifive/fu540/include/clkutils.h create mode 100644 board/sifive/fu540/include/ddrregs.h create mode 100644 board/sifive/fu540/include/ememoryotp.h create mode 100644 board/sifive/fu540/include/fu540-memory-map.h create mode 100644 board/sifive/fu540/include/i2c.h create mode 100644 board/sifive/fu540/include/regconfig-ctl.h create mode 100644 board/sifive/fu540/include/regconfig-phy.h create mode 100644 board/sifive/fu540/include/spi.h create mode 100644 board/sifive/fu540/include/uart.h create mode 100644 board/sifive/fu540/include/ux00ddr.h create mode 100644 board/sifive/fu540/include/ux00prci.h create mode 100644 board/sifive/fu540/spl.c create mode 100644 board/sifive/fu540/uart.c create mode 100644 configs/sifive_fu540_spl_defconfig -- 2.17.1

7 18

[U-Boot] [PATCH 1/3] mx7ulp_evk: Disable CONFIG_NET
by Fabio Estevam 15 Jan '20

15 Jan '20

Currently the following build warning is seen: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. =================================================== Since the mx7ulp-evk board does not have networking support, explicitly disable networking. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- configs/mx7ulp_evk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index ffd217d515..d79c39d621 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk" CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_IMX_RGPIO2P=y -- 2.17.1

3 7

[U-Boot] [PATCH 00/10] ARM: clearfog: add run-time board detect
by Baruch Siach 14 Jan '20

14 Jan '20

Newer revisions of SolidRun Clearfog Base/Pro carriers and Armada 388 SOM add EEPROM storage for board detection. This patch series adds support for reading EEPROM stored board information, and using it to set RAM training parameters, serdes configuration, and kernel DT selection. The information is stored in EEPROM in TLV format defined for the ONIE project. https://opencomputeproject.github.io/onie/design-spec/hw_requirements.html This series add the sys_eeprom command from ONIE carried U-Boot patch, with a number for changes as described in the patch log. The TLV format is unchanged. This series also adds support for the newly introduced single board, Aramda 385 based Clearfog GTR system. RAM configuration on that system requires both Armada 38x DDR clocks to be enabled. The first patch in this series adds the necessary code to allow per-board selection of DDR clock. Baruch Siach (10): ddr: marvell: a38x: allow board specific clock out setup arm: mvebu: clearfog: enable both DDR clocks cmd: add sys_eeprom command ARM: mvebu: clearfog: add EEPROM devices ARM: mvebu: clearfog: add support for EEPROM TLV info ARM: mvebu: clearfog: read basic TLV data ARM: mvebu: clearfog: print TLV stored product name ARM: mvebu: clearfog: run-time selection of DT file ARM: mvebu: clearfog: add Clearfog GTR support ARM: mvebu: clearfog: add Clearfog Base serdes configuration arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 12 + arch/arm/dts/armada-388-clearfog.dts | 6 + .../arm/dts/armada-38x-solidrun-microsom.dtsi | 8 + arch/arm/mach-mvebu/Kconfig | 1 + board/solidrun/clearfog/clearfog.c | 164 ++- cmd/Kconfig | 12 + cmd/Makefile | 2 + cmd/sys_eeprom.c | 1078 +++++++++++++++++ configs/clearfog_defconfig | 5 + drivers/ddr/marvell/a38x/ddr3_training.c | 10 +- drivers/ddr/marvell/a38x/ddr_topology_def.h | 3 + include/sys_eeprom.h | 169 +++ 12 files changed, 1466 insertions(+), 4 deletions(-) create mode 100644 cmd/sys_eeprom.c create mode 100644 include/sys_eeprom.h -- 2.24.0

2 25

Garbage UART output on RPI 4 with upstream kernel DTB
by Stefan Wahren 13 Jan '20

13 Jan '20

Hi, i tried to run current U-Boot (rpi_4_32b_defconfig) on my RPi 4 with bcm2711-rpi-4-b.dtb from the upstream kernel. Unfortunately i only see garbage on the debug UART (pin 14 & 15). Using the DTB from the downstream kernel has a proper UART output. The config.txt contains debug_uart=1 I compared both and identified an offending Linux commit: ARM: dts: bcm283x: Remove brcm,bcm2835-pl011 compatible Unfortunately reverting this patch still doesn't fix the issue. Any ideas? Best regards Stefan

2 6