stm32mp1: cosmetic cleanup Kconfig

Cosmetic cleanup in mach-stm32mp Kconfig
- remove duplicated SPL_DRIVERS_MISC_SUPPORT
- update help for TARGET_STM32MP1
- set value for NR_DRAM_BANKS
- remove one comment as DEBUG_UART is deactivated by default
- include board Kconfig at the end of the file

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

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index d70658a14398782bb508d836d079ec3d48e2a77c..73aa382712268ddcb14477e651e7f6b31b0566d6 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -17,7 +17,6 @@ config SPL
        select SPL_DM_RESET
        select SPL_SERIAL_SUPPORT
        select SPL_SYSCON
-       select SPL_DRIVERS_MISC_SUPPORT
        imply SPL_DISPLAY_PRINT
        imply SPL_LIBDISK_SUPPORT
 
@@ -38,7 +37,9 @@ config TARGET_STM32MP1
        imply SYSRESET_SYSCON if !STM32MP1_TRUSTED
        help
                target STMicroelectronics SOC STM32MP1 family
+               STM32MP157, STM32MP153 or STM32MP151
                STMicroelectronics MPU with core ARMv7
+               dual core A7 for STM32MP157/3, monocore for STM32MP151
 
 config STM32MP1_TRUSTED
        bool "Support trusted boot with TF-A"
@@ -58,6 +59,9 @@ config SYS_TEXT_BASE
                when DDR driver is used:
                  DDR + 1MB (0xC0100000)
 
+config NR_DRAM_BANKS
+       default 1
+
 config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2
        hex "Partition on MMC2 to use to load U-Boot from"
        depends on SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
@@ -66,9 +70,6 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2
          Partition on the second MMC to load U-Boot from when the MMC is being
          used in raw mode
 
-source "board/st/stm32mp1/Kconfig"
-
-# currently activated for debug / should be deactivated for real product
 if DEBUG_UART
 
 config DEBUG_UART_BOARD_INIT
@@ -83,4 +84,6 @@ config DEBUG_UART_CLOCK
        default 64000000
 endif
 
+source "board/st/stm32mp1/Kconfig"
+
 endif

diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index d20b2ab350841910ff4279e9a3f1eb13c9ee5f9e..b1d09fb648c331aa4a18b155174342b828f78826 100644 (file)
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -5,7 +5,6 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_TARGET_STM32MP1=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3
 CONFIG_SPL_I2C_SUPPORT=y

diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index 62ab010e91ace3d8dc84076e34e83439b602b1af..9be731955a19a61d8d6ba6e95f0723af7bc3e129 100644 (file)
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -3,7 +3,6 @@ CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_STM32MP1=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_PROMPT="STM32MP> "
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_ELF is not set