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 abbf985eb2e1937aa5a9b65d5febeb34d64b26a8..5969d5139524950adb165c61957dd9569dca5ecb 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 ae9653db78f0a7ca8f289da9c4c5674daf7abd65..88914c80e8796121a94c66818c15e68e898e04db 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 533503450580d4cfe24be52cd451d3209a6726c7..cdfb280aeeee3dd9770a483fac0d35cac768323f 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 7d85a02c680c85bbd2206a198abe6c693f01941a..4129d97505b631e080d21fde3c2bcbf0a2be4deb 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 67e864fc987bebc6f15f4c835c1c133e01783d2d..5050c70303901f77419dd0b25f8441f9c4ea68e2 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 9c17044b9bc000e986548f7806edcfba1fcdc8b5..6cee3b47b3e75d9ed25e25c6ed63b501134ff06c 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 ba33e6074bfd1164a5dec526ae8d5da4724c4813..e3de6c61e71c905ba57c7a3ebc08cfd2bfcaf452 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 a441fca12187bb3c8ed7c754d14530518d5ac07d..bdd35cc7fb754b72742bfa99a5e6de2a1cb99cc6 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 e0c907d11a42c58d40111d9d5bb3a680ae3b998e..a4ceb1c50d6bede08ec143c1d2eab99388bb7e97 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 1705f9cafbab96988954499a42eaefe9de3d4dd3..d74707971ba473f75b3c78707c8372dde4c8c0f2 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 808538ef9d654a1333966baea0038c4cda55bfc1..d43ccbe8dd94b040cd4237d5c54f69e198383430 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 0eb673a9474de64f09f8d4fff46377f36b7fe392..f5a9f1284a3d5335a66862244d33baedfca7025a 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 4b8958ed6ee152a2c899b7daa6661d548b6d5d3e..594e6b726df1785e13f82f21a62b43dd7a0535bd 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