October 2019 - U-Boot

[U-Boot] [PATCH] gitlab-ci: fix typo 'plaforms'
by Heinrich Schuchardt 07 Oct '19

07 Oct '19

%s/plaforms/platforms/g Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1c5b4fc76..0c4343468d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ stages: fi; fi; -build all 32bit ARM plaforms: +build all 32bit ARM platforms: tags: [ 'all' ] stage: world build script: @@ -70,7 +70,7 @@ build all 32bit ARM plaforms: exit $ret; fi; -build all 64bit ARM plaforms: +build all 64bit ARM platforms: tags: [ 'all' ] stage: world build script: @@ -84,7 +84,7 @@ build all 64bit ARM plaforms: exit $ret; fi; -build all PowerPC plaforms: +build all PowerPC platforms: tags: [ 'all' ] stage: world build script: @@ -95,7 +95,7 @@ build all PowerPC plaforms: exit $ret; fi; -build all other plaforms: +build all other platforms: tags: [ 'all' ] stage: world build script: -- 2.23.0

3 2

[U-Boot] [PATCH] arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10
by Simon Goldschmidt 07 Oct '19

07 Oct '19

These boards don't have a watchdog enabled in SPL, so make sure CONFIG_SPL_WDT is not enabled. Fixes: commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT") Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- While I think the more fundamental problem is selecting SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way for the upcoming v2019.10 release to prevent breaking s10. --- configs/socfpga_arria10_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_dbm_soc1_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de10_nano_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + 13 files changed, 13 insertions(+) diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index a2d555b9b4..7cb214d655 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -46,3 +46,4 @@ CONFIG_SPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index d591c7e4d7..93254677e7 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -65,3 +65,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 3f9766d0fb..8e5b2e2f66 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig index c6c8f073ea..c73f3821e7 100644 --- a/configs/socfpga_dbm_soc1_defconfig +++ b/configs/socfpga_dbm_soc1_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index bbd9d7f4b4..80ccb33fbb 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index a2f58766cc..98e80b7c86 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -57,3 +57,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index fa2bace56f..efa128ac8e 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -47,4 +47,5 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y +# CONFIG_SPL_WDT is not set # CONFIG_EFI_LOADER is not set diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 9e58fd1158..99cdb26aae 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -51,3 +51,4 @@ CONFIG_MII=y CONFIG_DM_RESET=y CONFIG_SPI=y CONFIG_CADENCE_QSPI=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 39cc753888..e977cd7707 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index a3c6af7810..b570b9dc94 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 1143cd3f37..9eac00e49d 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -68,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 89349ceb4e..092347a6df 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -57,3 +57,4 @@ CONFIG_MII=y CONFIG_DM_RESET=y CONFIG_SPI=y CONFIG_CADENCE_QSPI=y +# CONFIG_SPL_WDT is not set diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 6b2266fdfd..c52afddd20 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +# CONFIG_SPL_WDT is not set -- 2.20.1

3 4

[U-Boot] [PATCH] MAINTAINERS: Update my email address
by Maxime Ripard 07 Oct '19

07 Oct '19

I'm not at bootlin anymore, and my mail address doesn't work any longer. Signed-off-by: Maxime Ripard <mripard(a)kernel.org> --- MAINTAINERS | 2 +- board/sunxi/MAINTAINERS | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e752e4b3de0f..9193f7ccf212 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -365,7 +365,7 @@ F: arch/arm/include/asm/arch-stv0991/ ARM SUNXI M: Jagan Teki <jagan(a)amarulasolutions.com> -M: Maxime Ripard <maxime.ripard(a)bootlin.com> +M: Maxime Ripard <mripard(a)kernel.org> S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git F: arch/arm/cpu/armv7/sunxi/ diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index c7e9d3eda084..88f13533b885 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -151,7 +151,7 @@ F: configs/Bananapi_M2_Ultra_defconfig F: arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts BANANAPI M2 MAGIC BOARD -M: Maxime Ripard <maxime.ripard(a)bootlin.com> +M: Maxime Ripard <mripard(a)kernel.org> S: Maintained F: configs/Bananapi_m2m_defconfig F: arch/arm/dts/sun8i-r16-bananapi-m2m.dts @@ -179,7 +179,7 @@ F: configs/beelink_x2_defconfig F: arch/arm/dts/sun8i-h3-beelink-x2.dts COLOMBUS BOARD -M: Maxime Ripard <maxime.ripard(a)bootlin.com> +M: Maxime Ripard <mripard(a)kernel.org> S: Maintained F: configs/Colombus_defconfig @@ -465,7 +465,7 @@ F: configs/Sunchip_CX-A99_defconfig W: https://linux-sunxi.org/Sunchip_CX-A99 TBS A711 BOARD -M: Maxime Ripard <maxime.ripard(a)bootlin.com> +M: Maxime Ripard <mripard(a)kernel.org> S: Maintained F: configs/tbs_a711_defconfig -- 2.23.0

2 1

[U-Boot] [PATCH] cmd: host: fix seg fault at "host info"
by AKASHI Takahiro 07 Oct '19

07 Oct '19

With the patch below applied, host_block_dev structure was switched to be placed in platdata rather than priv. The command "host info" must be aligned with this change. Otherwise, we will see "Segmentation Fault." Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- cmd/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/host.c b/cmd/host.c index f7d3eae5b1ad..98c4d2a099e9 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, struct host_block_dev *host_dev; #ifdef CONFIG_BLK - host_dev = dev_get_priv(blk_dev->bdev); + host_dev = dev_get_platdata(blk_dev->bdev); #else host_dev = blk_dev->priv; #endif -- 2.21.0

4 5

[U-Boot] [PATCH 0/5] riscv: sifive/fu540: Enable SPI-NOR support
by Jagan Teki 06 Oct '19

06 Oct '19

This patchset, enable SPI-NOR flash on SiFive hifive-unleashed-a00 board. patch 0001 - 02: support devicetree patch 0003: add is25wp256 chip patch 0004 - 05: enable spi-nor flash All tested in Sifive fuse540 hifive-unleashed-a00 board. Any inputs? Jagan. Jagan Teki (5): riscv: dts: Add hifive-unleashed-a00 dts from Linux sifive: fu540: Enable OF_SEPARATE mtd: spi-nor: ids: Add is25wp256 chip riscv: dts: hifive-unleashed-a00: Add -u-boot.dtsi sifive: fu540: Enable spi-nor flash support arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu540-c000.dtsi | 235 ++++++++++++++++++ .../dts/hifive-unleashed-a00-u-boot.dtsi | 11 + arch/riscv/dts/hifive-unleashed-a00.dts | 88 +++++++ board/sifive/fu540/Kconfig | 3 + configs/sifive_fu540_defconfig | 3 +- doc/board/sifive/fu540.rst | 21 +- drivers/mtd/spi/spi-nor-ids.c | 2 + 8 files changed, 362 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/dts/fu540-c000.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00-u-boot.dtsi create mode 100644 arch/riscv/dts/hifive-unleashed-a00.dts -- 2.18.0.321.gffc6fa0e3

3 20

[U-Boot] [PATCH 1/1] cmd: disable CMD_NVEDIT_EFI by default
by Heinrich Schuchardt 06 Oct '19

06 Oct '19

The growth of the UEFI sub-system leads to build failures for systems with strict limits on the U-Boot image size. CMD_NVEDIT_EFI supports displaying and editing of UEFI variables. The setting is not needed for booting. Disabling it by default reduces the size of the U-Boot image by 2 KiB. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 4e61565aab..8e55b34c96 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -531,7 +531,6 @@ config CMD_ENV_FLAGS config CMD_NVEDIT_EFI bool "env [set|print] -e - set/print UEFI variables" depends on EFI_LOADER - default y imply HEXDUMP help UEFI variables are encoded as some form of U-Boot variables. -- 2.23.0

2 1

[U-Boot] [RFC] [PATCH 1/1] Dockerfile: enable colored output
by Heinrich Schuchardt 06 Oct '19

06 Oct '19

Set environment variables needed for colored output. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Hello Tom, I do not have my own Gitlab to test this. But we should get a more legible output with these variables set. Best regards Heinrich --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1d7a3da..7df9e71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,10 @@ FROM ubuntu:xenial-20190720 MAINTAINER Tom Rini <trini(a)konsulko.com> LABEL Description=" This image is for building U-Boot inside a container" +# Let's have colored output +ENV TERM=xterm-256color +ENV PYTEST_ADDOPTS="--color=yes" + # Make sure apt is happy ENV DEBIAN_FRONTEND=noninteractive -- 2.23.0

2 1

[U-Boot] [PATCH 1/1] configs: sheevaplug disable EFI_UNICODE_CAPITALIZATION
by Heinrich Schuchardt 06 Oct '19

06 Oct '19

With upcoming patches u-boot.kwb gets too large. Save 3740 bytes in u-boot.kwb by disabling Unicode support in the UEFI sub-system. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- configs/sheevaplug_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 734e894c98..cc48536415 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -46,3 +46,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y +# CONFIG_EFI_UNICODE_CAPITALIZATION is not set -- 2.23.0

1 0

[U-Boot] [PATCH 1/1] Revert "env: solve compilation error in SPL"
by Tom Rini 06 Oct '19

06 Oct '19

This reverts commit 7d4776545b0f8a8827e5d061206faf61c9ba6ea9. The changes here break environment validation and furthermore do not seem to be required. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Here is what, sadly, is going to I feel be the most frustraiting part of the regression here. The problem that I'm sure was encountered during development that needed this change is not present in mainline. I've done my usual world build with this revert applied and the only changes are that the platforms that had a regression have their functionality back. env/common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/env/common.c b/env/common.c index 3fb60509dd85..4daaa6faea60 100644 --- a/env/common.c +++ b/env/common.c @@ -24,10 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; #include <env_default.h> struct hsearch_data env_htab = { -#if CONFIG_IS_ENABLED(ENV_SUPPORT) - /* defined in flags.c, only compile with ENV_SUPPORT */ .change_ok = env_flags_validate, -#endif }; /* @@ -229,9 +226,7 @@ void env_relocate(void) #if defined(CONFIG_NEEDS_MANUAL_RELOC) env_reloc(); env_fix_drivers(); - - if (env_htab.change_ok) - env_htab.change_ok += gd->reloc_off; + env_htab.change_ok += gd->reloc_off; #endif if (gd->env_valid == ENV_INVALID) { #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) -- 2.17.1

1 1

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

06 Oct '19

The following changes since commit dfd590075ca263d6b3ed22465a94d33a8ee93e07: Merge tag 'efi-2019-10-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi (2019-09-26 17:22:22 -0400) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 49d5fba81c85c65f8b64f79ceece48b590e8316d: ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator (2019-09-30 02:07:02 +0200) ---------------------------------------------------------------- Marek Vasut (1): ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator arch/arm/dts/r8a7795-h3ulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a7795-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a7796-m3ulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a7796-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a77965-m3nulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a77990-ebisu-u-boot.dts | 8 ++++++++ 7 files changed, 44 insertions(+)

2 1