arm: keystone2: Rename CONFIG_ENV_KS2_BOARD_SETTINGS

Rename CONFIG_ENV_KS2_BOARD_SETTINGS to ENV_KS2_BOARD_SETTINGS so that
it better fits with the rest of the environment addition macros.

Cc: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 716ae3b0d4aa4ee4f14a197a4bd6f3d7dabd7c73..65bf646f3fb2946157d8eeb2ab6e2c7f1cf6aa9d 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -23,7 +23,7 @@
 #endif
 
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
        DEFAULT_SEC_BOOT_ENV                                            \
        "boot=ubi\0"                                                    \

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 4471eb4f6a8473daf8b258542a3e068aa5efa0e1..17245ab1586140a8f901f9af58dd73144015f65d 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -16,7 +16,7 @@
 #define CONFIG_SOC_K2G
 
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_PMMC_BOOT_ENV                                           \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index d90b2648185a8eb4fda96a3f02ca8384d7e2b940..1fdecd60e7693d7f12876a3e77d0315e7fc07707 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -23,7 +23,7 @@
 #endif
 
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
        DEFAULT_SEC_BOOT_ENV                                            \
        "boot=ubi\0"                                                    \

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 152cea01b55b807a574c0b4d66e1c08766267942..97512c9903de0dc1854f903d0466768fd9e5912f 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -23,7 +23,7 @@
 #endif
 
 /* U-Boot general configuration */
-#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
+#define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
        DEFAULT_SEC_BOOT_ENV                                            \
        "boot=ubi\0"                                                    \

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cfc2be7b9f07ac3fed35d54df9a20319d5b06a44..fc2b3431ddba547558d13f7353333687b795719e 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -187,7 +187,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        DEFAULT_LINUX_BOOT_ENV                                          \
-       CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                             \
+       ENV_KS2_BOARD_SETTINGS                                          \
        DFUARGS                                                         \
        "bootdir=/boot\0" \
        "tftp_root=/\0"                                                 \