summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2026-09-01 08:11:37 -0600
committerTom Rini <[email protected]>2026-09-01 08:11:37 -0600
commit4a4bcb0ada8d43390e2819e62f4baee723631f5d (patch)
tree663b812791635c650733df56773fe97b7a3e40f9
parentcd5bd0cb98ececd1e2eb69d0093e4940b25c9941 (diff)
parent295f19cae3f4cbebdb8685e3fe063c983a46fd1d (diff)
Merge tag 'u-boot-stm32-20260901' of https://git.u-boot-project.org/u-boot/custodians/u-boot-stm into next
STM32MP1: - Add stm32mp157f-dk2-u-boot.dtsi file - use debug() for image entry point message - spl: support loading U-Boot proper from eMMC hardware partitions Various fixes: - MAINTAINERS: Replace STM32 and STPMIC with N: - treewide: Fix STMicroelectronics spelling
-rw-r--r--MAINTAINERS32
-rw-r--r--arch/arm/dts/stm32mp157f-dk2-u-boot.dtsi11
-rw-r--r--arch/arm/mach-stm32mp/stm32mp1/cpu.c2
-rw-r--r--arch/arm/mach-stm32mp/stm32mp1/spl.c5
-rw-r--r--include/configs/stm32mp21_st_common.h2
-rw-r--r--include/configs/stm32mp23_st_common.h2
6 files changed, 15 insertions, 39 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f5ec830e4a3..7ced7f9aaec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -645,42 +645,12 @@ M: Patrice Chotard <[email protected]>
L: [email protected] (moderated for non-subscribers)
T: git https://git.u-boot-project.org/u-boot/custodians/u-boot-stm.git
S: Maintained
-F: arch/arm/mach-stm32mp/
F: doc/board/st/
-F: drivers/adc/stm32-adc*
-F: drivers/clk/stm32/
-F: drivers/gpio/stm32_gpio.c
-F: drivers/hwspinlock/stm32_hwspinlock.c
-F: drivers/i2c/stm32f7_i2c.c
-F: drivers/mailbox/stm32-ipcc.c
-F: drivers/misc/stm32mp_fuse.c
-F: drivers/misc/stm32_rcc.c
-F: drivers/mmc/stm32_sdmmc2.c
-F: drivers/mtd/nand/raw/stm32_fmc2_nand.c
-F: drivers/phy/phy-stm32-usbphyc.c
-F: drivers/pinctrl/pinctrl_stm32.c
-F: drivers/power/pmic/stpmic1.c
-F: drivers/power/regulator/stm32-vrefbuf.c
-F: drivers/power/regulator/stpmic1.c
-F: drivers/ram/stm32mp1/
-F: drivers/remoteproc/stm32_copro.c
-F: drivers/reset/stm32/
F: drivers/rng/optee_rng.c
-F: drivers/rng/stm32_rng.c
-F: drivers/rtc/stm32_rtc.c
-F: drivers/serial/serial_stm32.*
-F: drivers/spi/stm32_ospi.c
-F: drivers/spi/stm32_qspi.c
-F: drivers/spi/stm32_spi.c
-F: drivers/video/stm32/stm32_ltdc.c
-F: drivers/video/stm32/stm32_lvds.c
-F: drivers/watchdog/stm32mp_wdt.c
-F: include/dt-bindings/clock/stm32mp*
-F: include/stm32_rcc.h
F: tools/logos/st.bmp
-F: tools/stm32image.c
N: stm
N: stm32
+N: stpmic
ARM SUNXI
M: Andre Przywara <[email protected]>
diff --git a/arch/arm/dts/stm32mp157f-dk2-u-boot.dtsi b/arch/arm/dts/stm32mp157f-dk2-u-boot.dtsi
new file mode 100644
index 00000000000..77805417bfa
--- /dev/null
+++ b/arch/arm/dts/stm32mp157f-dk2-u-boot.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2026 Amarula Solutions, Dario Binacchi <[email protected]>
+ */
+
+/ {
+ fwu-mdata {
+ compatible = "u-boot,fwu-mdata-gpt";
+ fwu-mdata-store = <&sdmmc1>;
+ };
+};
diff --git a/arch/arm/mach-stm32mp/stm32mp1/cpu.c b/arch/arm/mach-stm32mp/stm32mp1/cpu.c
index 4d81c70b230..2446fbb0763 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/cpu.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/cpu.c
@@ -360,7 +360,7 @@ void __noreturn jump_to_image(struct spl_image_info *spl_image)
image_entry_stm32_t image_entry =
(image_entry_stm32_t)spl_image->entry_point;
- printf("image entry point: 0x%lx\n", spl_image->entry_point);
+ debug("image entry point: 0x%lx\n", spl_image->entry_point);
image_entry(romapi);
}
#endif
diff --git a/arch/arm/mach-stm32mp/stm32mp1/spl.c b/arch/arm/mach-stm32mp/stm32mp1/spl.c
index d2e41b8e65f..d2af705a5d1 100644
--- a/arch/arm/mach-stm32mp/stm32mp1/spl.c
+++ b/arch/arm/mach-stm32mp/stm32mp1/spl.c
@@ -56,11 +56,6 @@ u32 spl_boot_device(void)
return BOOT_DEVICE_MMC1;
}
-u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
-{
- return MMCSD_MODE_RAW;
-}
-
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
int spl_mmc_boot_partition(const u32 boot_device)
{
diff --git a/include/configs/stm32mp21_st_common.h b/include/configs/stm32mp21_st_common.h
index c601f2d7fb6..bca4c4b5337 100644
--- a/include/configs/stm32mp21_st_common.h
+++ b/include/configs/stm32mp21_st_common.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2026, STMicroelectronics - All Rights Reserved
*
- * Configuration settings for the STMicroelectonics STM32MP21x boards
+ * Configuration settings for the STMicroelectronics STM32MP21x boards
*/
#ifndef __CONFIG_STM32MP21_ST_COMMON_H__
diff --git a/include/configs/stm32mp23_st_common.h b/include/configs/stm32mp23_st_common.h
index 0c5c2fbef87..547c230ae90 100644
--- a/include/configs/stm32mp23_st_common.h
+++ b/include/configs/stm32mp23_st_common.h
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2025, STMicroelectronics - All Rights Reserved
*
- * Configuration settings for the STMicroelectonics STM32MP23x boards
+ * Configuration settings for the STMicroelectronics STM32MP23x boards
*/
#ifndef __CONFIG_STM32MP23_ST_COMMON_H__