Merge tag 'u-boot-stm32-20211012' of https://source.denx.de/u-boot/custodians/u-boot-stm

- Disable ATAGS for STM32 MCU and MPU boards
- Disable bi_boot_params for STM32 MCU and MPU boards
- Update stm32-usbphyc node management
- Convert CONFIG_STM32_FLASH to Kconfig for STM32 MCU boards
- Convert some USB config flags to Kconfig for various boards
- Convert CONFIG_BOOTCOMMAND flag to Kconfig for STM32 F429 board
- Remove specific CONFIG_STV0991 flags
- Remove unused CONFIG_USER_LOWLEVEL_INIT flag
- Add ofdata_to_platdata() callback for stm32_spi driver
- Update for stm32f7_i2c driver
- Remove gpio_hog_probe_all() from STM32 MP1 board
- Fix bind command

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

diff --cc board/dhelectronics/dh_stm32mp1/board.c
Simple merge

diff --cc board/st/stm32f429-discovery/stm32f429-discovery.c
index 34f9d6bc007afd3d2ade0c07e3f9b061fd17059b,5a50e98dd0cec7b286d508bb71a06ccdbcb13358..55e464cc7cf1352ca81435c38cd3ed9834e81158
--- 1/board/st/stm32f429-discovery/stm32f429-discovery.c
--- 2/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@@ -46,10 -46,13 +46,8 @@@ int dram_init_banksize(void
        return 0;
  }
  
 -u32 get_board_rev(void)
 -{
 -      return 0;
 -}
 -
  int board_init(void)
  {
-       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
- 
        return 0;
  }
  

diff --cc board/st/stm32f429-evaluation/stm32f429-evaluation.c
index c170314ed8576d25e6bcb17739f47fd91a8ab71e,cf3056163c68e7211d3c4d13ee97ff09c4c43918..25472f041fef099adec80a2c9a045e3bbc8efeb7
--- 1/board/st/stm32f429-evaluation/stm32f429-evaluation.c
--- 2/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@@ -40,10 -40,13 +40,8 @@@ int dram_init_banksize(void
        return 0;
  }
  
 -u32 get_board_rev(void)
 -{
 -      return 0;
 -}
 -
  int board_init(void)
  {
-       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
- 
        return 0;
  }
  

diff --cc board/st/stm32f469-discovery/stm32f469-discovery.c
index 122273a2ae7984612d1b291428dda942f8575d06,056c9dff2a8fd8e1bb8c3d713a2e98eb5c1eb809..9ed6c1e67680ac4acc61a106712c3689bf797183
--- 1/board/st/stm32f469-discovery/stm32f469-discovery.c
--- 2/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@@ -40,10 -40,13 +40,8 @@@ int dram_init_banksize(void
        return 0;
  }
  
 -u32 get_board_rev(void)
 -{
 -      return 0;
 -}
 -
  int board_init(void)
  {
-       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
- 
        return 0;
  }
  

diff --cc board/st/stm32f746-disco/stm32f746-disco.c
Simple merge

diff --cc board/st/stm32h743-disco/stm32h743-disco.c
index cc8723002656e05da71c911af4be00aa1420a823,e493786f11c96bb9c9e37c0640ba7402473e445c..4ca5e847212ea7d1ed57f937375e06e11d4f990c
--- 1/board/st/stm32h743-disco/stm32h743-disco.c
--- 2/board/st/stm32h743-disco/stm32h743-disco.c
+++ b/board/st/stm32h743-disco/stm32h743-disco.c
@@@ -36,8 -36,12 +36,7 @@@ int dram_init_banksize(void
        return 0;
  }
  
 -u32 get_board_rev(void)
 -{
 -      return 0;
 -}
 -
  int board_init(void)
  {
-       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
        return 0;
  }

diff --cc board/st/stm32h743-eval/stm32h743-eval.c
index cc8723002656e05da71c911af4be00aa1420a823,e493786f11c96bb9c9e37c0640ba7402473e445c..4ca5e847212ea7d1ed57f937375e06e11d4f990c
--- 1/board/st/stm32h743-eval/stm32h743-eval.c
--- 2/board/st/stm32h743-eval/stm32h743-eval.c
+++ b/board/st/stm32h743-eval/stm32h743-eval.c
@@@ -36,8 -36,12 +36,7 @@@ int dram_init_banksize(void
        return 0;
  }
  
 -u32 get_board_rev(void)
 -{
 -      return 0;
 -}
 -
  int board_init(void)
  {
-       gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100;
        return 0;
  }

diff --cc board/st/stm32h750-art-pi/stm32h750-art-pi.c
Simple merge

diff --cc board/st/stm32mp1/stm32mp1.c
Simple merge

diff --cc configs/dh_imx6_defconfig
Simple merge

diff --cc configs/kp_imx6q_tpc_defconfig
Simple merge

diff --cc configs/mx53ppd_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/stih410-b2260_defconfig
Simple merge

diff --cc configs/stm32f429-discovery_defconfig
index b6388cf00a32c91a3ca1113439ab843081477289,06e4631d9f0ccc16d4def77a2670952cfad2e034..6ee6e08524945e9d21032ce26a09bb8230f11211
--- 1/configs/stm32f429-discovery_defconfig
--- 2/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@@ -10,8 -9,8 +10,9 @@@ CONFIG_DEFAULT_DEVICE_TREE="stm32f429-d
  CONFIG_STM32F4=y
  CONFIG_TARGET_STM32F429_DISCOVERY=y
  CONFIG_ENV_VARS_UBOOT_CONFIG=y
 +CONFIG_SYS_LOAD_ADDR=0x90400000
  CONFIG_BOOTDELAY=3
+ CONFIG_BOOTCOMMAND="run bootcmd_romfs"
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
  # CONFIG_DISPLAY_CPUINFO is not set

diff --cc configs/stm32f429-evaluation_defconfig
Simple merge

diff --cc configs/stm32f469-discovery_defconfig
Simple merge

diff --cc configs/stm32f746-disco_defconfig
Simple merge

diff --cc configs/stm32f769-disco_defconfig
Simple merge

diff --cc configs/stv0991_defconfig
index b6ec831e6dd486d6e62136b1b103b56faad4306e,f5162728449aa80a29e3144ca059d80ff9d7f9d5..e06664047f727d13178aab83b30967e27682b13a
--- 1/configs/stv0991_defconfig
--- 2/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@@ -9,10 -9,7 +9,9 @@@ CONFIG_SYS_MEMTEST_END=0x0010000
  CONFIG_ENV_SIZE=0x10000
  CONFIG_ENV_OFFSET=0x30000
  CONFIG_ENV_SECT_SIZE=0x10000
 +CONFIG_SYS_MALLOC_LEN=0x14000
  CONFIG_DEFAULT_DEVICE_TREE="stv0991"
- CONFIG_SYS_EXTRA_OPTIONS="STV0991"
 +CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_BOOTDELAY=3
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"

diff --cc drivers/core/device.c
Simple merge

diff --cc drivers/core/lists.c
Simple merge

diff --cc drivers/core/root.c
Simple merge

diff --cc drivers/mtd/Kconfig
index 83c055a26ef5d5af706fc0f3228d107da19cf314,ed69ea114eaff6cfbec3cacfd8d4b2a45c118294..a9c8c48ae6f522b697e170b5e0147b082b122cb4
--- 1/drivers/mtd/Kconfig
--- 2/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@@ -109,16 -109,15 +109,23 @@@ config HBMC_AM65
         This is the driver for HyperBus controller on TI's AM65x and
         other SoCs
  
+ config STM32_FLASH
+       bool "STM32 MCU Flash driver"
+       depends on ARCH_STM32
+       help
+        This is the driver of embedded flash for some STMicroelectronics
+        STM32 MCU.
+ 
  source "drivers/mtd/nand/Kconfig"
  
 +config SYS_NAND_MAX_CHIPS
 +      int "NAND max chips"
 +      depends on MTD_RAW_NAND || CMD_ONENAND || TARGET_S5PC210_UNIVERSAL || \
 +              SPL_OMAP3_ID_NAND
 +      default 1
 +      help
 +        The maximum number of NAND chips per device to be supported.
 +
  source "drivers/mtd/spi/Kconfig"
  
  source "drivers/mtd/ubi/Kconfig"

diff --cc drivers/serial/serial-uclass.c
Simple merge

diff --cc drivers/timer/timer-uclass.c
index 6ea9e39e126c517a5c9d734eb02fa18c9127ba26,ebea1687894da4c5acf353935a7ed90e3302eb02..cbc3647698722b63c5022f5e50fd9a56aa094e34
--- 1/drivers/timer/timer-uclass.c
--- 2/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@@ -138,23 -136,23 +138,23 @@@ int notrace dm_timer_init(void
        if (gd->dm_root == NULL)
                return -EAGAIN;
  
 -#if !CONFIG_IS_ENABLED(OF_PLATDATA)
 -      /* Check for a chosen timer to be used for tick */
 -      node = ofnode_get_chosen_node("tick-timer");
 -
 -      if (ofnode_valid(node) &&
 -          uclass_get_device_by_ofnode(UCLASS_TIMER, node, &dev)) {
 -              /*
 -               * If the timer is not marked to be bound before
 -               * relocation, bind it anyway.
 -               */
 -              if (!lists_bind_fdt(dm_root(), node, &dev, NULL, false)) {
 -                      ret = device_probe(dev);
 -                      if (ret)
 -                              return ret;
 +      if (CONFIG_IS_ENABLED(OF_REAL)) {
 +              /* Check for a chosen timer to be used for tick */
 +              node = ofnode_get_chosen_node("tick-timer");
 +
 +              if (ofnode_valid(node) &&
 +                  uclass_get_device_by_ofnode(UCLASS_TIMER, node, &dev)) {
 +                      /*
 +                       * If the timer is not marked to be bound before
 +                       * relocation, bind it anyway.
 +                       */
-                       if (!lists_bind_fdt(dm_root(), node, &dev, false)) {
++                      if (!lists_bind_fdt(dm_root(), node, &dev, NULL, false)) {
 +                              ret = device_probe(dev);
 +                              if (ret)
 +                                      return ret;
 +                      }
                }
        }
 -#endif
  
        if (!dev) {
                /* Fall back to the first available timer */

diff --cc include/configs/dh_imx6.h
Simple merge

diff --cc include/configs/kp_imx6q_tpc.h
Simple merge

diff --cc include/configs/mx53ppd.h
index b6232422567188015cabac05186e0d5150dab984,c9fecc3f9ba3f763bb54dfdbef58bc3bf0427a37..f8118818b016d344980a42ce83db9257ced79783
--- 1/include/configs/mx53ppd.h
--- 2/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@@ -11,13 -11,18 +11,9 @@@
  
  #include <asm/arch/imx-regs.h>
  
 -#define CONFIG_CMDLINE_TAG
 -#define CONFIG_SETUP_MEMORY_TAGS
 -#define CONFIG_INITRD_TAG
 -
  #define CONFIG_SYS_FSL_CLK
  
 -/* Size of malloc() pool */
 -#define CONFIG_SYS_MALLOC_LEN         (10 * 1024 * 1024)
 -
 -#define CONFIG_REVISION_TAG
 -
  /* USB Configs */
- #define CONFIG_USB_HOST_ETHER
- #define CONFIG_USB_ETHER_ASIX
- #define CONFIG_USB_ETHER_MCS7830
- #define CONFIG_USB_ETHER_SMSC95XX
  #define CONFIG_MXC_USB_PORT   1
  #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
  #define CONFIG_MXC_USB_FLAGS  0

diff --cc include/configs/pm9263.h
index c13f8de7c18e267bf9c0b7d1c0e8800434b288bc,8d11759aa0fa691197d0d1887c935fc28cb4af75..80899930b29c8b040659821b98cc633e38ae73f0
--- 1/include/configs/pm9263.h
--- 2/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@@ -136,8 -140,12 +136,6 @@@
                 AT91_WDT_MR_WDDIS |                            \
                 AT91_WDT_MR_WDD(0xfff))
  
- #define CONFIG_USER_LOWLEVEL_INIT     1
 -#define CONFIG_CMDLINE_TAG    1       /* enable passing of ATAGs */
 -#define CONFIG_SETUP_MEMORY_TAGS 1
 -#define CONFIG_INITRD_TAG     1
 -
 -#undef CONFIG_SKIP_LOWLEVEL_INIT
--
  /*
   * Hardware drivers
   */

diff --cc include/configs/stih410-b2260.h
Simple merge

diff --cc include/configs/stm32f429-discovery.h
index 525a5277d86eb6de6f407ba7eaf6dbe6379608c3,d0ef18779fb41e78b8a15760655090530d6b9aaa..8dddd5449e8999bc2b61e00432bc58f88144de48
--- 1/include/configs/stm32f429-discovery.h
--- 2/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@@ -27,9 -27,8 +25,6 @@@
  
  #define CONFIG_SYS_CBSIZE             1024
  
- #define CONFIG_BOOTCOMMAND                                            \
-       "run bootcmd_romfs"
 -#define CONFIG_SYS_MALLOC_LEN         (2 << 20)
--
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
        "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \

diff --cc include/configs/stm32f429-evaluation.h
Simple merge

diff --cc include/configs/stm32f469-discovery.h
Simple merge

diff --cc include/configs/stm32f746-disco.h
Simple merge

diff --cc include/configs/stm32mp1.h
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge