board/km: remove CONFIG_KM_BOARD_NAME

We can use the existing CONFIG_SYS_CONFIG_NAME define for that and
remove the option. Also fix the boot string for all km83xx boards.

Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
CC: Priyanka Jain <priyanka.jain@nxp.com>
CC: Valentin Longchamp <valentin.longchamp@ch.abb.com>

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index abbf985..5969d51 100644 (file)
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -277,7 +277,7 @@ int dram_init(void)
 
 int checkboard(void)
 {
-       puts("Board: Keymile " CONFIG_KM_BOARD_NAME);
+       puts("Board: ABB " CONFIG_SYS_CONFIG_NAME);
 
        if (piggy_present())
                puts(" with PIGGY.");

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index ae9653d..88914c8 100644 (file)
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -29,7 +29,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
 
 int checkboard(void)
 {
-       printf("Board: Keymile %s\n", CONFIG_KM_BOARD_NAME);
+       printf("Board: Keymile %s\n", CONFIG_SYS_CONFIG_NAME);
 
        return 0;
 }

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 5335034..cdfb280 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -9,7 +9,6 @@
 #define __CONFIG_H
 
 #define CONFIG_HOSTNAME                "kmcoge5ne"
-#define CONFIG_KM_BOARD_NAME   "kmcoge5ne"
 #define CONFIG_NAND_ECC_BCH
 #define CONFIG_NAND_KMETER1
 #define CONFIG_SYS_MAX_NAND_DEVICE             1

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 7d85a02..4129d97 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -9,7 +9,6 @@
 #define __CONFIG_H
 
 #define CONFIG_HOSTNAME                "kmeter1"
-#define CONFIG_KM_BOARD_NAME   "kmeter1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"

diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 67e864f..5050c70 100644 (file)
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_KM_BOARD_NAME   "kmopti2"
 #define CONFIG_HOSTNAME                "kmopti2"
 
 /* include common defines/options for all Keymile boards */

diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
index 9c17044..6cee3b4 100644 (file)
--- a/include/configs/kmp204x.h
+++ b/include/configs/kmp204x.h
@@ -9,7 +9,6 @@
 
 #if defined(CONFIG_KMCOGE4)
 #define CONFIG_HOSTNAME                "kmcoge4"
-#define CONFIG_KM_BOARD_NAME   "kmcoge4"
 
 #else
 #error ("Board not supported")

diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index ba33e60..e3de6c6 100644 (file)
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_KM_BOARD_NAME   "kmsupx5"
 #define CONFIG_HOSTNAME                "kmsupx5"
 
 /* include common defines/options for all Keymile boards */

diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index a441fca..bdd35cc 100644 (file)
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -21,7 +21,6 @@
  */
 
 #define CONFIG_HOSTNAME   "kmtegr1"
-#define CONFIG_KM_BOARD_NAME   "kmtegr1"
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
 

diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index e0c907d..a4ceb1c 100644 (file)
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_KM_BOARD_NAME    "kmtepr2"
 #define CONFIG_HOSTNAME         "kmtepr2"
 
 /* include common defines/options for all Keymile boards */

diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index 1705f9c..d747079 100644 (file)
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -21,7 +21,6 @@
  */
 
 #define CONFIG_HOSTNAME                "suvd3"
-#define CONFIG_KM_BOARD_NAME   "suvd3"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"

diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index 808538e..d43ccbe 100644 (file)
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_KM_BOARD_NAME   "tuge1"
 #define CONFIG_HOSTNAME                "tuge1"
 
 /* include common defines/options for all Keymile boards */

diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 0eb673a..f5a9f12 100644 (file)
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_KM_BOARD_NAME   "tuxx1"
 #define CONFIG_HOSTNAME                "tuxx1"
 
 /* include common defines/options for all Keymile boards */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4b8958e..594e6b7 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -924,7 +924,6 @@ CONFIG_KMCOGE4
 CONFIG_KMP204X
 CONFIG_KMTEGR1
 CONFIG_KM_BOARD_EXTRA_ENV
-CONFIG_KM_BOARD_NAME
 CONFIG_KM_COGE5UN
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU