From: Tom Rini Date: Tue, 12 Oct 2021 16:01:00 +0000 (-0400) Subject: Merge tag 'u-boot-stm32-20211012' of https://source.denx.de/u-boot/custodians/u-boot-stm X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=776bf6a5457eb0c61c367d1ee7e45733a1c72ed6;p=u-boot.git 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 --- 776bf6a5457eb0c61c367d1ee7e45733a1c72ed6 diff --cc board/st/stm32f429-discovery/stm32f429-discovery.c index 34f9d6bc00,5a50e98dd0..55e464cc7c --- a/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 c170314ed8,cf3056163c..25472f041f --- a/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 122273a2ae,056c9dff2a..9ed6c1e676 --- a/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/stm32h743-disco/stm32h743-disco.c index cc87230026,e493786f11..4ca5e84721 --- a/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 cc87230026,e493786f11..4ca5e84721 --- a/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 configs/stm32f429-discovery_defconfig index b6388cf00a,06e4631d9f..6ee6e08524 --- a/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/stv0991_defconfig index b6ec831e6d,f516272844..e06664047f --- a/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_LOAD_ADDR=0x0 - CONFIG_SYS_EXTRA_OPTIONS="STV0991" CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" diff --cc drivers/mtd/Kconfig index 83c055a26e,ed69ea114e..a9c8c48ae6 --- a/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/timer/timer-uclass.c index 6ea9e39e12,ebea168789..cbc3647698 --- a/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/mx53ppd.h index b623242256,c9fecc3f9b..f8118818b0 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@@ -11,13 -11,18 +11,9 @@@ #include -#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 c13f8de7c1,8d11759aa0..80899930b2 --- a/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/stm32f429-discovery.h index 525a5277d8,d0ef18779f..8dddd5449e --- a/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};" \