| commit | a0084ed8eaede4a8340b0a43be918cc37fa1b9c6 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Sat May 30 20:11:38 2020 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Sat May 30 20:11:38 2020 -0400 |
| tree | 4f92a8d0f1bb5bde6c7d49d650139accd6301711 | |
| parent | 9f61a2f2c137b6cc09da58d28205c6ed39fb35ea [diff] | |
| parent | 00f1434b155d358b6c2e44f46d64582825c058fc [diff] |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh - r2dplus fixes
diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index e4d0967..0bbdb0e 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c
@@ -46,7 +46,9 @@ } } +#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 8ae4ba1..900428a 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig
@@ -7,8 +7,7 @@ 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