diff options
| author | Tom Rini <[email protected]> | 2019-12-24 08:18:19 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-12-24 08:18:19 -0500 |
| commit | 87f69f467a8335b171c71bf217d2625d515acd7c (patch) | |
| tree | c46abf4bb357aa10d2d9a075ea7df63cbc2579aa /board | |
| parent | c0912f9bbfb26dd03d189953678691b799d35b6e (diff) | |
| parent | 4466b99703197c6258aded7728eed7c292343a43 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx into next
- Enable DM driver on ppc/km boards
- Enable DM_USB for some of NXP powerpc platforms: P5040, T4240, T208x,
T104x, P4080, P2041, P2020, P1020, P3041
- Some updates in mpc85xx-ddr driver, km boards
Diffstat (limited to 'board')
| -rw-r--r-- | board/keymile/Kconfig | 6 | ||||
| -rw-r--r-- | board/keymile/km83xx/km83xx.c | 2 | ||||
| -rw-r--r-- | board/keymile/kmp204x/kmp204x.c | 2 |
3 files changed, 8 insertions, 2 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/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index abbf985eb2e..5969d513952 100644 --- 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 ae9653db78f..88914c80e87 100644 --- 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; } |