dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 18:22:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

ppc/km: convert KM_DEF_NETDEV to Kconfig

Browse Source 
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>
This commit is contained in:
Holger Brunck
2019-11-26 19:09:01 +01:00
committed by Priyanka Jain
parent 4d4880086a
commit 05577fa518
9 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
board/keymile/Kconfig
View File

@@ -62,6 +62,12 @@ config KM_CONSOLE_TTY
help help
TTY console to use on board. 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 config KM_COMMON_ETH_INIT
bool "Common Ethernet Initialization" bool "Common Ethernet Initialization"
default y if KIRKWOOD || MPC83xx default y if KIRKWOOD || MPC83xx

1
configs/kmcoge5ne_defconfig
View File

@@ -1,5 +1,6 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_TEXT_BASE=0xF0000000 CONFIG_SYS_TEXT_BASE=0xF0000000
CONFIG_KM_DEF_NETDEV="eth1"
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000

1
configs/kmeter1_defconfig
View File

@@ -1,5 +1,6 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_TEXT_BASE=0xF0000000 CONFIG_SYS_TEXT_BASE=0xF0000000
CONFIG_KM_DEF_NETDEV="eth2"
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000

1
configs/kmtegr1_defconfig
View File

@@ -1,5 +1,6 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_TEXT_BASE=0xF0000000 CONFIG_SYS_TEXT_BASE=0xF0000000
CONFIG_KM_DEF_NETDEV="eth1"
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000

7
include/configs/km/keymile-common.h
View File

@@ -38,11 +38,6 @@
"actual_bank=0\0" "actual_bank=0\0"
#endif #endif
#ifndef CONFIG_KM_DEF_NETDEV
#define CONFIG_KM_DEF_NETDEV \
"netdev=eth0\0"
#endif
#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT #ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */ #endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
@@ -168,7 +163,7 @@
#ifndef CONFIG_KM_DEF_ENV #ifndef CONFIG_KM_DEF_ENV
#define CONFIG_KM_DEF_ENV \ #define CONFIG_KM_DEF_ENV \
CONFIG_KM_DEF_ENV_BOOTPARAMS \ 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_CPU \
CONFIG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_DEF_ENV_BOOTTARGETS \
CONFIG_KM_DEF_ENV_BOOTARGS \ CONFIG_KM_DEF_ENV_BOOTARGS \

1
include/configs/kmcoge5ne.h
View File

@@ -10,7 +10,6 @@
#define CONFIG_HOSTNAME "kmcoge5ne" #define CONFIG_HOSTNAME "kmcoge5ne"
#define CONFIG_KM_BOARD_NAME "kmcoge5ne" #define CONFIG_KM_BOARD_NAME "kmcoge5ne"
#define CONFIG_KM_DEF_NETDEV "netdev=eth1\0"
#define CONFIG_NAND_ECC_BCH #define CONFIG_NAND_ECC_BCH
#define CONFIG_NAND_KMETER1 #define CONFIG_NAND_KMETER1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

1
include/configs/kmeter1.h
View File

@@ -10,7 +10,6 @@
#define CONFIG_HOSTNAME "kmeter1" #define CONFIG_HOSTNAME "kmeter1"
#define CONFIG_KM_BOARD_NAME "kmeter1" #define CONFIG_KM_BOARD_NAME "kmeter1"
#define CONFIG_KM_DEF_NETDEV "netdev=eth2\0"
/* include common defines/options for all Keymile boards */ /* include common defines/options for all Keymile boards */
#include "km/keymile-common.h" #include "km/keymile-common.h"

2
include/configs/kmp204x.h
View File

@@ -17,8 +17,6 @@
#define CONFIG_KMP204X #define CONFIG_KMP204X
#define CONFIG_KM_DEF_NETDEV "netdev=eth0\0"
/* an additionnal option is required for UBI as subpage access is /* an additionnal option is required for UBI as subpage access is
* supported in u-boot * supported in u-boot
*/ */

1
scripts/config_whitelist.txt
View File

@@ -935,7 +935,6 @@ CONFIG_KM_DEF_ENV_BOOTTARGETS
CONFIG_KM_DEF_ENV_CONSTANTS CONFIG_KM_DEF_ENV_CONSTANTS
CONFIG_KM_DEF_ENV_CPU CONFIG_KM_DEF_ENV_CPU
CONFIG_KM_DEF_ENV_FLASH_BOOT CONFIG_KM_DEF_ENV_FLASH_BOOT
CONFIG_KM_DEF_NETDEV
CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
CONFIG_KM_DISABLE_PCIE CONFIG_KM_DISABLE_PCIE
CONFIG_KM_ECC_MODE CONFIG_KM_ECC_MODE