Merge "ipq9574: Disable ethernet support"

This commit is contained in:
Linux Build Service Account 2021-07-20 12:10:35 -07:00 committed by Gerrit - the friendly Code Review server
commit eed9d45c6c
3 changed files with 8 additions and 6 deletions

View file

@ -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)
{

View file

@ -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

View file

@ -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