Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Fri, 15 Oct 2021 19:58:16 +0000 (15:58 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 15 Oct 2021 22:30:33 +0000 (18:30 -0400)
commit6a86f1212656d4497b8980048907535f5294fabe
tree0b57b0ce989476384c052e75d8314f1bc6e232d4
parent86acfc96642b5de98ab1df90ee57e17453f47079
parenta0ba216ed420a8953f57f777256f310370b95338
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra

On merge, fixup order of fdtdec_add_reserved_memory parameters in
arch/arm/cpu/armv8/fsl-layerscape/soc.c

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/cpu/armv8/fsl-layerscape/soc.c
include/configs/tegra210-common.h