ppc/km: convert KM_DEF_NETDEV to Kconfig

Remove this from the board header files and move it to Kconfig. Also use
the correct default address for kmtegr1.

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/Kconfig b/board/keymile/Kconfig
index acaa9289f769fe3671dfafca36cf2266487bb014..5f512d56dac951845a8aeea21845844317511095 100644 (file)
--- a/board/keymile/Kconfig
+++ b/board/keymile/Kconfig
@@ -62,6 +62,12 @@ config KM_CONSOLE_TTY
        help
          TTY console to use on board.
 
+config KM_DEF_NETDEV
+       string "Default Netdevice"
+       default "eth0"
+       help
+         Default netdevice for debug interface
+
 config KM_COMMON_ETH_INIT
        bool "Common Ethernet Initialization"
        default y if KIRKWOOD || MPC83xx

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index c5e709e28ccaa5f469cba60381e6f235c04067e5..282b9577faffbb8301e148d0a357987a89f5290e 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_KM_DEF_NETDEV="eth1"
 CONFIG_ENV_SIZE=0x4000
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 CONFIG_ENV_SECT_SIZE=0x20000

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 18f96257845effd8ae31655d7305c8fbd5c70c53..33b4a3462e74af29a9bb035b438202fda38a4d8f 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_ENV_SIZE=0x4000
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 CONFIG_ENV_SECT_SIZE=0x20000

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index 91b7aa8b77d616616ea9e860babead368a637254..e014f7e3f4628207132a6a4980887a1885b65d3c 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_KM_DEF_NETDEV="eth1"
 CONFIG_ENV_SIZE=0x4000
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 CONFIG_ENV_SECT_SIZE=0x20000

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 8433d8e5682df1b461e9ea8ea2f372f5be10e074..e690d8f39da45b571435b95ea0b8138e21ba1aab 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -38,11 +38,6 @@
        "actual_bank=0\0"
 #endif
 
-#ifndef CONFIG_KM_DEF_NETDEV
-#define CONFIG_KM_DEF_NETDEV   \
-       "netdev=eth0\0"
-#endif
-
 #ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
@@ -168,7 +163,7 @@
 #ifndef CONFIG_KM_DEF_ENV
 #define CONFIG_KM_DEF_ENV      \
        CONFIG_KM_DEF_ENV_BOOTPARAMS                                    \
-       CONFIG_KM_DEF_NETDEV                                            \
+       "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0"                \
        CONFIG_KM_DEF_ENV_CPU                                           \
        CONFIG_KM_DEF_ENV_BOOTTARGETS                                   \
        CONFIG_KM_DEF_ENV_BOOTARGS                                      \

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index fc78b27cbb6f60b557a4c0d7842c6abc9d53b4ea..533503450580d4cfe24be52cd451d3209a6726c7 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_HOSTNAME                "kmcoge5ne"
 #define CONFIG_KM_BOARD_NAME   "kmcoge5ne"
-#define CONFIG_KM_DEF_NETDEV   "netdev=eth1\0"
 #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 bfa7ca27c74e40cb11612f75e582b4bfc661c8c1..7d85a02c680c85bbd2206a198abe6c693f01941a 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_HOSTNAME                "kmeter1"
 #define CONFIG_KM_BOARD_NAME   "kmeter1"
-#define CONFIG_KM_DEF_NETDEV   "netdev=eth2\0"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"

diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
index 771d0248f791d87671d931fb4c3146796181ffac..9c17044b9bc000e986548f7806edcfba1fcdc8b5 100644 (file)
--- a/include/configs/kmp204x.h
+++ b/include/configs/kmp204x.h
@@ -17,8 +17,6 @@
 
 #define CONFIG_KMP204X
 
-#define CONFIG_KM_DEF_NETDEV   "netdev=eth0\0"
-
 /* an additionnal option is required for UBI as subpage access is
  * supported in u-boot
  */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cf1808e051c83a50cc4573f1ef0d90684fb8705d..4b8958ed6ee152a2c899b7daa6661d548b6d5d3e 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -935,7 +935,6 @@ CONFIG_KM_DEF_ENV_BOOTTARGETS
 CONFIG_KM_DEF_ENV_CONSTANTS
 CONFIG_KM_DEF_ENV_CPU
 CONFIG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEF_NETDEV
 CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_DISABLE_PCIE
 CONFIG_KM_ECC_MODE