From 4c82b03c1223352c99084a6038122263df443dc4 Mon Sep 17 00:00:00 2001
From: Patrice Chotard <patrice.chotard@st.com>
Date: Tue, 6 Feb 2018 10:47:59 +0100
Subject: [PATCH] configs: stm32: Enable CONFIG_ENV_VARS_UBOOT_CONFIG

Enable CONFIG_ENV_VARS_UBOOT_CONFIG for all STM32 boards
It allows to retrieve the SoC name into the "soc" environment
variable.

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Vikas Manocha <vikas.manocha@st.com>
---
 include/configs/stm32f429-discovery.h  | 1 +
 include/configs/stm32f429-evaluation.h | 1 +
 include/configs/stm32f469-discovery.h  | 1 +
 include/configs/stm32f746-disco.h      | 1 +
 include/configs/stm32h743-disco.h      | 2 ++
 include/configs/stm32h743-eval.h       | 2 ++
 6 files changed, 8 insertions(+)

diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index af9daad320..92166a4894 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -59,6 +59,7 @@
 #define CONFIG_BOOTCOMMAND						\
 	"run bootcmd_romfs"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
 	"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index ab33d0f3d2..79b77bd378 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -52,6 +52,7 @@
 #define CONFIG_BOOTCOMMAND						\
 	"run boot_sd"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32429i-eval.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000"
 
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index c290a66fdd..99c3e08d33 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -54,6 +54,7 @@
 #define CONFIG_BOOTCOMMAND						\
 	"run boot_sd"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000"
 
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 3e952c2acd..b99eb71b48 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -52,6 +52,7 @@
 #define CONFIG_BOOTCOMMAND						\
 	"run bootcmd_romfs"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
 	"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 531de70149..1494203e83 100644
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -39,6 +39,8 @@
 #define CONFIG_BOOTARGS							\
 	"console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 531de70149..1494203e83 100644
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -39,6 +39,8 @@
 #define CONFIG_BOOTARGS							\
 	"console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+
 /*
  * Command line configuration.
  */
-- 
2.39.5