Re: [PATCH 08/16] arm: stm32mp: add support of STM32MP13x

Hi,

Some ad

On 5/6/22 16:06, Patrick Delaunay wrote:

Introduce the code in mach-stm32mp and the configuration file stm32mp13_defconfig for the new STM32MP family.

Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com

arch/arm/mach-stm32mp/Kconfig | 21 +++- arch/arm/mach-stm32mp/Kconfig.13x | 57 +++++++++ arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/cpu.c | 3 + arch/arm/mach-stm32mp/fdt.c | 3 + arch/arm/mach-stm32mp/include/mach/stm32.h | 26 ++++ .../arm/mach-stm32mp/include/mach/sys_proto.h | 16 ++- arch/arm/mach-stm32mp/stm32mp13x.c | 115 ++++++++++++++++++ board/st/stm32mp1/Kconfig | 15 +++ board/st/stm32mp1/MAINTAINERS | 2 + configs/stm32mp15_basic_defconfig | 2 +- configs/stm32mp15_defconfig | 2 +- configs/stm32mp15_trusted_defconfig | 2 +- include/configs/stm32mp13_common.h | 106 ++++++++++++++++ include/configs/stm32mp13_st_common.h | 17 +++ include/configs/stm32mp15_common.h | 4 +- 16 files changed, 385 insertions(+), 7 deletions(-) create mode 100644 arch/arm/mach-stm32mp/Kconfig.13x create mode 100644 arch/arm/mach-stm32mp/stm32mp13x.c create mode 100644 include/configs/stm32mp13_common.h create mode 100644 include/configs/stm32mp13_st_common.h

[...]

diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h new file mode 100644 index 0000000000..799e3f053b --- /dev/null +++ b/include/configs/stm32mp13_common.h @@ -0,0 +1,106 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ +/*

• • Copyright (C) 2021, STMicroelectronics - All Rights Reserved
• • Configuration settings for the STM32MP15x CPU
• */

+#ifndef __CONFIG_STM32MP13_COMMMON_H +#define __CONFIG_STM32MP13_COMMMON_H +#include <linux/sizes.h> +#include <asm/arch/stm32.h>

+/*

• • Configuration of the external SRAM memory used by U-Boot
• */

+#define CONFIG_SYS_SDRAM_BASE STM32_DDR_BASE +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_4M)

=> CONFIG_SYS_INIT_SP_ADDR remove and moved in Kconfig

+/*

• • Console I/O buffer size
• */

+#define CONFIG_SYS_CBSIZE SZ_1K

=> CONFIG_SYS_CBSIZE removed and moved in Kconfig

+/*

• • For booting Linux, use the first 256 MB of memory, since this is
• • the maximum mapped by the Linux kernel during initialization.
• */

+#define CONFIG_SYS_BOOTMAPSZ SZ_256M

+/* Extend size of kernel image for uncompression */ +#define CONFIG_SYS_BOOTM_LEN SZ_32M

+/*MMC SD*/ +#define CONFIG_SYS_MMC_MAX_DEVICE 2

+/* NAND support */ +#define CONFIG_SYS_MAX_NAND_DEVICE 1

+/*****************************************************************************/ +#ifdef CONFIG_DISTRO_DEFAULTS +/*****************************************************************************/

+#ifdef CONFIG_CMD_MMC +#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0) +#define BOOT_TARGET_MMC1(func) func(MMC, mmc, 1) +#else +#define BOOT_TARGET_MMC0(func) +#define BOOT_TARGET_MMC1(func) +#endif

+#define BOOT_TARGET_DEVICES(func) \

• BOOT_TARGET_MMC1(func) \
• BOOT_TARGET_MMC0(func)

+/*

• • default bootcmd for stm32mp13:
• • for mmc boot (eMMC, SD card), distro boot on the same mmc device
• */

+#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \

• "echo "Boot over ${boot_device}${boot_instance}!";" \

• "run env_check;" \
  

• "if test ${boot_device} = mmc;" \
  

• "then env set boot_targets \"mmc${boot_instance}\"; fi;" \
  

• "run distro_bootcmd;" \
  

• "fi;\0"

+#define STM32MP_EXTRA \

• "env_check=if env info -p -d -q; then env save; fi\0" \
• "boot_net_usb_start=true\0"

+#ifndef STM32MP_BOARD_EXTRA_ENV +#define STM32MP_BOARD_EXTRA_ENV +#endif

+#include <config_distro_bootcmd.h>

+/*

• • memory layout for 32M uncompressed/compressed kernel,
• • 1M fdt, 1M script, 1M pxe and 1M for overlay
• • and the ramdisk at the end.
• */

+#define __KERNEL_ADDR_R __stringify(0xc2000000) +#define __FDT_ADDR_R __stringify(0xc4000000) +#define __SCRIPT_ADDR_R __stringify(0xc4100000) +#define __PXEFILE_ADDR_R __stringify(0xc4200000) +#define __FDTOVERLAY_ADDR_R __stringify(0xc4300000) +#define __RAMDISK_ADDR_R __stringify(0xc4400000)

+#define STM32MP_MEM_LAYOUT \

• "kernel_addr_r=" __KERNEL_ADDR_R "\0" \
• "fdt_addr_r=" __FDT_ADDR_R "\0" \
• "scriptaddr=" __SCRIPT_ADDR_R "\0" \
• "pxefile_addr_r=" __PXEFILE_ADDR_R "\0" \
• "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
• "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"

+#define CONFIG_EXTRA_ENV_SETTINGS \

• STM32MP_MEM_LAYOUT \
• STM32MP_BOOTCMD \
• BOOTENV \
• STM32MP_EXTRA \
• STM32MP_BOARD_EXTRA_ENV

+#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/

+#endif /* __CONFIG_STM32MP13_COMMMON_H */ diff --git a/include/configs/stm32mp13_st_common.h b/include/configs/stm32mp13_st_common.h new file mode 100644 index 0000000000..d73526f14e --- /dev/null +++ b/include/configs/stm32mp13_st_common.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ +/*

• • Copyright (C) 2022, STMicroelectronics - All Rights Reserved
• • Configuration settings for the STMicroelectonics STM32MP15x boards
• */

+#ifndef __CONFIG_STM32MP13_ST_COMMON_H__ +#define __CONFIG_STM32MP13_ST_COMMON_H__

+#define STM32MP_BOARD_EXTRA_ENV \

• "usb_pgood_delay=1000\0" \
• "console=ttySTM0\0"

+#include <configs/stm32mp13_common.h>

+#endif

[...]

Applied to u-boot-stm/next, with these modification

thanks!

Regards Patrick