stm32mp1: migrate PREBOOT to Kconfig

Use Kconfig to activate CONFIG_PREBOOT (empty by default).

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index efb9aab39061dbe42552e5d48c1e587cf48edfc2..01ff57cf1bec359d89620df661a9d16c434ac55e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1488,6 +1488,7 @@ config ARCH_STM32MP
        imply CMD_DM
        imply CMD_POWEROFF
        imply ENV_VARS_UBOOT_RUNTIME_CONFIG
+       imply USE_PREBOOT
        help
          Support for STM32MP SoC family developed by STMicroelectronics,
          MPUs based on ARM cortex A core

diff --git a/common/Kconfig b/common/Kconfig
index 1a1951f874ef1bf2122849f32ba2ced84e2dba1b..c759952b80bc1c39770df2a1d98902fd3c586ae0 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -247,6 +247,7 @@ config USE_PREBOOT
 config PREBOOT
        string "preboot default value"
        depends on USE_PREBOOT
+       default ""
        help
          This is the default of "preboot" environment variable.
 

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index 399b1d85c910e409b9f916725854a1304e8aee80..e8be51a1559d94c3de2e1f4feb71aa5cf5e7382a 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -85,8 +85,6 @@
  * for nand boot, boot with on ubifs partition on nand
  * for nor boot, use the default order
  */
-#define CONFIG_PREBOOT
-
 #define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
        "echo \"Boot over ${boot_device}${boot_instance}!\";" \
        "if test ${boot_device} = serial || test ${boot_device} = usb;" \