diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index 649ac5b0d9c..3e37e965d07 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -2580,7 +2580,7 @@ int imxrt_netinitialize(int intf) * ****************************************************************************/ -#if CONFIG_IMXRT_ENET_NETHIFS == 1 +#if CONFIG_IMXRT_ENET_NETHIFS == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)imxrt_netinitialize(0); diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 71fe0940a71..e7265c6a95d 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -2182,7 +2182,7 @@ int kinetis_netinitialize(int intf) * ****************************************************************************/ -#if CONFIG_KINETIS_ENETNETHIFS == 1 +#if CONFIG_KINETIS_ENETNETHIFS == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)kinetis_netinitialize(0); diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 49554ac80d2..ee6babbaa3c 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -2983,7 +2983,7 @@ static void lpc17_ethreset(struct lpc17_driver_s *priv) * ****************************************************************************/ -#if CONFIG_LPC17_NINTERFACES > 1 +#if CONFIG_LPC17_NINTERFACES > 1 || defined(CONFIG_NETDEV_LATEINIT) int lpc17_ethinitialize(int intf) #else static inline int lpc17_ethinitialize(int intf) @@ -3079,7 +3079,7 @@ static inline int lpc17_ethinitialize(int intf) * ****************************************************************************/ -#if CONFIG_LPC17_NINTERFACES == 1 +#if CONFIG_LPC17_NINTERFACES == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)lpc17_ethinitialize(0); diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 135b871f3d0..5d72a0be4a5 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -3878,9 +3878,11 @@ static inline int lpc43_ethinitialize(void) * ****************************************************************************/ +#ifndef CONFIG_NETDEV_LATEINIT void up_netinitialize(void) { (void)lpc43_ethinitialize(); } +#endif #endif /* CONFIG_NET && CONFIG_LPC43_ETHERNET */ diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index d9f7fde528b..8b8a1565c44 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -4022,10 +4022,9 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv) * ****************************************************************************/ -#if STM32_NETHERNET == 1 +#if STM32_NETHERNET == 1 || defined(CONFIG_NETDEV_LATEINIT) static inline #endif - int stm32_ethinitialize(int intf) { struct stm32_ethmac_s *priv; @@ -4106,7 +4105,7 @@ int stm32_ethinitialize(int intf) * ****************************************************************************/ -#if STM32_NETHERNET == 1 +#if STM32_NETHERNET == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)stm32_ethinitialize(0); diff --git a/arch/arm/src/stm32/stm32_eth.h b/arch/arm/src/stm32/stm32_eth.h index 10de21f23c4..62bc83cbf95 100644 --- a/arch/arm/src/stm32/stm32_eth.h +++ b/arch/arm/src/stm32/stm32_eth.h @@ -82,7 +82,7 @@ extern "C" * ************************************************************************************/ -#if STM32_NETHERNET > 1 +#if STM32_NETHERNET > 1 || defined(CONFIG_NETDEV_LATEINIT) int stm32_ethinitialize(int intf); #endif diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index d22c8122a03..1997ab29d22 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -4075,10 +4075,9 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) * ****************************************************************************/ -#if STM32F7_NETHERNET == 1 +#if STM32F7_NETHERNET == 1 || defined(CONFIG_NETDEV_LATEINIT) static inline #endif - int stm32_ethinitialize(int intf) { struct stm32_ethmac_s *priv; @@ -4154,7 +4153,7 @@ int stm32_ethinitialize(int intf) * ****************************************************************************/ -#if STM32F7_NETHERNET == 1 +#if STM32F7_NETHERNET == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)stm32_ethinitialize(0); diff --git a/arch/arm/src/stm32f7/stm32_ethernet.h b/arch/arm/src/stm32f7/stm32_ethernet.h index 9edfc92dd52..2916232e26b 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.h +++ b/arch/arm/src/stm32f7/stm32_ethernet.h @@ -79,7 +79,7 @@ extern "C" * ************************************************************************************/ -#if STM32F7_NETHERNET > 1 +#if STM32F7_NETHERNET > 1 || defined(CONFIG_NETDEV_LATEINIT) int stm32_ethinitialize(int intf); #endif diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index c56de2fed19..8c73389102f 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -1656,7 +1656,7 @@ static int tiva_rmmac(struct net_driver_s *dev, const uint8_t *mac) * ****************************************************************************/ -#if TIVA_NETHCONTROLLERS > 1 +#if TIVA_NETHCONTROLLERS > 1 || defined(CONFIG_NETDEV_LATEINIT) int tiva_ethinitialize(int intf) #else static inline int tiva_ethinitialize(int intf) @@ -1748,7 +1748,7 @@ static inline int tiva_ethinitialize(int intf) * ************************************************************************************/ -#if TIVA_NETHCONTROLLERS == 1 +#if TIVA_NETHCONTROLLERS == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)tiva_ethinitialize(0); diff --git a/arch/arm/src/tiva/tiva_ethernet.h b/arch/arm/src/tiva/tiva_ethernet.h index 1ebf06c5deb..c147a2ae074 100644 --- a/arch/arm/src/tiva/tiva_ethernet.h +++ b/arch/arm/src/tiva/tiva_ethernet.h @@ -94,7 +94,7 @@ extern "C" * ****************************************************************************/ -#if TIVA_NETHCONTROLLERS > 1 +#if TIVA_NETHCONTROLLERS > 1 || defined(CONFIG_NETDEV_LATEINIT) int tiva_ethinitialize(int intf); #endif diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index 44213bb21e7..928f43deeb6 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -4020,10 +4020,9 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv) * ****************************************************************************/ -#if TIVA_NETHCONTROLLERS == 1 +#if TIVA_NETHCONTROLLERS == 1 || defined(CONFIG_NETDEV_LATEINIT) static inline #endif - int tiva_ethinitialize(int intf) { struct tiva_ethmac_s *priv; @@ -4161,7 +4160,7 @@ int tiva_ethinitialize(int intf) * ****************************************************************************/ -#if TIVA_NETHCONTROLLERS == 1 +#if TIVA_NETHCONTROLLERS == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)tiva_ethinitialize(0); diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 693848f6696..1bcb7e6e111 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -3320,7 +3320,7 @@ static void pic32mx_ethreset(struct pic32mx_driver_s *priv) * ****************************************************************************/ -#if CONFIG_PIC32MX_NINTERFACES > 1 +#if CONFIG_PIC32MX_NINTERFACES > 1 || defined(CONFIG_NETDEV_LATEINIT) int pic32mx_ethinitialize(int intf) #else static inline int pic32mx_ethinitialize(int intf) @@ -3394,7 +3394,7 @@ static inline int pic32mx_ethinitialize(int intf) * ****************************************************************************/ -#if CONFIG_PIC32MX_NINTERFACES == 1 +#if CONFIG_PIC32MX_NINTERFACES == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)pic32mx_ethinitialize(0); diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 2445de249ba..866bf651e95 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -3356,7 +3356,7 @@ static void pic32mz_ethreset(struct pic32mz_driver_s *priv) * ****************************************************************************/ -#if CONFIG_PIC32MZ_NINTERFACES > 1 +#if CONFIG_PIC32MZ_NINTERFACES > 1 || defined(CONFIG_NETDEV_LATEINIT) int pic32mz_ethinitialize(int intf) #else static inline int pic32mz_ethinitialize(int intf) @@ -3433,7 +3433,7 @@ static inline int pic32mz_ethinitialize(int intf) * ****************************************************************************/ -#if CONFIG_PIC32MZ_NINTERFACES == 1 +#if CONFIG_PIC32MZ_NINTERFACES == 1 && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { (void)pic32mz_ethinitialize(0); diff --git a/configs/lc823450-xgevk/src/lc823450_netinit.c b/configs/lc823450-xgevk/src/lc823450_netinit.c index 7546dbe3324..8ae0a366fd4 100644 --- a/configs/lc823450-xgevk/src/lc823450_netinit.c +++ b/configs/lc823450-xgevk/src/lc823450_netinit.c @@ -47,6 +47,9 @@ * Name: up_netinitialize ****************************************************************************/ +#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { } +#endif + diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c index 341e5508cfe..f3fa1181e36 100644 --- a/configs/mikroe-stm32f4/src/stm32_vs1053.c +++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c @@ -162,7 +162,7 @@ static int up_read_dreq(FAR const struct vs1053_lower_s *lower) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: up_vs1053initialize ****************************************************************************/ void up_vs1053initialize(FAR struct spi_dev_s* spi) diff --git a/configs/nucleo-l432kc/src/stm32_appinit.c b/configs/nucleo-l432kc/src/stm32_appinit.c index e03fcaa81a8..07f6ec44717 100644 --- a/configs/nucleo-l432kc/src/stm32_appinit.c +++ b/configs/nucleo-l432kc/src/stm32_appinit.c @@ -77,7 +77,7 @@ * ****************************************************************************/ -#ifdef CONFIG_NET +#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { } diff --git a/configs/stm32f4discovery/src/stm32_netinit.c b/configs/stm32f4discovery/src/stm32_netinit.c index 5cc73b4a539..36ee755f933 100644 --- a/configs/stm32f4discovery/src/stm32_netinit.c +++ b/configs/stm32f4discovery/src/stm32_netinit.c @@ -47,6 +47,9 @@ * Name: up_netinitialize ************************************************************************************/ +#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) void up_netinitialize(void) { } +#endif +