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 54a6416717a3a07eeffdf42a39c2b27657fa81d1,ad9ddf67ac5bce4178710f4b66d8fe9490a15882..66d5be6a1ff3e31a824737cfebde70e48869c69a
--- 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 a14a53fbd0f34a350218ba3a61c088eb783fec5a,6a320713ebde5d24c4a743bf5982e5a88d66ffd1..71e17d90ec13266865ed528f72b6c56e762c6d49
--- 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 f34a096b7db6f9f70bc891444eb1ed9964be8c1b,071123362f5ae889bbd8d38c5f2d29cae76034c6..5807e8bdaa41225715393e60d277cccb2bd15a36
--- 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 4c1cdbb5fc8e068a9e6624b2cdc195f70c0e7ea0,bf7078015e23f0bc1b7ec7edcb432ab4eaa2d10b..7328c142f9961c8351422f50ec0df684cf247330
--- 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 3eb61fbe07984538ecfabc04a7a30fec8428412c,985243cebd8c8558d49bc54c6a4bb094991e1502..0f109c514c11f05cb07720e2d18ab07a4ed52e82
--- 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 d04e5063ce61fb6af86da5913a826709c393462c,58f2475571423a585a1515f70fa9b59cf8581340..e2373d04d74beaab118937a03d01d2289b7791a9
--- 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 c7357e379d2e3b0638f7041a3c4bbf3c30c9f482,17bde92263b9529b527b2dd1b81e53f27b4e33f6..ca828eac03dff800d13976f10998e5fcc806d256
--- 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 ffef3001d423714ce73fba9ac6b3f41682018370,b0ccaa1cfde29e92f6d7da418ce9d497c6aac4db..5377aba4ef34dcd42a2c778bb0a4ad25104f8b09
--- 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 6d020d7d29457dd57951898fd647a27d2b53eaa1,bb5df66c7493f1fec78d177ddfb3b0e20bc78046..d266ce82a5994f59aca2fc328c87f500ad41b6a3
--- 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 612ac053fd68392a5623e78c6e1eebf833865e14,2afef4a5eb01fde68aceb1b2f17f9f9164cef569..4d5569c55497d6a462f3494409549d656a5f09e7
--- 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 2c2c679b29095df6ce2252b5c7fa5abe721a5d3f,8f8d34c7038fc8330d8f2c3402c769d35e1246cc..fcfb6aac1ebc1d738e41deaea22bce1aa6cfef1e
--- 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 e7996905784d796b4dc65cb47d69d0fd345f1c08,7374ee42fb19ec49f0a7fbe9b769278bf0a59d82..a76d924d3872598bbab0195f5436e868f12c840d
--- 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 12ed055acfacdbaade76628d76170bcfa37aa91d,26967a67cc94bb1b0f3c7ed2335ef9c05496127c..434c9113b5e4a42e864f9f65b180de8fc9b1d214
--- 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 2cf0efc816cf631788613f67c4a1b12e4b95b56c,9346cafc64c62133ca1a1408f03c8887f3e07a87..652e418ff39de45b139a1b9943f5232cfd85f988
--- 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 757d99b8b588fa0d9bd9f2d3631edbac2ed84631,18c6d1b92253569c75c718fdf5c8cc7e16a3e2b5..612663845c771e1bd27147f1e8f60b6de418beb3
--- 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 be46cae7aad74c9e75660630eeb9a47232a4eedc,f9c996b4299d1c9235760531986136d61acdf6f6..de799b5cea34af26fa8622a0c94d544b7206b87e
--- 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 e69ef6875f573900e49081c59e5d06a249ca46ce,5976a84491e41e76bbb38efb9679476c35c539da..c03256a0bf9ca2b8b387e09d2cac1681210b19d9
--- 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 eb153dc8d579f6dd8c47ee2704a48dffc8155f36,078f829c2dff0c5409465d88fe3918c77dc7bae7..294e5b1071d541b9b027dd21acbec12715f345ed
--- 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 f503cc1604230bf178df2e71809b2dd2ed1ae013,0c9d61b8053c6cb569670066611127d991a003d2..47ccd708fca62d0aa76b290deee7945145eb5798
--- 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 aac96d29ba7a812502e6d3831f53f0181f9779b4,ba7731bfca6b538a7b5084a029d06615b31b64ed..2c1507a8186c0bf98bf94d1c05af5f534ce7e177
--- 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" \