From patchwork Sat May 9 20:37:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 245400 List-Id: U-Boot discussion From: marek.vasut at gmail.com (Marek Vasut) Date: Sat, 9 May 2020 22:37:28 +0200 Subject: [PATCH 1/2] sh: r2dplus: Enable board_eth_init only for non-DM case Message-ID: <20200509203729.821800-1-marek.vasut+renesas@gmail.com> The board_eth_init() is not used for DM case, enable it only for the non-DM case. This function should eventually be removed. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- board/renesas/r2dplus/r2dplus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index f2da4686c3..079f778f22 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c @@ -45,7 +45,9 @@ void ide_set_reset(int idereset) } } +#ifndef CONFIG_DM_ETH int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } +#endif From patchwork Sat May 9 20:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 245401 List-Id: U-Boot discussion From: marek.vasut at gmail.com (Marek Vasut) Date: Sat, 9 May 2020 22:37:29 +0200 Subject: [PATCH 2/2] sh: r2dplus: Switch to DM ETH In-Reply-To: <20200509203729.821800-1-marek.vasut+renesas@gmail.com> References: <20200509203729.821800-1-marek.vasut+renesas@gmail.com> Message-ID: <20200509203729.821800-2-marek.vasut+renesas@gmail.com> Enable DM ethernet support for the board, now that rtl8139 is converted. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- configs/r2dplus_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 8ae4ba1a1c..1aed84905f 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -27,9 +27,9 @@ CONFIG_DM=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_CFI=y +CONFIG_DM_ETH=y CONFIG_RTL8139=y CONFIG_PCI=y CONFIG_DM_PCI=y -CONFIG_DM_PCI_COMPAT=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y