diff mbox series

[U-Boot,03/16] stm32mp1: migrate PREBOOT to Kconfig

Message ID 1555601571-3257-4-git-send-email-patrick.delaunay@st.com
State Accepted
Commit ce3772ca8d337c071c1028b8cae16765c098bca9
Delegated to: Patrice Chotard
Headers show
Series patches for stm32 support | expand

Commit Message

Patrick DELAUNAY April 18, 2019, 3:32 p.m. UTC 
Use Kconfig to activate CONFIG_PREBOOT (empty by default).

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

 arch/arm/Kconfig           | 1 +
 common/Kconfig             | 1 +
 include/configs/stm32mp1.h | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4640f3b..6660d8b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1405,6 +1405,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 1a1951f..c759952 100644
--- 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 eda8775..8e00158 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -87,8 +87,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;" \