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 e4d0967c14c2f32b7e5068dd5af17c25380b8a82..0bbdb0e33ae523344fbaee57302d8bda2ca49c47 100644 (file)
--- 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 8ae4ba1a1c8d195cdab1832ec4413bc32bcd2915..900428a84f031be56f218c454ebe832dfe4f481c 100644 (file)
--- 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