u-boot.git, branch v2020.07-rc4

Prepare v2020.07-rc4

2020-06-09T00:30:26+00:00

Signed-off-by: Tom Rini

cmd: Correct the 'md.q' command

2020-06-09T00:29:30+00:00

This displays incorrect data at present due to a missing header file
in display_options. Fix it.

Fixes: 09140113108 ("command: Remove the cmd_tbl_t typedef")

Signed-off-by: Simon Glass

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx

2020-06-08T12:51:59+00:00

- DM_ETH support for P2041RDB, T1024RDB, P5040DS, P3041DS, P4080DS, bug
  fixes
- Add TBI PHY access through MII
- DDR: Rework errata workaround for A008109, A008378, 009942

Merge tag 'u-boot-rockchip-20200607' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip

2020-06-08T12:51:30+00:00

- revive rk3399 puma board to adapt mainline dts;
- Fix rk3399-evb stdout path;
- Enable PCIe for rk3399: Rockpro64, firefly, pinebookpro;
- Add rk3328 Rock-pi-e board;
- Enable SPI boot for rockpro64 and roc-pc-rk3399;

rockchip: enable PCIe and NVMe on Pinebook Pro

2020-06-07T12:53:23+00:00

Enable CONFIG_PCI and CONFIG_NVME and related configs for the
Pinebook Pro.

Signed-off-by: Patrick Wildt 
Reviewed-by: Kever Yang

rockchip: puma: enable new usb config options

2020-06-07T10:57:16+00:00

With recently added changes we get support for usb3 including handling
of the phys (type-c and inno-usb2), so enable the necessary config
options on puma.

Signed-off-by: Heiko Stuebner 
Reviewed-by: Philipp Tomsich 
Reviewed-by: Kever Yang

rockchip: puma: drop special handling of usb host regulator

2020-06-07T10:57:16+00:00

With the current usb stack in u-boot, all host ports on puma work
flawlessly without any additional special handling, so drop that
usb hub hacking from the puma board.

Tested with mass-storage and usb-ethernet on both usb3 and usb2 ports.

Signed-off-by: Heiko Stuebner 
Reviewed-by: Kever Yang 
Reviewed-by: Philipp Tomsich

rockchip: puma: remove separate fit generator

2020-06-07T10:57:16+00:00

The introduction of the puma-specific generator was mainly a way
to split the pmu firmware from the ATF binary and not having to
distribute that 4GB (sparse) image that was created before moving
to the bl31.elf as base.

Looking at the publically available repository for that separate
pmu firmware
    https://git.theobroma-systems.com/rk3399-cortex-m0.git/
there is also no activity for 3 years and apart from some build
customizations no other changes were done.

And even then, if changes need to be made, this can very well also
happen in the atf context itself, so there is no real need to
diverge from the established build procedure and we can just go
back to using the main make_fit_atf.py script.

Signed-off-by: Heiko Stuebner 
Reviewed-by: Philipp Tomsich 
Reviewed-by: Kever Yang

rockchip: puma: reorganize devicetrees to actually work and match upstream

2020-06-07T10:57:16+00:00

So far the puma dts files only just included the main puma dtsi without
handling the actual baseboard and rk3399-puma.dtsi was very much
detached from the variant in the mainline Linux kernel.

Recent changes resulted in a strange situation with nonworking puma boards.

Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi")
moved the sdram include from rk3399-puma-ddrX.dts to new files
rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.

Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux")
replaced the rk3399-puma.dtsi nearly completely, but in the kernel
it definitly depends on a baseboard dts to actually enable peripherals
like sd-slot, uarts, etc.

So to untagle this and bring the whole thing more in line with mainline
Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate
DDR-option devicetrees and instead replace them with a puma Kconfig option
to select and include the needed DDR variant.

Signed-off-by: Heiko Stuebner 
Reviewed-by: Philipp Tomsich 
Reviewed-by: Kever Yang

rockchip: puma: fix indentation of misc_init_r

2020-06-07T10:57:16+00:00

The commit moving puma to the generic cpuid/macaddr helpers used 7 spaces
as indentation, so correct that by moving to the required tabs.

Fixes: fa177ff0208b ("board: puma: Use rockchip_* helpers to setup cpuid and macaddr")
Signed-off-by: Heiko Stuebner 
Reviewed-by: Philipp Tomsich 
Reviewed-by: Kever Yang