From: Tom Rini Date: Fri, 15 Oct 2021 19:58:16 +0000 (-0400) Subject: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=6a86f1212656d4497b8980048907535f5294fabe;p=u-boot.git 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 --- 6a86f1212656d4497b8980048907535f5294fabe diff --cc arch/arm/cpu/armv8/fsl-layerscape/soc.c index 41f3e95019,adf3b4eea5..9820d3290e --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@@ -54,7 -54,8 +54,8 @@@ int ls_gic_rd_tables_init(void *blob lpi_base.start = addr; lpi_base.end = addr + size - 1; - ret = fdtdec_add_reserved_memory(blob, "lpi_rd_table", &lpi_base, NULL, false); + ret = fdtdec_add_reserved_memory(blob, "lpi_rd_table", &lpi_base, NULL, - NULL, 0, 0); ++ 0, NULL, 0); if (ret) { debug("%s: failed to add reserved memory\n", __func__); return ret; diff --cc include/configs/tegra210-common.h index c36bdb0bb9,e1b91f6250..3ba12bec0e --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@@ -44,9 -44,10 +44,9 @@@ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fdtfile=" FDTFILE "\0" \ "fdt_addr_r=0x83000000\0" \ - "ramdisk_addr_r=0x83200000\0" + "ramdisk_addr_r=0x83420000\0" /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 /* GPU needs setup */