diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-30 20:11:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-30 20:11:38 -0400 |
| commit | d09b832cd8ccb7e37e2b188394df5a73d7074c3b (patch) | |
| tree | 4f92a8d0f1bb5bde6c7d49d650139accd6301711 | |
| parent | 8309157ff18b969c63ab5fd5a5db5215f48942ff (diff) | |
| parent | d8172f606ffd474248172c9a932483913c9f7b7d (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh
- r2dplus fixes
| -rw-r--r-- | board/renesas/r2dplus/r2dplus.c | 2 | ||||
| -rw-r--r-- | configs/r2dplus_defconfig | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index e4d0967c14..0bbdb0e33a 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c @@ -46,7 +46,9 @@ void ide_set_reset(int idereset) } } +#ifndef CONFIG_DM_ETH int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } +#endif diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 8ae4ba1a1c..900428a84f 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -7,8 +7,7 @@ CONFIG_TARGET_R2DPLUS=y CONFIG_BOOTDELAY=-1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200" -# CONFIG_CMDLINE_EDITING is not set -# CONFIG_AUTO_COMPLETE is not set +CONFIG_HUSH_PARSER=y CONFIG_CMD_IMLS=y CONFIG_CMD_DM=y CONFIG_CMD_IDE=y |