June 2019 - U-Boot

[U-Boot] [PATCH] Fix watchdog timeout setup for mt7623
by Shannon Barber 21 Jun '19

21 Jun '19

Signed-off-by: Shannon Barber <sbarber(a)dataspeedinc.com> --- drivers/watchdog/mtk_wdt.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 0b501733f2..a7d4c7a3b8 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -70,18 +70,30 @@ static int mtk_wdt_expire_now(struct udevice *dev, ulong flags) return 0; } -static void mtk_wdt_set_timeout(struct udevice *dev, unsigned int timeout) +static void mtk_wdt_set_timeout(struct udevice *dev, unsigned int timeout_ms) { struct mtk_wdt_priv *priv = dev_get_priv(dev); /* - * One bit is the value of 512 ticks - * The clock has 32 KHz + * One WDT_LENGTH count is 512 ticks of the wdt clock + * Clock runs at 32768 Hz + * e.g. 15.625 ms per count (nominal) + * We want the ceiling after dividing timeout_ms by 15.625 ms + * We add 15624 prior to the divide to implement the ceiling + * We prevent over-flow by clamping the timeout_ms value here + * as the maximum WDT_LENGTH counts is 1023 -> 15.984375 sec + * We also enforce a minimum of 1 count + * Many watchdog peripherals have a self-imposed count of 1 + * that is added to the register counts. + * The MediaTek docs lack details to know if this is the case here. + * So we enforce a minimum of 1 to guarantee operation. */ - timeout = WDT_LENGTH_TIMEOUT(timeout << 6) | WDT_LENGTH_KEY; - writel(timeout, priv->base + MTK_WDT_LENGTH); - - mtk_wdt_reset(dev); + if(timeout_ms > 15984) timeout_ms = 15984; + u64 timeout_us = timeout_ms * 1000; + u32 timeout_cc = (u32) ( (15624 + timeout_us) / 15625 ); + if(timeout_cc == 0) timeout_cc = 1; + u32 length = WDT_LENGTH_TIMEOUT(timeout_cc) | WDT_LENGTH_KEY; + writel(length, priv->base + MTK_WDT_LENGTH); } static int mtk_wdt_start(struct udevice *dev, u64 timeout, ulong flags) @@ -90,6 +102,8 @@ static int mtk_wdt_start(struct udevice *dev, u64 timeout, ulong flags) mtk_wdt_set_timeout(dev, timeout); + mtk_wdt_reset(dev); + /* Enable watchdog reset signal */ setbits_le32(priv->base + MTK_WDT_MODE, WDT_MODE_EN | WDT_MODE_KEY | WDT_MODE_EXTEN); -- 2.17.1

2 1

[U-Boot] [PATCH] aspeed/watchdog: Correct timeout value
by Joel Stanley 21 Jun '19

21 Jun '19

The driver was using milliseconds and programming it into a register which takes ticks of the watchdog clock, which runs at 1MHz. This meant we were off by 1000 with the desired value. When 06985289d452 ("watchdog: Implement generic watchdog_reset() version") was added the aspeed board would leave the watchdog running, causing it to bite before u-boot was done. Discovered by booting in qemu: $ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_reset U-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930) Model: Aspeed BMC DRAM: 496 MiB WDT: Started with servicing (60s timeout) MMC: In: serial@1e784000 Out: serial@1e784000 Err: serial@1e784000 Watchdog timer expired. Fixes: 06985289d452 ("watchdog: Implement generic watchdog_reset() version") Signed-off-by: Joel Stanley <joel(a)jms.id.au> --- drivers/watchdog/ast_wdt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c index 523484b1fff9..d344d54aee82 100644 --- a/drivers/watchdog/ast_wdt.c +++ b/drivers/watchdog/ast_wdt.c @@ -23,6 +23,12 @@ static int ast_wdt_start(struct udevice *dev, u64 timeout, ulong flags) ulong driver_data = dev_get_driver_data(dev); u32 reset_mode = ast_reset_mode_from_flags(flags); + /* 32 bits at 1MHz is 4294967ms */ + timeout = min_t(u64, timeout, 4294967); + + /* WDT counts in ticks of 1MHz clock. 1ms / 1e3 * 1e6 */ + timeout *= 1000; + clrsetbits_le32(&priv->regs->ctrl, WDT_CTRL_RESET_MASK << WDT_CTRL_RESET_MODE_SHIFT, reset_mode << WDT_CTRL_RESET_MODE_SHIFT); -- 2.20.1

2 3

[U-Boot] [PATCH] doc: Remove duplicated documentation directory
by Breno Matheus Lima 21 Jun '19

21 Jun '19

Commit ad7061ed742e ("doc: Move device tree bindings documentation to doc/device-tree-bindings") moved all device tree binding documentation to doc/device-tree-bindings directory. The current U-Boot project still have two documentation directories: - doc/ - Documentation/ Move all documentation and sphinx files to doc directory so all content can be in a common place. Signed-off-by: Breno Lima <breno.lima(a)nxp.com> --- MAINTAINERS | 2 +- Makefile | 6 +++--- {Documentation => doc}/Makefile | 10 +++++----- {Documentation => doc}/conf.py | 0 .../device-tree-bindings}/arm/l2c2x0.txt | 0 .../device-tree-bindings}/axi/gdsys,ihs_axi.txt | 0 .../board/gdsys,board_gazerbeam.txt | 0 .../device-tree-bindings/clock}/fsl,mpc83xx-clk.txt | 0 .../device-tree-bindings}/cpu/fsl,mpc83xx.txt | 0 .../misc}/misc/fsl,mpc83xx-serdes.txt | 0 .../misc}/misc/gdsys,io-endpoint.txt | 0 .../misc}/misc/gdsys,iocon_fpga.txt | 0 .../misc}/misc/gdsys,iocpu_fpga.txt | 0 .../device-tree-bindings/misc}/misc/gdsys,soc.txt | 0 .../ram/fsl,mpc83xx-mem-controller.txt | 0 .../reserved-memory/reserved-memory.txt | 0 .../device-tree-bindings}/timer/fsl,mpc83xx-timer.txt | 0 {Documentation => doc}/efi.rst | 0 {Documentation => doc}/index.rst | 0 {Documentation => doc}/linker_lists.rst | 0 {Documentation => doc}/media/Makefile | 4 ++-- .../media/linker_lists.h.rst.exceptions | 0 {Documentation => doc}/serial.rst | 0 .../sphinx-static/theme_overrides.css | 0 {Documentation => doc}/sphinx/cdomain.py | 0 {Documentation => doc}/sphinx/kernel_include.py | 0 {Documentation => doc}/sphinx/kerneldoc.py | 0 {Documentation => doc}/sphinx/kfigure.py | 0 {Documentation => doc}/sphinx/load_config.py | 0 {Documentation => doc}/sphinx/parse-headers.pl | 2 +- {Documentation => doc}/sphinx/requirements.txt | 0 {Documentation => doc}/sphinx/rstFlatTable.py | 2 +- 32 files changed, 13 insertions(+), 13 deletions(-) rename {Documentation => doc}/Makefile (91%) rename {Documentation => doc}/conf.py (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/arm/l2c2x0.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/axi/gdsys,ihs_axi.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/board/gdsys,board_gazerbeam.txt (100%) rename {Documentation/devicetree/bindings/clk => doc/device-tree-bindings/clock}/fsl,mpc83xx-clk.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/cpu/fsl,mpc83xx.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings/misc}/misc/fsl,mpc83xx-serdes.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings/misc}/misc/gdsys,io-endpoint.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings/misc}/misc/gdsys,iocon_fpga.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings/misc}/misc/gdsys,iocpu_fpga.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings/misc}/misc/gdsys,soc.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/ram/fsl,mpc83xx-mem-controller.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/reserved-memory/reserved-memory.txt (100%) rename {Documentation/devicetree/bindings => doc/device-tree-bindings}/timer/fsl,mpc83xx-timer.txt (100%) rename {Documentation => doc}/efi.rst (100%) rename {Documentation => doc}/index.rst (100%) rename {Documentation => doc}/linker_lists.rst (100%) rename {Documentation => doc}/media/Makefile (89%) rename {Documentation => doc}/media/linker_lists.h.rst.exceptions (100%) rename {Documentation => doc}/serial.rst (100%) rename {Documentation => doc}/sphinx-static/theme_overrides.css (100%) rename {Documentation => doc}/sphinx/cdomain.py (100%) rename {Documentation => doc}/sphinx/kernel_include.py (100%) rename {Documentation => doc}/sphinx/kerneldoc.py (100%) rename {Documentation => doc}/sphinx/kfigure.py (100%) rename {Documentation => doc}/sphinx/load_config.py (100%) rename {Documentation => doc}/sphinx/parse-headers.pl (99%) rename {Documentation => doc}/sphinx/requirements.txt (100%) rename {Documentation => doc}/sphinx/rstFlatTable.py (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 33fd4652a4..78872169cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -474,7 +474,7 @@ S: Maintained T: git git://git.denx.de/u-boot-efi.git F: doc/README.uefi F: doc/README.iscsi -F: Documentation/efi.rst +F: doc/efi.rst F: include/capitalization.h F: include/cp1250.h F: include/cp437.h diff --git a/Makefile b/Makefile index 9fb90c0779..e4c2d4a517 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ MAKEFLAGS += --no-print-directory # Use 'make C=2' to enable checking of *all* source files, regardless # of whether they are re-compiled or not. # -# See the file "Documentation/sparse.txt" for more details, including +# See the file "doc/sparse.txt" for more details, including # where to get the "sparse" utility. ifeq ("$(origin C)", "command line") @@ -1883,7 +1883,7 @@ help: @echo ' coccicheck - Execute static code analysis with Coccinelle' @echo '' @echo 'Documentation targets:' - @$(MAKE) -f $(srctree)/Documentation/Makefile dochelp + @$(MAKE) -f $(srctree)/doc/Makefile dochelp @echo '' @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' @echo ' make V=2 [targets] 2 => give reason for rebuild of target' @@ -1912,7 +1912,7 @@ DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \ linkcheckdocs dochelp refcheckdocs PHONY += $(DOC_TARGETS) $(DOC_TARGETS): scripts_basic FORCE - $(Q)$(MAKE) $(build)=Documentation $@ + $(Q)$(MAKE) $(build)=doc $@ endif #ifeq ($(config-targets),1) endif #ifeq ($(mixed-targets),1) diff --git a/Documentation/Makefile b/doc/Makefile similarity index 91% rename from Documentation/Makefile rename to doc/Makefile index 2ca77ad0f2..5135a96e88 100644 --- a/Documentation/Makefile +++ b/doc/Makefile @@ -8,7 +8,7 @@ subdir-y := SPHINXBUILD = sphinx-build SPHINXOPTS = SPHINXDIRS = . -_SPHINXDIRS = $(patsubst $(srctree)/Documentation/%/conf.py,%,$(wildcard $(srctree)/Documentation/*/conf.py)) +_SPHINXDIRS = $(patsubst $(srctree)/doc/%/conf.py,%,$(wildcard $(srctree)/doc/*/conf.py)) SPHINX_CONF = conf.py PAPER = BUILDDIR = $(obj)/output @@ -49,10 +49,10 @@ loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit; # * cache folder relative to $(BUILDDIR)/.doctrees # $4 dest subfolder e.g. "man" for man pages at media/man # $5 reST source folder relative to $(srctree)/$(src), -# e.g. "media" for the linux-tv book-set at ./Documentation/media +# e.g. "media" for the linux-tv book-set at ./doc/media quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) - cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2 && \ + cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=doc/media $2 && \ PYTHONDONTWRITEBYTECODE=1 \ BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \ $(SPHINXBUILD) \ @@ -102,7 +102,7 @@ refcheckdocs: cleandocs: $(Q)rm -rf $(BUILDDIR) - $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean + $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=doc/media clean dochelp: @echo ' Linux kernel internal documentation in different formats from ReST:' @@ -121,4 +121,4 @@ dochelp: @echo ' make SPHINX_CONF={conf-file} [target] use *additional* sphinx-build' @echo ' configuration. This is e.g. useful to build with nit-picking config.' @echo - @echo ' Default location for the generated documents is Documentation/output' + @echo ' Default location for the generated documents is doc/output' diff --git a/Documentation/conf.py b/doc/conf.py similarity index 100% rename from Documentation/conf.py rename to doc/conf.py diff --git a/Documentation/devicetree/bindings/arm/l2c2x0.txt b/doc/device-tree-bindings/arm/l2c2x0.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/l2c2x0.txt rename to doc/device-tree-bindings/arm/l2c2x0.txt diff --git a/Documentation/devicetree/bindings/axi/gdsys,ihs_axi.txt b/doc/device-tree-bindings/axi/gdsys,ihs_axi.txt similarity index 100% rename from Documentation/devicetree/bindings/axi/gdsys,ihs_axi.txt rename to doc/device-tree-bindings/axi/gdsys,ihs_axi.txt diff --git a/Documentation/devicetree/bindings/board/gdsys,board_gazerbeam.txt b/doc/device-tree-bindings/board/gdsys,board_gazerbeam.txt similarity index 100% rename from Documentation/devicetree/bindings/board/gdsys,board_gazerbeam.txt rename to doc/device-tree-bindings/board/gdsys,board_gazerbeam.txt diff --git a/Documentation/devicetree/bindings/clk/fsl,mpc83xx-clk.txt b/doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt similarity index 100% rename from Documentation/devicetree/bindings/clk/fsl,mpc83xx-clk.txt rename to doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt diff --git a/Documentation/devicetree/bindings/cpu/fsl,mpc83xx.txt b/doc/device-tree-bindings/cpu/fsl,mpc83xx.txt similarity index 100% rename from Documentation/devicetree/bindings/cpu/fsl,mpc83xx.txt rename to doc/device-tree-bindings/cpu/fsl,mpc83xx.txt diff --git a/Documentation/devicetree/bindings/misc/fsl,mpc83xx-serdes.txt b/doc/device-tree-bindings/misc/misc/fsl,mpc83xx-serdes.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/fsl,mpc83xx-serdes.txt rename to doc/device-tree-bindings/misc/misc/fsl,mpc83xx-serdes.txt diff --git a/Documentation/devicetree/bindings/misc/gdsys,io-endpoint.txt b/doc/device-tree-bindings/misc/misc/gdsys,io-endpoint.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/gdsys,io-endpoint.txt rename to doc/device-tree-bindings/misc/misc/gdsys,io-endpoint.txt diff --git a/Documentation/devicetree/bindings/misc/gdsys,iocon_fpga.txt b/doc/device-tree-bindings/misc/misc/gdsys,iocon_fpga.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/gdsys,iocon_fpga.txt rename to doc/device-tree-bindings/misc/misc/gdsys,iocon_fpga.txt diff --git a/Documentation/devicetree/bindings/misc/gdsys,iocpu_fpga.txt b/doc/device-tree-bindings/misc/misc/gdsys,iocpu_fpga.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/gdsys,iocpu_fpga.txt rename to doc/device-tree-bindings/misc/misc/gdsys,iocpu_fpga.txt diff --git a/Documentation/devicetree/bindings/misc/gdsys,soc.txt b/doc/device-tree-bindings/misc/misc/gdsys,soc.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/gdsys,soc.txt rename to doc/device-tree-bindings/misc/misc/gdsys,soc.txt diff --git a/Documentation/devicetree/bindings/ram/fsl,mpc83xx-mem-controller.txt b/doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt similarity index 100% rename from Documentation/devicetree/bindings/ram/fsl,mpc83xx-mem-controller.txt rename to doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt diff --git a/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt b/doc/device-tree-bindings/reserved-memory/reserved-memory.txt similarity index 100% rename from Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt rename to doc/device-tree-bindings/reserved-memory/reserved-memory.txt diff --git a/Documentation/devicetree/bindings/timer/fsl,mpc83xx-timer.txt b/doc/device-tree-bindings/timer/fsl,mpc83xx-timer.txt similarity index 100% rename from Documentation/devicetree/bindings/timer/fsl,mpc83xx-timer.txt rename to doc/device-tree-bindings/timer/fsl,mpc83xx-timer.txt diff --git a/Documentation/efi.rst b/doc/efi.rst similarity index 100% rename from Documentation/efi.rst rename to doc/efi.rst diff --git a/Documentation/index.rst b/doc/index.rst similarity index 100% rename from Documentation/index.rst rename to doc/index.rst diff --git a/Documentation/linker_lists.rst b/doc/linker_lists.rst similarity index 100% rename from Documentation/linker_lists.rst rename to doc/linker_lists.rst diff --git a/Documentation/media/Makefile b/doc/media/Makefile similarity index 89% rename from Documentation/media/Makefile rename to doc/media/Makefile index 0efd18ab4d..b9b43a34c3 100644 --- a/Documentation/media/Makefile +++ b/doc/media/Makefile @@ -1,7 +1,7 @@ # Rules to convert a .h file to inline RST documentation -SRC_DIR=$(srctree)/Documentation/media -PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl +SRC_DIR=$(srctree)/doc/media +PARSER = $(srctree)/doc/sphinx/parse-headers.pl API = $(srctree)/include FILES = linker_lists.h.rst diff --git a/Documentation/media/linker_lists.h.rst.exceptions b/doc/media/linker_lists.h.rst.exceptions similarity index 100% rename from Documentation/media/linker_lists.h.rst.exceptions rename to doc/media/linker_lists.h.rst.exceptions diff --git a/Documentation/serial.rst b/doc/serial.rst similarity index 100% rename from Documentation/serial.rst rename to doc/serial.rst diff --git a/Documentation/sphinx-static/theme_overrides.css b/doc/sphinx-static/theme_overrides.css similarity index 100% rename from Documentation/sphinx-static/theme_overrides.css rename to doc/sphinx-static/theme_overrides.css diff --git a/Documentation/sphinx/cdomain.py b/doc/sphinx/cdomain.py similarity index 100% rename from Documentation/sphinx/cdomain.py rename to doc/sphinx/cdomain.py diff --git a/Documentation/sphinx/kernel_include.py b/doc/sphinx/kernel_include.py similarity index 100% rename from Documentation/sphinx/kernel_include.py rename to doc/sphinx/kernel_include.py diff --git a/Documentation/sphinx/kerneldoc.py b/doc/sphinx/kerneldoc.py similarity index 100% rename from Documentation/sphinx/kerneldoc.py rename to doc/sphinx/kerneldoc.py diff --git a/Documentation/sphinx/kfigure.py b/doc/sphinx/kfigure.py similarity index 100% rename from Documentation/sphinx/kfigure.py rename to doc/sphinx/kfigure.py diff --git a/Documentation/sphinx/load_config.py b/doc/sphinx/load_config.py similarity index 100% rename from Documentation/sphinx/load_config.py rename to doc/sphinx/load_config.py diff --git a/Documentation/sphinx/parse-headers.pl b/doc/sphinx/parse-headers.pl similarity index 99% rename from Documentation/sphinx/parse-headers.pl rename to doc/sphinx/parse-headers.pl index d410f47567..d4f38262eb 100755 --- a/Documentation/sphinx/parse-headers.pl +++ b/doc/sphinx/parse-headers.pl @@ -382,7 +382,7 @@ ioctl. The EXCEPTIONS_FILE contain two rules to allow ignoring a symbol or to replace the default references by a custom one. -Please read Documentation/doc-guide/parse-headers.rst at the Kernel's +Please read doc/doc-guide/parse-headers.rst at the Kernel's tree for more details. =head1 BUGS diff --git a/Documentation/sphinx/requirements.txt b/doc/sphinx/requirements.txt similarity index 100% rename from Documentation/sphinx/requirements.txt rename to doc/sphinx/requirements.txt diff --git a/Documentation/sphinx/rstFlatTable.py b/doc/sphinx/rstFlatTable.py similarity index 99% rename from Documentation/sphinx/rstFlatTable.py rename to doc/sphinx/rstFlatTable.py index 25feb0d35e..f9a4b46dbe 100755 --- a/Documentation/sphinx/rstFlatTable.py +++ b/doc/sphinx/rstFlatTable.py @@ -54,7 +54,7 @@ from docutils.utils import SystemMessagePropagation # ============================================================================== # The version numbering follows numbering of the specification -# (Documentation/books/kernel-doc-HOWTO). +# (doc/books/kernel-doc-HOWTO). __version__ = '1.0' PY3 = sys.version_info[0] == 3 -- 2.17.1

2 1

[U-Boot] [PATCH] sh: Add myself as SH maintainer
by Marek Vasut 21 Jun '19

21 Jun '19

Add myself as an SH maintainer. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Tom Rini <trini(a)konsulko.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index c41bc89fe9..00f271d181 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -698,6 +698,7 @@ S: Maintained F: arch/sandbox/ SH +M: Marek Vasut <marek.vasut+renesas(a)gmail.com> M: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> S: Maintained T: git git://git.denx.de/u-boot-sh.git -- 2.20.1

2 1

[U-Boot] pull request: u-boot-mpc85xx/master
by Prabhakar Kushwaha 21 Jun '19

21 Jun '19

Dear Tom, Please find my pull request for u-boot-mpc85xx/master Summary: - PCIe driver change to support DM model - T2080QDS migrated to use PCIe DM model Travis-CI: https://travis-ci.org/prabhukush/u-boot/builds/548042921 --pk (prabhakar: prabhu_kush) -------------------------------------------------------------------------------------------------------------------------------------------- The following changes since commit 77f6e2dd0551d8a825bab391a1bd6b838874bcd4: Merge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi (2019-06-15 13:03:00 -0400) are available in the git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx.git HEAD for you to fetch changes up to 70833d530e3b9a776c5127487c7d3c1a1bb238cc: configs: T2080QDS: Enable PCIe driver (2019-06-20 10:55:22 +0530) ---------------------------------------------------------------- Hou Zhiqiang (8): powerpc: mpc85xx: Move CONFIG_FSL_PCIE_DISABLE_ASPM to Kconfig powerpc: mpc85xx: Move CONFIG_FSL_PCIE_RESET to Kconfig powerpc: mpc85xx: Update the condition to compile PCI routines powerpc: T208xQDS: Compile the legacy PCIe routines conditionally t2080: dts: Added PCIe DT nodes dm: pci: add Freescale PowerPC PCIe driver powerpc: T208xQDS: Disable legacy PCIe driver when DM_PCI is enabled configs: T2080QDS: Enable PCIe driver arch/powerpc/cpu/mpc85xx/Kconfig | 29 ++ arch/powerpc/cpu/mpc85xx/pci.c | 2 +- arch/powerpc/dts/t2080.dtsi | 48 +++ arch/powerpc/include/asm/config_mpc85xx.h | 5 - board/freescale/t208xqds/pci.c | 2 + configs/T2080QDS_NAND_defconfig | 3 + configs/T2080QDS_SDCARD_defconfig | 3 + configs/T2080QDS_SECURE_BOOT_defconfig | 3 + configs/T2080QDS_SPIFLASH_defconfig | 3 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 3 + configs/T2080QDS_defconfig | 3 + drivers/pci/Kconfig | 8 + drivers/pci/Makefile | 1 + drivers/pci/pcie_fsl.c | 610 ++++++++++++++++++++++++++++++ drivers/pci/pcie_fsl.h | 56 +++ drivers/pci/pcie_fsl_fixup.c | 50 +++ include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P1023RDB.h | 1 - include/configs/T208xQDS.h | 37 +- include/configs/T208xRDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/sbc8548.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - 36 files changed, 842 insertions(+), 43 deletions(-) create mode 100644 drivers/pci/pcie_fsl.c create mode 100644 drivers/pci/pcie_fsl.h create mode 100644 drivers/pci/pcie_fsl_fixup.c

2 1

[U-Boot] [PULL] u-boot-stm32 for v2019.07 (round 6)
by Patrice CHOTARD 21 Jun '19

21 Jun '19

Hi Tom The following changes since commit 77f6e2dd0551d8a825bab391a1bd6b838874bcd4: Merge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi (2019-06-15 13:03:00 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-stm tags/u-boot-stm32-20190619 for you to fetch changes up to 7c654683464dc4cd89f9a8198e26336263390b57: usb: dwc2: allow peripheral mode for OTG configuration (2019-06-19 16:56:11 +0200) Travis CI status: https://travis-ci.org/pchotard/u-boot/builds/547780537?utm_medium=notificat… ---------------------------------------------------------------- _ Update STM32MP entry in MAINTAINERS _ Handle correctly binding for g-tx-fifo-size for USB DWC2 driver _ Fix trusted STM32MP1 defconfig with correct ethernet driver ---------------------------------------------------------------- Patrice Chotard (2): configs: stm32mp15: Select correct Ethernet driver for trusted mode MAINTAINERS: Remove Christophe Kerello from STM32MP entry Patrick Delaunay (3): usb: dwc2: correctly handle binding for g-tx-fifo-size ARM: dts: stm32mp1: remove override for g-tx-fifo-size usb: dwc2: allow peripheral mode for OTG configuration MAINTAINERS | 1 - arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ---- configs/stm32mp15_trusted_defconfig | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 17 +++++++++++++++-- 4 files changed, 16 insertions(+), 8 deletions(-)

2 1

[U-Boot] Pull request for mmc sub-system for v2019.07
by Peng Fan 21 Jun '19

21 Jun '19

Hi Tom, Please pull mmc-6-19 for v2019.07-rc4 CI: https://travis-ci.org/MrVan/u-boot/builds/547549538 Thanks, Peng. The following changes since commit 77f6e2dd0551d8a825bab391a1bd6b838874bcd4: Merge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi (2019-06-15 13:03:00 -0400) are available in the Git repository at: https://github.com/MrVan/u-boot.git tags/mmc-6-19 for you to fetch changes up to 72119aa14a1c81b5dd2996fc86c80f8d0e2c456d: mmc: Avoid HS400 mode when accessing boot partitions (2019-06-19 13:53:59 +0800) ---------------------------------------------------------------- Marek Vasut (1): mmc: Avoid HS400 mode when accessing boot partitions drivers/mmc/mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[U-Boot] [PATCH] ARM: imx: dh-imx6: Enable DM GPIO
by Marek Vasut 20 Jun '19

20 Jun '19

Enable DM support for regulators and fixed regulator driver and convert USB Vbus control over to the regulators defined in DT. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Ludwig Zenz <lzenz(a)dh-electronics.com> Cc: Stefano Babic <sbabic(a)denx.de> --- board/dhelectronics/dh_imx6/dh_imx6.c | 17 ----------------- configs/dh_imx6_defconfig | 2 ++ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 50e3cb50a3..e5ff91248a 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -196,7 +196,6 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_USB_EHCI_MX6 static void setup_usb(void) { - gpio_request(IMX_GPIO_NR(3, 31), "USB-VBUS"); /* * Set daisy chain for otg_pin_id on MX6Q. * For MX6DL, this bit is reserved. @@ -211,22 +210,6 @@ int board_usb_phy_mode(int port) else return USB_INIT_DEVICE; } - -int board_ehci_power(int port, int on) -{ - switch (port) { - case 0: - break; - case 1: - gpio_direction_output(IMX_GPIO_NR(3, 31), !!on); - break; - default: - printf("MXC USB port %d not yet supported\n", port); - return -EINVAL; - } - - return 0; -} #endif static int setup_dhcom_mac_from_fuse(void) diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 70f0277040..3f615b4634 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -64,6 +64,8 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_SCSI=y CONFIG_SPI=y CONFIG_DM_SPI=y -- 2.20.1

1 0

[U-Boot] [PATCH 0/1] x86: Add basic Slim Bootloader payload support
by Park, Aiden 20 Jun '19

20 Jun '19

From: Aiden Park <aiden.park(a)intel.com> This patch is to enable u-boot as a payload which runs on top of Slim Bootloader(https://github.com/slimbootloader/slimbootloader) boot firmware for x86 platforms. The Slim Bootloader is designed with multi-staqe architecture for the execution from reset vector to OS hand-off, and supports qemu, Apollolake, Whiskeylake and Coffeelake platforms consuming Intel FSP(https://github.com/IntelFsp/FSP) for silicon initialization including CAR and memory initialization. As multi-stage architecture, the Slim Bootloader adopts payload concept which is responsible for OS load from media devices and boot OS and it supports 32-bit PE32, EFI FV and ELF format payloads. The Slim Bootloader passes HOB(Hand Off Block) memory address, which has debug serial port info, memory map info, performance data info and etc., to a payload. U-boot configures serial port, dram, pci, tsc and others with the information from the HOB. The compiled u-boot ELF supports usb, sata and sd/mmc boot which have been verified on qemu and other supported platforms. Aiden Park (1): x86: Add basic Slim Bootloader payload support arch/x86/Kconfig | 5 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/slimbootloader/Kconfig | 23 ++++ arch/x86/cpu/slimbootloader/Makefile | 5 + arch/x86/cpu/slimbootloader/car.S | 10 ++ arch/x86/cpu/slimbootloader/slimbootloader.c | 117 ++++++++++++++++++ .../cpu/slimbootloader/slimbootloader_hob.c | 67 ++++++++++ .../slimbootloader/slimbootloader_serial.c | 66 ++++++++++ arch/x86/dts/Makefile | 3 +- arch/x86/dts/slimbootloader.dts | 33 +++++ .../asm/arch-slimbootloader/slimbootloader.h | 78 ++++++++++++ arch/x86/include/asm/global_data.h | 2 +- arch/x86/lib/asm-offsets.c | 2 +- arch/x86/lib/init_helpers.c | 2 +- board/slimbootloader/Kconfig | 21 ++++ board/slimbootloader/slimbootloader/Kconfig | 51 ++++++++ board/slimbootloader/slimbootloader/Makefile | 5 + .../slimbootloader/slimbootloader.c | 60 +++++++++ .../slimbootloader/slimbootloader_start.S | 31 +++++ configs/slimbootloader_defconfig | 64 ++++++++++ include/configs/slimbootloader.h | 54 ++++++++ 21 files changed, 696 insertions(+), 4 deletions(-) create mode 100644 arch/x86/cpu/slimbootloader/Kconfig create mode 100644 arch/x86/cpu/slimbootloader/Makefile create mode 100644 arch/x86/cpu/slimbootloader/car.S create mode 100644 arch/x86/cpu/slimbootloader/slimbootloader.c create mode 100644 arch/x86/cpu/slimbootloader/slimbootloader_hob.c create mode 100644 arch/x86/cpu/slimbootloader/slimbootloader_serial.c create mode 100644 arch/x86/dts/slimbootloader.dts create mode 100644 arch/x86/include/asm/arch-slimbootloader/slimbootloader.h create mode 100644 board/slimbootloader/Kconfig create mode 100644 board/slimbootloader/slimbootloader/Kconfig create mode 100644 board/slimbootloader/slimbootloader/Makefile create mode 100644 board/slimbootloader/slimbootloader/slimbootloader.c create mode 100644 board/slimbootloader/slimbootloader/slimbootloader_start.S create mode 100644 configs/slimbootloader_defconfig create mode 100644 include/configs/slimbootloader.h -- 2.20.1

1 0

[U-Boot] [PATCH] arm64: zynqmp: add MAINTAINERS entry for Avnet UltraZed
by Luca Ceresoli 20 Jun '19

20 Jun '19

The board was added without adding a MAINTAINERS entry. Fixes: $ ./tools/genboardscfg.py -f WARNING: no status info for 'avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0' WARNING: no maintainers for 'avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0' $ Reported-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8e26eda2c887..29751901d752 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -420,6 +420,12 @@ F: tools/zynqmp* N: ultra96 N: zynqmp +ARM ZYNQMP AVNET ULTRAZED BOARD +M: Luca Ceresoli <luca(a)lucaceresoli.net> +S: Maintained +F: configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +N: ultrazed + ARM ZYNQMP R5 M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained -- 2.21.0

2 2