mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
Convert CONFIG_SYS_DISCOVER_PHY to Kconfig
This converts the following to Kconfig: CONFIG_SYS_DISCOVER_PHY Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
7675a526e0
commit
0d121ad6de
15 changed files with 5 additions and 106 deletions
|
@ -400,11 +400,14 @@ config FTGMAC100
|
|||
offers high-priority transmit queue for QoS and CoS
|
||||
applications.
|
||||
|
||||
config SYS_DISCOVER_PHY
|
||||
bool
|
||||
|
||||
config MCFFEC
|
||||
bool "ColdFire Ethernet Support"
|
||||
depends on DM_ETH
|
||||
select PHYLIB
|
||||
select SYS_DISCOVER_PHY
|
||||
help
|
||||
This driver supports the network interface units in the
|
||||
ColdFire family.
|
||||
|
@ -417,6 +420,7 @@ config FSLDMAFEC
|
|||
bool "ColdFire DMA Ethernet Support"
|
||||
depends on DM_ETH
|
||||
select PHYLIB
|
||||
select SYS_DISCOVER_PHY
|
||||
help
|
||||
This driver supports the network interface units in the
|
||||
ColdFire family.
|
||||
|
@ -732,6 +736,7 @@ config MPC8XX_FEC
|
|||
bool "Fast Ethernet Controller on MPC8XX"
|
||||
depends on MPC8xx
|
||||
select MII
|
||||
select SYS_DISCOVER_PHY
|
||||
help
|
||||
This driver implements support for the Fast Ethernet Controller
|
||||
on MPC8XX
|
||||
|
|
|
@ -243,16 +243,8 @@ static int fec_init(struct udevice *dev)
|
|||
fecpin_setclear(info, 1);
|
||||
fec_halt(dev);
|
||||
|
||||
#if defined(CONFIG_CMD_MII) || defined (CONFIG_MII) || \
|
||||
defined (CONFIG_SYS_DISCOVER_PHY)
|
||||
|
||||
mii_init();
|
||||
set_fec_duplex_speed(fecp, info->dup_spd);
|
||||
#else
|
||||
#ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
set_fec_duplex_speed(fecp, (FECDUPLEX << 16) | FECSPEED);
|
||||
#endif /* ifndef CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif /* CONFIG_CMD_MII || CONFIG_MII */
|
||||
|
||||
/* We use strictly polling mode only */
|
||||
fecp->eimr = 0;
|
||||
|
|
|
@ -278,17 +278,9 @@ int mcffec_init(struct udevice *dev)
|
|||
fecpin_setclear(info, 1);
|
||||
fec_reset(info);
|
||||
|
||||
#if defined(CONFIG_CMD_MII) || defined (CONFIG_MII) || \
|
||||
defined (CONFIG_SYS_DISCOVER_PHY)
|
||||
|
||||
mii_init();
|
||||
|
||||
set_fec_duplex_speed(fecp, info->dup_spd);
|
||||
#else
|
||||
#ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
set_fec_duplex_speed(fecp, (FECDUPLEX << 16) | FECSPEED);
|
||||
#endif /* ifndef CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif /* CONFIG_CMD_MII || CONFIG_MII */
|
||||
|
||||
/* We use strictly polling mode only */
|
||||
fecp->eimr = 0;
|
||||
|
|
|
@ -17,15 +17,6 @@
|
|||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
|
|
@ -22,15 +22,6 @@
|
|||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_PINMUX_REG (gpio->par_qspi)
|
||||
#define CONFIG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
|
||||
|
|
|
@ -31,15 +31,6 @@
|
|||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
env/embedded.o(.text);
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_IPADDR 192.162.1.2
|
||||
# define CONFIG_NETMASK 255.255.255.0
|
||||
|
|
|
@ -33,15 +33,6 @@
|
|||
|
||||
/* Available command configuration */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
#define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
#ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
#define FECDUPLEX FULL
|
||||
#define FECSPEED _100BASET
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
|
||||
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)
|
||||
|
|
|
@ -29,15 +29,6 @@
|
|||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
env/embedded.o(.text*);
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_IPADDR 192.162.1.2
|
||||
# define CONFIG_NETMASK 255.255.255.0
|
||||
|
|
|
@ -23,15 +23,8 @@
|
|||
#define CONFIG_WATCHDOG_TIMEOUT 5000
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
# define CONFIG_SYS_TX_ETH_BUFFER 8
|
||||
# define CONFIG_SYS_FEC_BUF_USE_SRAM
|
||||
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_RTC_CNT (0x8000)
|
||||
|
|
|
@ -22,15 +22,6 @@
|
|||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
|
|
@ -24,15 +24,6 @@
|
|||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
|
|
@ -86,7 +86,6 @@
|
|||
/* environment is in FLASH */
|
||||
|
||||
/* Ethernet configuration part */
|
||||
#define CONFIG_SYS_DISCOVER_PHY 1
|
||||
|
||||
/* NAND configuration part */
|
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||
|
|
|
@ -85,15 +85,6 @@
|
|||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
env/embedded.o(.text);
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
# ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
# define FECDUPLEX FULL
|
||||
# define FECSPEED _100BASET
|
||||
# endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
|
||||
/*
|
||||
*-----------------------------------------------------------------------------
|
||||
* Define user parameters that have to be customized most likely
|
||||
|
@ -157,7 +148,6 @@ enter a valid image address in flash */
|
|||
* ---
|
||||
*/
|
||||
|
||||
#define CONFIG_SYS_DISCOVER_PHY
|
||||
#define CONFIG_SYS_ENET_BD_BASE 0x780000
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
*----------------------------------------------------------------------*/
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
#define CONFIG_SYS_DISCOVER_PHY
|
||||
#define CONFIG_OVERWRITE_ETHADDR_ONCE
|
||||
#endif
|
||||
|
||||
|
|
|
@ -106,12 +106,4 @@
|
|||
#define CACR_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \
|
||||
CONFIG_SYS_INIT_RAM_SIZE - 12)
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
#define CONFIG_SYS_DISCOVER_PHY
|
||||
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
|
||||
#ifndef CONFIG_SYS_DISCOVER_PHY
|
||||
#define FECDUPLEX FULL
|
||||
#define FECSPEED _100BASET
|
||||
#endif /* CONFIG_SYS_DISCOVER_PHY */
|
||||
#endif
|
||||
#endif /* __STMARK2_CONFIG_H */
|
||||
|
|
Loading…
Reference in a new issue