PowerPC: Update last users of CONFIG_ISO_STRING to Kconfig

There are a few boards that use CONFIG_ISO_STRING as part of a sanity
check during firmware update at run time.  Move this string to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/mpl/pati/Kconfig b/board/mpl/pati/Kconfig
index b141da3984960c61ad38bc11c111566c41a26275..0eeaf7096bea056c354184843197f56573432da8 100644 (file)
--- a/board/mpl/pati/Kconfig
+++ b/board/mpl/pati/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "PATI"
 
+config ISO_STRING
+       string
+       default "MEV-10084-001"
 endif

diff --git a/board/mpl/pati/pati.h b/board/mpl/pati/pati.h
index 29380560443f6defed3ce7ae5d53df74c13fbbd6..93a5918252339ae5cdc890cc00bbdafc9f195a01 100644 (file)
--- a/board/mpl/pati/pati.h
+++ b/board/mpl/pati/pati.h
@@ -203,7 +203,6 @@
 
 #if defined(CONFIG_TARGET_MIP405) || defined(CONFIG_TARGET_MIP405T)
 #define PATI_FIRMWARE_START_OFFSET     0x00300000
-#define PATI_ISO_STRING  "MEV-10084-001"
 #endif
 
 #define PATI_ENDIAN_MODE       0x3E

diff --git a/board/mpl/pip405/Kconfig b/board/mpl/pip405/Kconfig
index f485367410b16baedb1d64c864b32c1e09595488..e7ae6af83633da26981a59bd36654742c700b6fb 100644 (file)
--- a/board/mpl/pip405/Kconfig
+++ b/board/mpl/pip405/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "PIP405"
 
+config ISO_STRING
+       string
+       default "MEV-10066-001"
 endif

diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 880246e74411146f8093293ddc03c63ba7fd44c5..ebabdffc31a5b394022f55b5ab38699a1976bbdb 100644 (file)
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -252,7 +252,4 @@
  */
 #define CONFIG_SYS_DER                 0x00000000
 
-#define VERSION_TAG "released"
-#define CONFIG_ISO_STRING "MEV-10084-001"
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 9ace443451a7b086cccf046f332f2f72dc40a60c..7d08f0c5d91fdad0f089ebcaa630a8747599e3bc 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -333,10 +333,4 @@
  ************************************************************/
 #define CONFIG_BZIP2           1
 
-/************************************************************
- * Ident
- ************************************************************/
-#define VERSION_TAG "released"
-#define CONFIG_ISO_STRING "MEV-10066-001"
-
 #endif /* __CONFIG_H */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 090c0a2f4cd308d3dd1e5ad146b0498a55a7af7e..cb4516fe6ecdf738c94a4eaa0dfdd92498da21a5 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1728,7 +1728,6 @@ CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
 CONFIG_ISO_PARTITION
-CONFIG_ISO_STRING
 CONFIG_ISP1362_USB
 CONFIG_IS_
 CONFIG_IS_BUILTIN