From: Tom Rini Date: Mon, 5 Oct 2020 17:05:46 +0000 (-0400) Subject: Merge branch 'next' X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=b7e7831e5d5be047f421ddc1f308afc22764a893;p=u-boot.git Merge branch 'next' Bring in the assorted changes that have been staged in the 'next' branch prior to release. Signed-off-by: Tom Rini --- b7e7831e5d5be047f421ddc1f308afc22764a893 diff --cc arch/arm/cpu/armv8/fsl-layerscape/soc.c index 87fb321c63,fde893e8c9..ba42c185c4 --- a/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 configs/T1042D4RDB_SPIFLASH_defconfig index fae57883a4,07d24fc1a6..f6dcde73b8 --- a/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/T2080RDB_SPIFLASH_defconfig index ba4ac10105,fc12766f4d..5be97b8eb8 --- a/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