diff options
| author | Holger Brunck | 2019-11-26 19:09:01 +0100 |
|---|---|---|
| committer | Priyanka Jain | 2019-12-23 14:06:47 +0530 |
| commit | 05577fa518e8785ee7db751a8ff74069fcec60ba (patch) | |
| tree | 95bfea1f08d291d115db63bf81ed8586b33b60cf | |
| parent | 4d4880086a413194a6fbeae0992f3ebf855ec878 (diff) | |
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>
| -rw-r--r-- | board/keymile/Kconfig | 6 | ||||
| -rw-r--r-- | configs/kmcoge5ne_defconfig | 1 | ||||
| -rw-r--r-- | configs/kmeter1_defconfig | 1 | ||||
| -rw-r--r-- | configs/kmtegr1_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/km/keymile-common.h | 7 | ||||
| -rw-r--r-- | include/configs/kmcoge5ne.h | 1 | ||||
| -rw-r--r-- | include/configs/kmeter1.h | 1 | ||||
| -rw-r--r-- | include/configs/kmp204x.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
9 files changed, 10 insertions, 11 deletions
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index acaa9289f76..5f512d56dac 100644 --- 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 c5e709e28cc..282b9577faf 100644 --- 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 18f96257845..33b4a3462e7 100644 --- 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 91b7aa8b77d..e014f7e3f46 100644 --- 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 8433d8e5682..e690d8f39da 100644 --- 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 fc78b27cbb6..53350345058 100644 --- 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 bfa7ca27c74..7d85a02c680 100644 --- 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 771d0248f79..9c17044b9bc 100644 --- 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 cf1808e051c..4b8958ed6ee 100644 --- 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 |