Merge branch 'next'

Bring in the assorted changes that have been staged in the 'next' branch
prior to release.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 87fb321,fde893e..ba42c18
--- 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
@@@ -45,22 -43,7 +45,22 @@@ DECLARE_GLOBAL_DATA_PTR
  #ifdef CONFIG_GIC_V3_ITS
  int ls_gic_rd_tables_init(void *blob)
  {
 -      int ret;
 +      struct fdt_memory lpi_base;
 +      fdt_addr_t addr;
 +      fdt_size_t size;
 +      int offset, ret;
 +
 +      offset = fdt_path_offset(gd->fdt_blob, "/syscon@0x80000000");
 +      addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, offset, "reg",
 +                                                0, &size, false);
 +
 +      lpi_base.start = addr;
 +      lpi_base.end = addr + size - 1;
-       ret = fdtdec_add_reserved_memory(blob, "lpi_rd_table", &lpi_base, NULL);
++      ret = fdtdec_add_reserved_memory(blob, "lpi_rd_table", &lpi_base, NULL, false);
 +      if (ret) {
 +              debug("%s: failed to add reserved memory\n", __func__);
 +              return ret;
 +      }
  
        ret = gic_lpi_tables_init();
        if (ret)

diff --cc arch/riscv/lib/interrupts.c
Simple merge

diff --cc board/renesas/ebisu/ebisu.c
Simple merge

diff --cc configs/T1024RDB_SPIFLASH_defconfig
Simple merge

diff --cc configs/T1042D4RDB_SPIFLASH_defconfig
index fae5788,07d24fc..f6dcde7
--- 1/configs/T1042D4RDB_SPIFLASH_defconfig
--- 2/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@@ -50,7 -50,10 +50,9 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe800
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
 -CONFIG_ENV_ADDR=0xFFFC9000
  CONFIG_DM=y
+ CONFIG_DM_SPI=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_FSL_CAAM=y
  CONFIG_DM_I2C=y
  CONFIG_DM_MMC=y

diff --cc configs/T2080QDS_SPIFLASH_defconfig
Simple merge

diff --cc configs/T2080RDB_SPIFLASH_defconfig
index ba4ac10,fc12766..5be97b8
--- 1/configs/T2080RDB_SPIFLASH_defconfig
--- 2/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@@ -50,7 -50,10 +50,9 @@@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe800
  CONFIG_OF_CONTROL=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
 -CONFIG_ENV_ADDR=0xFFFC9000
  CONFIG_DM=y
+ CONFIG_DM_SPI=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_FSL_CAAM=y
  CONFIG_DM_I2C=y
  CONFIG_DM_MMC=y