From c643a856ccbe6b50e86e1f7f0ad8ae11e5695a84 Mon Sep 17 00:00:00 2001 From: Selvam Sathappan Periakaruppan Date: Tue, 20 Jul 2021 20:03:32 +0530 Subject: [PATCH 1/2] ipq9574: Do board_eth_init only if EMDA enabled Change-Id: I76ea6c634ca004c796deb6b32191b881ac143f3a Signed-off-by: Selvam Sathappan Periakaruppan --- board/qca/arm/ipq9574/ipq9574.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 22e16ffd8a..068fe326ca 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -917,21 +917,22 @@ void eth_clock_enable(void) } #endif +#ifdef CONFIG_IPQ9574_EDMA int board_eth_init(bd_t *bis) { - int ret=0; + int ret = 0; #ifndef CONFIG_IPQ9574_RUMI eth_clock_enable(); #endif ret = ipq9574_edma_init(NULL); - if (ret != 0) printf("%s: ipq9574_edma_init failed : %d\n", __func__, ret); return ret; } +#endif unsigned long timer_read_counter(void) { From 43dae58f78b25a0a60d0b45a1a6e9dfa20957fe0 Mon Sep 17 00:00:00 2001 From: Selvam Sathappan Periakaruppan Date: Tue, 20 Jul 2021 20:06:15 +0530 Subject: [PATCH 2/2] ipq9574: Disable ethernet support This patch will be reverted post SoD. Change-Id: I71251b61a13b18db63793cad7802b9a509bdae3f Signed-off-by: Selvam Sathappan Periakaruppan --- configs/ipq9574_defconfig | 6 +++--- include/configs/ipq9574.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/ipq9574_defconfig b/configs/ipq9574_defconfig index 57c8a66569..c0bfca188e 100644 --- a/configs/ipq9574_defconfig +++ b/configs/ipq9574_defconfig @@ -98,10 +98,10 @@ CONFIG_CMD_NFS=y # # Network PHY # -CONFIG_QCA8075_PHY=y -CONFIG_IPQ9574_QCA_AQUANTIA_PHY=y +# CONFIG_QCA8075_PHY is not set +# CONFIG_IPQ9574_QCA_AQUANTIA_PHY is not set # CONFIG_QCA8033_PHY is not set -CONFIG_QCA8081_PHY=y +# CONFIG_QCA8081_PHY is not set # # Misc commands diff --git a/include/configs/ipq9574.h b/include/configs/ipq9574.h index 8ead9e6cd6..1f1904c308 100644 --- a/include/configs/ipq9574.h +++ b/include/configs/ipq9574.h @@ -297,7 +297,7 @@ extern loff_t board_env_size; #define RPM_VERSION 3 #endif -#define CONFIG_IPQ9574_EDMA 1 +#ifdef CONFIG_IPQ9574_EDMA #define CONFIG_IPQ9574_BRIDGED_MODE 1 #define CONFIG_NET_RETRY_COUNT 5 #define CONFIG_SYS_RX_ETH_BUFFER 128 @@ -311,6 +311,7 @@ extern loff_t board_env_size; #define CONFIG_CMD_TFTPPUT #define CONFIG_IPQ_MDIO 1 #define CONFIG_IPQ_ETH_INIT_DEFER +#endif /* * CRASH DUMP ENABLE