Merge branch 'next'

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

diff --cc .azure-pipelines.yml
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/Kconfig
Simple merge

diff --cc boot/Kconfig
Simple merge

diff --cc boot/pxe_utils.c
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc common/memsize.c
index 54a6416,ad9ddf6..66d5be6
--- 1/common/memsize.c
--- 2/common/memsize.c
+++ b/common/memsize.c
@@@ -106,9 -105,8 +106,9 @@@ phys_size_t __weak get_effective_memsiz
         */
        if (gd->ram_base + ram_size < gd->ram_base)
                ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base;
 +#endif
  
- #ifndef CONFIG_MAX_MEM_MAPPED
+ #ifndef CFG_MAX_MEM_MAPPED
        return ram_size;
  #else
        /* limit stack to what we can reasonable map */

diff --cc common/spl/Kconfig
Simple merge

diff --cc configs/P1010RDB-PA_36BIT_NOR_defconfig
index a14a53f,6a32071..71e17d9
--- 1/configs/P1010RDB-PA_36BIT_NOR_defconfig
--- 2/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx=
  CONFIG_SYS_INIT_RAM_LOCK=y
  CONFIG_TARGET_P1010RDB_PA=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PHYS_64BIT=y

diff --cc configs/P1010RDB-PA_NOR_defconfig
index f34a096,0711233..5807e8b
--- 1/configs/P1010RDB-PA_NOR_defconfig
--- 2/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx=
  CONFIG_SYS_INIT_RAM_LOCK=y
  CONFIG_TARGET_P1010RDB_PA=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_SYS_MONITOR_LEN=786432

diff --cc configs/P1010RDB-PB_36BIT_NOR_defconfig
index 4c1cdbb,bf70780..7328c14
--- 1/configs/P1010RDB-PB_36BIT_NOR_defconfig
--- 2/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx=
  CONFIG_SYS_INIT_RAM_LOCK=y
  CONFIG_TARGET_P1010RDB_PB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PHYS_64BIT=y

diff --cc configs/P1010RDB-PB_NOR_defconfig
index 3eb61fb,985243c..0f109c5
--- 1/configs/P1010RDB-PB_NOR_defconfig
--- 2/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx=
  CONFIG_SYS_INIT_RAM_LOCK=y
  CONFIG_TARGET_P1010RDB_PB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_SYS_MONITOR_LEN=786432

diff --cc configs/P1020RDB-PC_36BIT_defconfig
index d04e506,58f2475..e2373d0
--- 1/configs/P1020RDB-PC_36BIT_defconfig
--- 2/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK=
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PC=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PHYS_64BIT=y

diff --cc configs/P1020RDB-PC_defconfig
index c7357e3,17bde92..ca828ea
--- 1/configs/P1020RDB-PC_defconfig
--- 2/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK=
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PC=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_SYS_MONITOR_LEN=786432

diff --cc configs/P1020RDB-PD_defconfig
index ffef300,b0ccaa1..5377aba
--- 1/configs/P1020RDB-PD_defconfig
--- 2/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK=
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P1020RDB_PD=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_SYS_MONITOR_LEN=786432

diff --cc configs/P2020RDB-PC_36BIT_defconfig
index 6d020d7,bb5df66..d266ce8
--- 1/configs/P2020RDB-PC_36BIT_defconfig
--- 2/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK=
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P2020RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_PHYS_64BIT=y

diff --cc configs/P2020RDB-PC_defconfig
index 612ac05,2afef4a..4d5569c
--- 1/configs/P2020RDB-PC_defconfig
--- 2/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK=
  # CONFIG_CMD_ERRATA is not set
  CONFIG_TARGET_P2020RDB=y
  CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+ CONFIG_L2_CACHE=y
  CONFIG_ENABLE_36BIT_PHYS=y
 -CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+ CONFIG_USE_UBOOTPATH=y
  CONFIG_PCIE1=y
  CONFIG_PCIE2=y
  CONFIG_SYS_MONITOR_LEN=786432

diff --cc configs/evb-rk3288_defconfig
index 2c2c679,8f8d34c..fcfb6aa
--- 1/configs/evb-rk3288_defconfig
--- 2/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@@ -80,8 -80,8 +80,9 @@@ CONFIG_DM_REGULATOR_FIXED=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc configs/evb-rk3568_defconfig
index e799690,7374ee4..a76d924
--- 1/configs/evb-rk3568_defconfig
--- 2/configs/evb-rk3568_defconfig
+++ b/configs/evb-rk3568_defconfig
@@@ -63,6 -63,6 +63,7 @@@ CONFIG_SPL_RAM=
  CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
 +# CONFIG_BINMAN_FDT is not set
  CONFIG_ERRNO_STR=y

diff --cc configs/firefly-rk3288_defconfig
index 12ed055,26967a6..434c911
--- 1/configs/firefly-rk3288_defconfig
--- 2/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@@ -77,8 -77,8 +77,9 @@@ CONFIG_DM_REGULATOR_FIXED=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc configs/ge_b1x5v2_defconfig
Simple merge

diff --cc configs/ge_bx50v3_defconfig
Simple merge

diff --cc configs/miqi-rk3288_defconfig
index 2cf0efc,9346caf..652e418
--- 1/configs/miqi-rk3288_defconfig
--- 2/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@@ -74,8 -74,8 +74,9 @@@ CONFIG_DM_REGULATOR_FIXED=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc configs/mx53ppd_defconfig
Simple merge

diff --cc configs/roc-pc-rk3399_defconfig
Simple merge

diff --cc configs/rock-pi-4-rk3399_defconfig
Simple merge

diff --cc configs/rock-pi-4c-rk3399_defconfig
Simple merge

diff --cc configs/rock-pi-n8-rk3288_defconfig
index 757d99b,18c6d1b..6126638
--- 1/configs/rock-pi-n8-rk3288_defconfig
--- 2/configs/rock-pi-n8-rk3288_defconfig
+++ b/configs/rock-pi-n8-rk3288_defconfig
@@@ -73,8 -73,8 +73,9 @@@ CONFIG_PWM_ROCKCHIP=
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
  # CONFIG_RAM_ROCKCHIP_DEBUG is not set
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y

diff --cc configs/sandbox_defconfig
index be46cae,f9c996b..de799b5
--- 1/configs/sandbox_defconfig
--- 2/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@@ -267,6 -266,6 +267,7 @@@ CONFIG_RESET_SYSCON=
  CONFIG_RESET_SCMI=y
  CONFIG_DM_RTC=y
  CONFIG_RTC_RV8803=y
++CONFIG_RTC_HT1380=y
  CONFIG_SCSI=y
  CONFIG_DM_SCSI=y
  CONFIG_SANDBOX_SERIAL=y

diff --cc configs/stm32mp15_dhcom_basic_defconfig
Simple merge

diff --cc configs/stm32mp15_dhcor_basic_defconfig
Simple merge

diff --cc configs/tinker-rk3288_defconfig
index e69ef68,5976a84..c03256a
--- 1/configs/tinker-rk3288_defconfig
--- 2/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc configs/tinker-s-rk3288_defconfig
index eb153dc,078f829..294e5b1
--- 1/configs/tinker-s-rk3288_defconfig
--- 2/configs/tinker-s-rk3288_defconfig
+++ b/configs/tinker-s-rk3288_defconfig
@@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc configs/vyasa-rk3288_defconfig
index f503cc1,0c9d61b..47ccd70
--- 1/configs/vyasa-rk3288_defconfig
--- 2/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYS_NS16550_MEM32=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
  CONFIG_USB_DWC2=y

diff --cc doc/board/ti/am335x_evm.rst
Simple merge

diff --cc drivers/net/tsec.c
Simple merge

diff --cc drivers/timer/orion-timer.c
Simple merge

diff --cc include/configs/vexpress_common.h
index aac96d2,ba7731b..2c1507a
--- 1/include/configs/vexpress_common.h
--- 2/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@@ -146,8 -145,7 +145,8 @@@
          func(DHCP, dhcp, na)
  #include <config_distro_bootcmd.h>
  
- #define CONFIG_EXTRA_ENV_SETTINGS \
+ #define CFG_EXTRA_ENV_SETTINGS \
 +                "loadaddr=0x60100000\0" \
                  "kernel_addr_r=0x60100000\0" \
                  "fdt_addr_r=0x60000000\0" \
                  "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \