mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge tag 'net-20251022' of https://source.denx.de/u-boot/custodians/u-boot-net
Pull request net-20251022 net: - airoha: improvements - Tighten a few more driver dependencies - designware: fix bitbang init error - phy: Make driver overloading get_phy_id depend on !COMPILE_TEST - phy: add paged PHY register accessors - make dhcp_run() common for NET and NET_LWIP - dwc_eth_ops: Correct check for FDT_64BIT - mediatek: mt7988: various fixup + MDIO detach - phy: aquantia: switch to use phy_get_ofnode(), fix bindings typo net-legacy: - bootp: Prevent buffer overflow to avoid leaking the RAM content - tftp: make TFTP ports unconditionally configurable misc: - uthreads: Make use of CONFIG_IS_ENABLED consistently
This commit is contained in:
@@ -479,6 +479,16 @@ int net_loop(enum proto_t protocol);
|
||||
*/
|
||||
int dhcp_run(ulong addr, const char *fname, bool autoload);
|
||||
|
||||
/**
|
||||
* do_dhcp - Run the dhcp command
|
||||
*
|
||||
* @cmdtp: Unused
|
||||
* @flag: Command flags (CMD_FLAG_...)
|
||||
* @argc: Number of arguments
|
||||
* @argv: List of arguments
|
||||
* Return: result (see enum command_ret_t)
|
||||
*/
|
||||
int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
|
||||
|
||||
/**
|
||||
* do_ping - Run the ping command
|
||||
|
||||
@@ -50,7 +50,6 @@ int net_lwip_dns_resolve(char *name_or_ip, ip_addr_t *ip);
|
||||
*/
|
||||
bool wget_validate_uri(char *uri);
|
||||
|
||||
int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
|
||||
int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
|
||||
int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
|
||||
|
||||
|
||||
@@ -123,6 +123,11 @@ struct phy_driver {
|
||||
int (*write_mmd)(struct phy_device *phydev, int devad, int reg,
|
||||
u16 val);
|
||||
|
||||
/** @read_page: Return the current PHY register page number */
|
||||
int (*read_page)(struct phy_device *phydev);
|
||||
/** @write_page: Set the current PHY register page number */
|
||||
int (*write_page)(struct phy_device *phydev, int page);
|
||||
|
||||
/* driver private data */
|
||||
ulong data;
|
||||
};
|
||||
@@ -314,6 +319,9 @@ int phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum,
|
||||
u16 mask, u16 set);
|
||||
int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum,
|
||||
u16 mask, u16 set);
|
||||
int phy_save_page(struct phy_device *phydev);
|
||||
int phy_select_page(struct phy_device *phydev, int page);
|
||||
int phy_restore_page(struct phy_device *phydev, int oldpage, int ret);
|
||||
|
||||
int phy_startup(struct phy_device *phydev);
|
||||
int phy_config(struct phy_device *phydev);
|
||||
|
||||
@@ -72,7 +72,7 @@ struct uthread_mutex {
|
||||
|
||||
#define UTHREAD_MUTEX_INITIALIZER { .state = UTHREAD_MUTEX_UNLOCKED }
|
||||
|
||||
#ifdef CONFIG_UTHREAD
|
||||
#if CONFIG_IS_ENABLED(UTHREAD)
|
||||
|
||||
/**
|
||||
* uthread_create() - Create a uthread object and make it ready for execution
|
||||
@@ -184,5 +184,5 @@ static inline bool uthread_grp_done(unsigned int grp_id)
|
||||
#define uthread_mutex_trylock(_mutex) ({ 0 })
|
||||
#define uthread_mutex_unlock(_mutex) ({ 0; })
|
||||
|
||||
#endif /* CONFIG_UTHREAD */
|
||||
#endif /* CONFIG_IS_ENABLED(UTHREAD) */
|
||||
#endif /* _UTHREAD_H_ */
|
||||
|
||||
Reference in New Issue
Block a user