leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2019-06-20-master-imports'

Browse Source 
- Assorted minor fixes
This commit is contained in:
Tom Rini 2019-06-20 21:52:31 -04:00
commit 226a35ef0e
36 changed files with 96 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
MAINTAINERS
View File

@ -55,7 +55,7 @@ M: Alexey Brodkin <alexey.brodkin@synopsys.com>
M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
S: Maintained S: Maintained
L: uboot-snps-arc@synopsys.com L: uboot-snps-arc@synopsys.com
T: git git://git.denx.de/u-boot-arc.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-arc.git
F: arch/arc/ F: arch/arc/
F: board/synopsys/ F: board/synopsys/
@ -84,7 +84,7 @@ F: drivers/mmc/snps_dw_mmc.c
ARM ARM
M: Albert Aribaud <albert.u.boot@aribaud.net> M: Albert Aribaud <albert.u.boot@aribaud.net>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-arm.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-arm.git
F: arch/arm/ F: arch/arm/
F: cmd/arm/ F: cmd/arm/
@ -92,14 +92,14 @@ ARM ALTERA SOCFPGA
M: Marek Vasut <marex@denx.de> M: Marek Vasut <marex@denx.de>
M: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> M: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
S: Maintainted S: Maintainted
T: git git://git.denx.de/u-boot-socfpga.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga.git
F: arch/arm/mach-socfpga/ F: arch/arm/mach-socfpga/
ARM AMLOGIC SOC SUPPORT ARM AMLOGIC SOC SUPPORT
M: Neil Armstrong <narmstrong@baylibre.com> M: Neil Armstrong <narmstrong@baylibre.com>
S: Maintained S: Maintained
L: u-boot-amlogic@groups.io L: u-boot-amlogic@groups.io
T: git git://git.denx.de/u-boot-amlogic.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic.git
F: arch/arm/mach-meson/ F: arch/arm/mach-meson/
F: arch/arm/include/asm/arch-meson/ F: arch/arm/include/asm/arch-meson/
F: drivers/clk/meson/ F: drivers/clk/meson/
@ -153,7 +153,7 @@ M: Stefano Babic <sbabic@denx.de>
M: Fabio Estevam <festevam@gmail.com> M: Fabio Estevam <festevam@gmail.com>
R: NXP i.MX U-Boot Team <uboot-imx@nxp.com> R: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-imx.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git
F: arch/arm/cpu/arm1136/mx*/ F: arch/arm/cpu/arm1136/mx*/
F: arch/arm/cpu/arm926ejs/mx*/ F: arch/arm/cpu/arm926ejs/mx*/
F: arch/arm/cpu/armv7/vf610/ F: arch/arm/cpu/armv7/vf610/
@ -174,7 +174,7 @@ F: arch/arm/include/asm/arch-hi6220/
ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K
M: Stefan Roese <sr@denx.de> M: Stefan Roese <sr@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-marvell.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-marvell.git
F: arch/arm/mach-kirkwood/ F: arch/arm/mach-kirkwood/
F: arch/arm/mach-mvebu/ F: arch/arm/mach-mvebu/
F: drivers/ata/ahci_mvebu.c F: drivers/ata/ahci_mvebu.c
@ -188,7 +188,7 @@ F: drivers/watchdog/orion_wdt.c
ARM MARVELL PXA ARM MARVELL PXA
M: Marek Vasut <marex@denx.de> M: Marek Vasut <marex@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-pxa.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-pxa.git
F: arch/arm/cpu/pxa/ F: arch/arm/cpu/pxa/
F: arch/arm/include/asm/arch-pxa/ F: arch/arm/include/asm/arch-pxa/
@ -217,7 +217,7 @@ N: mediatek
ARM MICROCHIP/ATMEL AT91 ARM MICROCHIP/ATMEL AT91
M: Eugen Hristev <eugen.hristev@microchip.com> M: Eugen Hristev <eugen.hristev@microchip.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-atmel.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-atmel.git
F: arch/arm/mach-at91/ F: arch/arm/mach-at91/
F: board/atmel/ F: board/atmel/
@ -234,7 +234,7 @@ ARM RENESAS RMOBILE/R-CAR
M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
M: Marek Vasut <marek.vasut+renesas@gmail.com> M: Marek Vasut <marek.vasut+renesas@gmail.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-sh.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sh.git
F: arch/arm/mach-rmobile/ F: arch/arm/mach-rmobile/
ARM ROCKCHIP ARM ROCKCHIP
@ -242,7 +242,7 @@ M: Simon Glass <sjg@chromium.org>
M: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> M: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
M: Kever Yang <kever.yang@rock-chips.com> M: Kever Yang <kever.yang@rock-chips.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-rockchip.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git
F: arch/arm/include/asm/arch-rockchip/ F: arch/arm/include/asm/arch-rockchip/
F: arch/arm/mach-rockchip/ F: arch/arm/mach-rockchip/
F: board/rockchip/ F: board/rockchip/
@ -264,7 +264,7 @@ F: tools/rkspi.c
ARM SAMSUNG ARM SAMSUNG
M: Minkyu Kang <mk7.kang@samsung.com> M: Minkyu Kang <mk7.kang@samsung.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-samsung.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-samsung.git
F: arch/arm/mach-exynos/ F: arch/arm/mach-exynos/
F: arch/arm/mach-s5pc1xx/ F: arch/arm/mach-s5pc1xx/
F: arch/arm/cpu/armv7/s5p-common/ F: arch/arm/cpu/armv7/s5p-common/
@ -289,7 +289,7 @@ F: arch/arm/include/asm/arch-sti*/
ARM STM SPEAR ARM STM SPEAR
#M: Vipin Kumar <vipin.kumar@st.com> #M: Vipin Kumar <vipin.kumar@st.com>
S: Orphaned (Since 2016-02) S: Orphaned (Since 2016-02)
T: git git://git.denx.de/u-boot-stm.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git
F: arch/arm/cpu/arm926ejs/spear/ F: arch/arm/cpu/arm926ejs/spear/
F: arch/arm/include/asm/arch-spear/ F: arch/arm/include/asm/arch-spear/
@ -325,7 +325,7 @@ ARM SUNXI
M: Jagan Teki <jagan@amarulasolutions.com> M: Jagan Teki <jagan@amarulasolutions.com>
M: Maxime Ripard <maxime.ripard@bootlin.com> M: Maxime Ripard <maxime.ripard@bootlin.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-sunxi.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git
F: arch/arm/cpu/armv7/sunxi/ F: arch/arm/cpu/armv7/sunxi/
F: arch/arm/include/asm/arch-sunxi/ F: arch/arm/include/asm/arch-sunxi/
F: arch/arm/mach-sunxi/ F: arch/arm/mach-sunxi/
@ -334,14 +334,14 @@ F: board/sunxi/
ARM TEGRA ARM TEGRA
M: Tom Warren <twarren@nvidia.com> M: Tom Warren <twarren@nvidia.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-tegra.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-tegra.git
F: arch/arm/mach-tegra/ F: arch/arm/mach-tegra/
F: arch/arm/include/asm/arch-tegra*/ F: arch/arm/include/asm/arch-tegra*/
ARM TI ARM TI
M: Tom Rini <trini@konsulko.com> M: Tom Rini <trini@konsulko.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-ti.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git
F: arch/arm/mach-davinci/ F: arch/arm/mach-davinci/
F: arch/arm/mach-k3/ F: arch/arm/mach-k3/
F: arch/arm/mach-keystone/ F: arch/arm/mach-keystone/
@ -351,7 +351,7 @@ F: arch/arm/include/asm/ti-common/
ARM UNIPHIER ARM UNIPHIER
M: Masahiro Yamada <yamada.masahiro@socionext.com> M: Masahiro Yamada <yamada.masahiro@socionext.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-uniphier.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier.git
F: arch/arm/mach-uniphier/ F: arch/arm/mach-uniphier/
F: configs/uniphier_*_defconfig F: configs/uniphier_*_defconfig
N: uniphier N: uniphier
@ -359,7 +359,7 @@ N: uniphier
ARM VERSAL ARM VERSAL
M: Michal Simek <michal.simek@xilinx.com> M: Michal Simek <michal.simek@xilinx.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-versal/ F: arch/arm/mach-versal/
ARM VERSATILE EXPRESS DRIVERS ARM VERSATILE EXPRESS DRIVERS
@ -372,7 +372,7 @@ N: vexpress
ARM ZYNQ ARM ZYNQ
M: Michal Simek <monstr@monstr.eu> M: Michal Simek <monstr@monstr.eu>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-zynq/ F: arch/arm/mach-zynq/
F: drivers/clk/clk_zynq.c F: drivers/clk/clk_zynq.c
F: drivers/fpga/zynqpl.c F: drivers/fpga/zynqpl.c
@ -396,7 +396,7 @@ N: zynq
ARM ZYNQMP ARM ZYNQMP
M: Michal Simek <michal.simek@xilinx.com> M: Michal Simek <michal.simek@xilinx.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-zynqmp/ F: arch/arm/mach-zynqmp/
F: drivers/clk/clk_zynqmp.c F: drivers/clk/clk_zynqmp.c
F: drivers/fpga/zynqpl.c F: drivers/fpga/zynqpl.c
@ -422,7 +422,7 @@ N: zynqmp
ARM ZYNQMP R5 ARM ZYNQMP R5
M: Michal Simek <michal.simek@xilinx.com> M: Michal Simek <michal.simek@xilinx.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/arm/mach-zynqmp-r5/ F: arch/arm/mach-zynqmp-r5/
BINMAN BINMAN
@ -438,7 +438,7 @@ F: tools/buildman/
CFI FLASH CFI FLASH
M: Stefan Roese <sr@denx.de> M: Stefan Roese <sr@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-cfi-flash.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-cfi-flash.git
F: drivers/mtd/cfi_flash.c F: drivers/mtd/cfi_flash.c
F: drivers/mtd/jedec_flash.c F: drivers/mtd/jedec_flash.c
@ -446,13 +446,13 @@ COLDFIRE
M: Huan Wang <alison.wang@nxp.com> M: Huan Wang <alison.wang@nxp.com>
M: Angelo Dureghello <angelo@sysam.it> M: Angelo Dureghello <angelo@sysam.it>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-coldfire.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-coldfire.git
F: arch/m68k/ F: arch/m68k/
DFU DFU
M: Lukasz Majewski <lukma@denx.de> M: Lukasz Majewski <lukma@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-dfu.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-dfu.git
F: cmd/dfu.c F: cmd/dfu.c
F: cmd/usb_*.c F: cmd/usb_*.c
F: common/dfu.c F: common/dfu.c
@ -464,7 +464,7 @@ F: drivers/usb/gadget/
DRIVER MODEL DRIVER MODEL
M: Simon Glass <sjg@chromium.org> M: Simon Glass <sjg@chromium.org>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-dm.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-dm.git
F: drivers/core/ F: drivers/core/
F: include/dm/ F: include/dm/
F: test/dm/ F: test/dm/
@ -473,10 +473,10 @@ EFI PAYLOAD
M: Heinrich Schuchardt <xypron.glpk@gmx.de> M: Heinrich Schuchardt <xypron.glpk@gmx.de>
R: Alexander Graf <agraf@csgraf.de> R: Alexander Graf <agraf@csgraf.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-efi.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git
F: doc/README.uefi F: doc/README.uefi
F: doc/README.iscsi F: doc/README.iscsi
F: Documentation/efi.rst F: doc/efi.rst
F: include/capitalization.h F: include/capitalization.h
F: include/charset.h F: include/charset.h
F: include/cp1250.h F: include/cp1250.h
@ -496,7 +496,7 @@ F: tools/file2include.c
FPGA FPGA
M: Michal Simek <michal.simek@xilinx.com> M: Michal Simek <michal.simek@xilinx.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: drivers/fpga/ F: drivers/fpga/
F: cmd/fpga.c F: cmd/fpga.c
F: include/fpga.h F: include/fpga.h
@ -504,7 +504,7 @@ F: include/fpga.h
FLATTENED DEVICE TREE FLATTENED DEVICE TREE
M: Simon Glass <sjg@chromium.org> M: Simon Glass <sjg@chromium.org>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-fdt.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-fdt.git
F: lib/fdtdec* F: lib/fdtdec*
F: lib/libfdt/ F: lib/libfdt/
F: include/fdt* F: include/fdt*
@ -515,24 +515,24 @@ F: common/fdt_support.c
FREEBSD FREEBSD
M: Rafal Jaworowski <raj@semihalf.com> M: Rafal Jaworowski <raj@semihalf.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-freebsd.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-freebsd.git
FREESCALE QORIQ FREESCALE QORIQ
M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-fsl-qoriq.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git
F: drivers/watchdog/sp805_wdt.c F: drivers/watchdog/sp805_wdt.c
I2C I2C
M: Heiko Schocher <hs@denx.de> M: Heiko Schocher <hs@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-i2c.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-i2c.git
F: drivers/i2c/ F: drivers/i2c/
LOGGING LOGGING
M: Simon Glass <sjg@chromium.org> M: Simon Glass <sjg@chromium.org>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot.git T: git https://gitlab.denx.de/u-boot/u-boot.git
F: common/log.c F: common/log.c
F: cmd/log.c F: cmd/log.c
F: test/log/log_test.c F: test/log/log_test.c
@ -548,7 +548,7 @@ F: drivers/i2c/i2c-versatile.c
MICROBLAZE MICROBLAZE
M: Michal Simek <monstr@monstr.eu> M: Michal Simek <monstr@monstr.eu>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
F: arch/microblaze/ F: arch/microblaze/
F: cmd/mfsl.c F: cmd/mfsl.c
F: drivers/gpio/xilinx_gpio.c F: drivers/gpio/xilinx_gpio.c
@ -563,7 +563,7 @@ N: xilinx
MIPS MIPS
M: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> M: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mips.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mips.git
F: arch/mips/ F: arch/mips/
MIPS MSCC MIPS MSCC
@ -594,38 +594,38 @@ F: arch/mips/mach-jz47xx/
MMC MMC
M: Peng Fan <peng.fan@nxp.com> M: Peng Fan <peng.fan@nxp.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mmc.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mmc.git
F: drivers/mmc/ F: drivers/mmc/
NAND FLASH NAND FLASH
#M: Scott Wood <oss@buserror.net> #M: Scott Wood <oss@buserror.net>
S: Orphaned (Since 2018-07) S: Orphaned (Since 2018-07)
T: git git://git.denx.de/u-boot-nand-flash.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nand-flash.git
F: drivers/mtd/nand/raw/ F: drivers/mtd/nand/raw/
NDS32 NDS32
M: Macpaul Lin <macpaul@andestech.com> M: Macpaul Lin <macpaul@andestech.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-nds32.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nds32.git
F: arch/nds32/ F: arch/nds32/
NETWORK NETWORK
M: Joe Hershberger <joe.hershberger@ni.com> M: Joe Hershberger <joe.hershberger@ni.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-net.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-net.git
F: drivers/net/ F: drivers/net/
F: net/ F: net/
NIOS NIOS
M: Thomas Chou <thomas@wytron.com.tw> M: Thomas Chou <thomas@wytron.com.tw>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-nios.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nios.git
F: arch/nios2/ F: arch/nios2/
ONENAND ONENAND
#M: Lukasz Majewski <l.majewski@majess.pl> #M: Lukasz Majewski <l.majewski@majess.pl>
S: Orphaned (Since 2017-01) S: Orphaned (Since 2017-01)
T: git git://git.denx.de/u-boot-onenand.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-onenand.git
F: drivers/mtd/onenand/ F: drivers/mtd/onenand/
PATMAN PATMAN
@ -636,7 +636,7 @@ F: tools/patman/
POWER POWER
M: Jaehoon Chung <jh80.chung@samsung.com> M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-pmic.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-pmic.git
F: drivers/power/ F: drivers/power/
POWERPC POWERPC
@ -647,13 +647,13 @@ F: arch/powerpc/
POWERPC MPC8XX POWERPC MPC8XX
M: Christophe Leroy <christophe.leroy@c-s.fr> M: Christophe Leroy <christophe.leroy@c-s.fr>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mpc8xx.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc8xx.git
F: arch/powerpc/cpu/mpc8xx/ F: arch/powerpc/cpu/mpc8xx/
POWERPC MPC83XX POWERPC MPC83XX
M: Mario Six <mario.six@gdsys.cc> M: Mario Six <mario.six@gdsys.cc>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mpc83xx.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc83xx.git
F: drivers/ram/mpc83xx_sdram.c F: drivers/ram/mpc83xx_sdram.c
F: include/dt-bindings/memory/mpc83xx-sdram.h F: include/dt-bindings/memory/mpc83xx-sdram.h
F: drivers/sysreset/sysreset_mpc83xx.c F: drivers/sysreset/sysreset_mpc83xx.c
@ -671,19 +671,19 @@ F: arch/powerpc/include/asm/arch-mpc83xx/
POWERPC MPC85XX POWERPC MPC85XX
M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mpc85xx.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx.git
F: arch/powerpc/cpu/mpc85xx/ F: arch/powerpc/cpu/mpc85xx/
POWERPC MPC86XX POWERPC MPC86XX
M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-mpc86xx.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc86xx.git
F: arch/powerpc/cpu/mpc86xx/ F: arch/powerpc/cpu/mpc86xx/
RISC-V RISC-V
M: Rick Chen <rick@andestech.com> M: Rick Chen <rick@andestech.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-riscv.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git
F: arch/riscv/ F: arch/riscv/
F: cmd/riscv/ F: cmd/riscv/
F: tools/prelink-riscv.c F: tools/prelink-riscv.c
@ -701,15 +701,16 @@ S: Maintained
F: arch/sandbox/ F: arch/sandbox/
SH SH
M: Marek Vasut <marek.vasut+renesas@gmail.com>
M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-sh.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sh.git
F: arch/sh/ F: arch/sh/
SPI SPI
M: Jagan Teki <jagan@amarulasolutions.com> M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-spi.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-spi.git
F: drivers/spi/ F: drivers/spi/
F: include/spi* F: include/spi*
@ -771,25 +772,25 @@ UBI
M: Kyungmin Park <kmpark@infradead.org> M: Kyungmin Park <kmpark@infradead.org>
M: Heiko Schocher <hs@denx.de> M: Heiko Schocher <hs@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-ubi.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-ubi.git
F: drivers/mtd/ubi/ F: drivers/mtd/ubi/
USB USB
M: Marek Vasut <marex@denx.de> M: Marek Vasut <marex@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-usb.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git
F: drivers/usb/ F: drivers/usb/
USB xHCI USB xHCI
M: Bin Meng <bmeng.cn@gmail.com> M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-usb.git topic-xhci T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git topic-xhci
F: drivers/usb/host/xhci* F: drivers/usb/host/xhci*
VIDEO VIDEO
M: Anatolij Gustschin <agust@denx.de> M: Anatolij Gustschin <agust@denx.de>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-video.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-video.git
F: drivers/video/ F: drivers/video/
F: common/lcd*.c F: common/lcd*.c
F: include/lcd*.h F: include/lcd*.h
@ -799,7 +800,7 @@ X86
M: Simon Glass <sjg@chromium.org> M: Simon Glass <sjg@chromium.org>
M: Bin Meng <bmeng.cn@gmail.com> M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot-x86.git T: git https://gitlab.denx.de/u-boot/custodians/u-boot-x86.git
F: arch/x86/ F: arch/x86/
F: cmd/x86/ F: cmd/x86/
@ -813,7 +814,7 @@ M: Tom Rini <trini@konsulko.com>
L: u-boot@lists.denx.de L: u-boot@lists.denx.de
Q: http://patchwork.ozlabs.org/project/uboot/list/ Q: http://patchwork.ozlabs.org/project/uboot/list/
S: Maintained S: Maintained
T: git git://git.denx.de/u-boot.git T: git https://gitlab.denx.de/u-boot/u-boot.git
F: configs/tools-only_defconfig F: configs/tools-only_defconfig
F: * F: *
F: */ F: */

6
Makefile
View File

@ -168,7 +168,7 @@ MAKEFLAGS += --no-print-directory
# Use 'make C=2' to enable checking of *all* source files, regardless # Use 'make C=2' to enable checking of *all* source files, regardless
# of whether they are re-compiled or not. # 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. # where to get the "sparse" utility.
ifeq ("$(origin C)", "command line") ifeq ("$(origin C)", "command line")
@ -1916,7 +1916,7 @@ help:
@echo ' coccicheck - Execute static code analysis with Coccinelle' @echo ' coccicheck - Execute static code analysis with Coccinelle'
@echo '' @echo ''
@echo 'Documentation targets:' @echo 'Documentation targets:'
@$(MAKE) -f $(srctree)/Documentation/Makefile dochelp @$(MAKE) -f $(srctree)/doc/Makefile dochelp
@echo '' @echo ''
@echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' @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' @echo ' make V=2 [targets] 2 => give reason for rebuild of target'
@ -1945,7 +1945,7 @@ DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs \
linkcheckdocs dochelp refcheckdocs linkcheckdocs dochelp refcheckdocs
PHONY += $(DOC_TARGETS) PHONY += $(DOC_TARGETS)
$(DOC_TARGETS): scripts_basic FORCE $(DOC_TARGETS): scripts_basic FORCE
$(Q)$(MAKE) $(build)=Documentation $@ $(Q)$(MAKE) $(build)=doc $@
endif #ifeq ($(config-targets),1) endif #ifeq ($(config-targets),1)
endif #ifeq ($(mixed-targets),1) endif #ifeq ($(mixed-targets),1)

2
arch/arm/cpu/armv8/start.S
View File

@ -18,7 +18,7 @@
.globl _start .globl _start
_start: _start:
#if defined(LINUX_KERNEL_IMAGE_HEADER) #if defined(CONFIG_LINUX_KERNEL_IMAGE_HEADER)
#include <asm/boot0-linux-kernel-header.h> #include <asm/boot0-linux-kernel-header.h>
#elif defined(CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK) #elif defined(CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK)
/* /*

10
Documentation/Makefile → doc/Makefile
View File

@ -8,7 +8,7 @@ subdir-y :=
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
SPHINXOPTS = SPHINXOPTS =
SPHINXDIRS = . 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 SPHINX_CONF = conf.py
PAPER = PAPER =
BUILDDIR = $(obj)/output BUILDDIR = $(obj)/output
@ -49,10 +49,10 @@ loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit;
# * cache folder relative to $(BUILDDIR)/.doctrees # * cache folder relative to $(BUILDDIR)/.doctrees
# $4 dest subfolder e.g. "man" for man pages at media/man # $4 dest subfolder e.g. "man" for man pages at media/man
# $5 reST source folder relative to $(srctree)/$(src), # $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) 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 \ PYTHONDONTWRITEBYTECODE=1 \
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \ BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
$(SPHINXBUILD) \ $(SPHINXBUILD) \
@ -102,7 +102,7 @@ refcheckdocs:
cleandocs: cleandocs:
$(Q)rm -rf $(BUILDDIR) $(Q)rm -rf $(BUILDDIR)
$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=doc/media clean
dochelp: dochelp:
@echo ' Linux kernel internal documentation in different formats from ReST:' @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 ' make SPHINX_CONF={conf-file} [target] use *additional* sphinx-build'
@echo ' configuration. This is e.g. useful to build with nit-picking config.' @echo ' configuration. This is e.g. useful to build with nit-picking config.'
@echo @echo
@echo ' Default location for the generated documents is Documentation/output' @echo ' Default location for the generated documents is doc/output'

0
Documentation/conf.py → doc/conf.py
View File

0
Documentation/devicetree/bindings/arm/l2c2x0.txt → doc/device-tree-bindings/arm/l2c2x0.txt
View File

0
Documentation/devicetree/bindings/axi/gdsys,ihs_axi.txt → doc/device-tree-bindings/axi/gdsys,ihs_axi.txt
View File

0
Documentation/devicetree/bindings/board/gdsys,board_gazerbeam.txt → doc/device-tree-bindings/board/gdsys,board_gazerbeam.txt
View File

0
Documentation/devicetree/bindings/clk/fsl,mpc83xx-clk.txt → doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt
View File

0
Documentation/devicetree/bindings/cpu/fsl,mpc83xx.txt → doc/device-tree-bindings/cpu/fsl,mpc83xx.txt
View File

0
Documentation/devicetree/bindings/misc/fsl,mpc83xx-serdes.txt → doc/device-tree-bindings/misc/misc/fsl,mpc83xx-serdes.txt
View File

0
Documentation/devicetree/bindings/misc/gdsys,io-endpoint.txt → doc/device-tree-bindings/misc/misc/gdsys,io-endpoint.txt
View File

0
Documentation/devicetree/bindings/misc/gdsys,iocon_fpga.txt → doc/device-tree-bindings/misc/misc/gdsys,iocon_fpga.txt
View File

0
Documentation/devicetree/bindings/misc/gdsys,iocpu_fpga.txt → doc/device-tree-bindings/misc/misc/gdsys,iocpu_fpga.txt
View File

0
Documentation/devicetree/bindings/misc/gdsys,soc.txt → doc/device-tree-bindings/misc/misc/gdsys,soc.txt
View File

0
Documentation/devicetree/bindings/ram/fsl,mpc83xx-mem-controller.txt → doc/device-tree-bindings/ram/fsl,mpc83xx-mem-controller.txt
View File

0
Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt → doc/device-tree-bindings/reserved-memory/reserved-memory.txt
View File

0
Documentation/devicetree/bindings/timer/fsl,mpc83xx-timer.txt → doc/device-tree-bindings/timer/fsl,mpc83xx-timer.txt
View File

0
Documentation/efi.rst → doc/efi.rst
View File

0
Documentation/index.rst → doc/index.rst
View File

0
Documentation/linker_lists.rst → doc/linker_lists.rst
View File

4
Documentation/media/Makefile → doc/media/Makefile
View File

@ -1,7 +1,7 @@
# Rules to convert a .h file to inline RST documentation # Rules to convert a .h file to inline RST documentation
SRC_DIR=$(srctree)/Documentation/media SRC_DIR=$(srctree)/doc/media
PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl PARSER = $(srctree)/doc/sphinx/parse-headers.pl
API = $(srctree)/include API = $(srctree)/include
FILES = linker_lists.h.rst FILES = linker_lists.h.rst

0
Documentation/media/linker_lists.h.rst.exceptions → doc/media/linker_lists.h.rst.exceptions
View File

0
Documentation/serial.rst → doc/serial.rst
View File

0
Documentation/sphinx-static/theme_overrides.css → doc/sphinx-static/theme_overrides.css
View File

0
Documentation/sphinx/cdomain.py → doc/sphinx/cdomain.py
View File

0
Documentation/sphinx/kernel_include.py → doc/sphinx/kernel_include.py
View File

0
Documentation/sphinx/kerneldoc.py → doc/sphinx/kerneldoc.py
View File

0
Documentation/sphinx/kfigure.py → doc/sphinx/kfigure.py
View File

0
Documentation/sphinx/load_config.py → doc/sphinx/load_config.py
View File

2
Documentation/sphinx/parse-headers.pl → doc/sphinx/parse-headers.pl
View File

@ -382,7 +382,7 @@ ioctl.
The EXCEPTIONS_FILE contain two rules to allow ignoring a symbol or The EXCEPTIONS_FILE contain two rules to allow ignoring a symbol or
to replace the default references by a custom one. 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. tree for more details.
=head1 BUGS =head1 BUGS

0
Documentation/sphinx/requirements.txt → doc/sphinx/requirements.txt
View File

2
Documentation/sphinx/rstFlatTable.py → doc/sphinx/rstFlatTable.py
View File

@ -54,7 +54,7 @@ from docutils.utils import SystemMessagePropagation
# ============================================================================== # ==============================================================================
# The version numbering follows numbering of the specification # The version numbering follows numbering of the specification
# (Documentation/books/kernel-doc-HOWTO). # (doc/books/kernel-doc-HOWTO).
__version__ = '1.0' __version__ = '1.0'
PY3 = sys.version_info[0] == 3 PY3 = sys.version_info[0] == 3

6
drivers/watchdog/ast_wdt.c
View File

@ -23,6 +23,12 @@ static int ast_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
ulong driver_data = dev_get_driver_data(dev); ulong driver_data = dev_get_driver_data(dev);
u32 reset_mode = ast_reset_mode_from_flags(flags); 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, clrsetbits_le32(&priv->regs->ctrl,
WDT_CTRL_RESET_MASK << WDT_CTRL_RESET_MODE_SHIFT, WDT_CTRL_RESET_MASK << WDT_CTRL_RESET_MODE_SHIFT,
reset_mode << WDT_CTRL_RESET_MODE_SHIFT); reset_mode << WDT_CTRL_RESET_MODE_SHIFT);

28
drivers/watchdog/mtk_wdt.c
View File

@ -70,18 +70,30 @@ static int mtk_wdt_expire_now(struct udevice *dev, ulong flags)
return 0; 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); struct mtk_wdt_priv *priv = dev_get_priv(dev);
/* /*
* One bit is the value of 512 ticks * One WDT_LENGTH count is 512 ticks of the wdt clock
* The clock has 32 KHz * 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; if(timeout_ms > 15984) timeout_ms = 15984;
writel(timeout, priv->base + MTK_WDT_LENGTH); u64 timeout_us = timeout_ms * 1000;
u32 timeout_cc = (u32) ( (15624 + timeout_us) / 15625 );
mtk_wdt_reset(dev); 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) 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_set_timeout(dev, timeout);
mtk_wdt_reset(dev);
/* Enable watchdog reset signal */ /* Enable watchdog reset signal */
setbits_le32(priv->base + MTK_WDT_MODE, setbits_le32(priv->base + MTK_WDT_MODE,
WDT_MODE_EN | WDT_MODE_KEY | WDT_MODE_EXTEN); WDT_MODE_EN | WDT_MODE_KEY | WDT_MODE_EXTEN);

2
tools/env/fw_env.c vendored
View File

@ -1317,7 +1317,7 @@ static int flash_io_write(int fd_current)
rc = -1; rc = -1;
} }
if (target_temp) { if (rc >= 0 && target_temp) {
int dir_fd; int dir_fd;
dir_fd = open(dname, O_DIRECTORY | O_RDONLY); dir_fd = open(dname, O_DIRECTORY | O_RDONLY);