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>

diff --cc arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 41f3e95019b7daa9a06ab7c9bbf859b34f1a5ad9,adf3b4eea561cc581b7c71a6d2dfb447293831fb..9820d3290e763f0c1bc9b711cf0f00cbef8d0174
--- 1/arch/arm/cpu/armv8/fsl-layerscape/soc.c
--- 2/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 c36bdb0bb961d31020d5d2aa66588df10cfbe039,e1b91f62505057cdfdc26820d199a0881029428b..3ba12bec0eedc8cb701ee958a1a9ec8a9c37aa06
--- 1/include/configs/tegra210-common.h
--- 2/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 */