diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index 243f1379510..438b6160a9e 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -653,49 +653,49 @@ endmenu menu "Ethernet driver options" depends on LPC17_ETHERNET -config PHY_AUTONEG +config LPC17_PHY_AUTONEG bool "Autonegiation" ---help--- Enable auto-negotion -config PHY_SPEED100 +config LPC17_PHY_SPEED100 bool "100Mbit/Sec" - depends on !PHY_AUTONEG + depends on !LPC17_PHY_AUTONEG ---help--- Select 100Mbit vs. 10Mbit speed. -config PHY_FDUPLEX +config LPC17_PHY_FDUPLEX bool "Full duplex" - depends on !PHY_AUTONEG + depends on !LPC17_PHY_AUTONEG ---help--- Select full (vs. half) duplex -config NET_EMACRAM_SIZE +config LPC17_EMACRAM_SIZE int "EMAC RAM Size" default 16384 ---help--- Size of EMAC RAM. Default: 16384 bytes -config NET_NTXDESC +config LPC17_ETH_NTXDESC int "Number of Tx descriptors" default 13 ---help--- Configured number of Tx descriptors. Default: 13 -config NET_NRXDESC +config LPC17_ETH_NRXDESC int "Number of Rx descriptors" default 13 ---help--- Configured number of Rx descriptors. Default: 13 -config NET_PRIORITY +config LPC17_ETH_PRIORITY int "Ethernet interrupt priority" default 128 depends on ARCH_IRQPRIO && EXPERIMENTAL ---help--- Ethernet interrupt priority. The default is the default priority (128). -config NET_WOL +config LPC17_NET_WOL bool "Wake-up on LAN" default n ---help--- @@ -708,7 +708,7 @@ config LPC17_NET_REGDEBUG ---help--- Enable low level register debug. Also needs CONFIG_DEBUG_NET_INFO. -config NET_HASH +config LPC17_ETH_HASH bool "Hashing" default n ---help--- diff --git a/arch/arm/src/lpc17xx/lpc17_emacram.h b/arch/arm/src/lpc17xx/lpc17_emacram.h index 9d373e9d8f6..2f96d9525ad 100644 --- a/arch/arm/src/lpc17xx/lpc17_emacram.h +++ b/arch/arm/src/lpc17xx/lpc17_emacram.h @@ -75,14 +75,14 @@ /* Number of Tx descriptors */ -#ifndef CONFIG_NET_NTXDESC -# define CONFIG_NET_NTXDESC 13 +#ifndef CONFIG_LPC17_ETH_NTXDESC +# define CONFIG_LPC17_ETH_NTXDESC 13 #endif /* Number of Rx descriptors */ -#ifndef CONFIG_NET_NRXDESC -# define CONFIG_NET_NRXDESC 13 +#ifndef CONFIG_LPC17_ETH_NRXDESC +# define CONFIG_LPC17_ETH_NRXDESC 13 #endif /* Size of the region at the beginning of AHB SRAM 0 set set aside for the EMAC. @@ -90,15 +90,15 @@ * words. */ -#ifndef CONFIG_NET_EMACRAM_SIZE -# define CONFIG_NET_EMACRAM_SIZE LPC17_BANK0_SIZE +#ifndef CONFIG_LPC17_EMACRAM_SIZE +# define CONFIG_LPC17_EMACRAM_SIZE LPC17_BANK0_SIZE #endif -#if CONFIG_NET_EMACRAM_SIZE > LPC17_BANK0_SIZE +#if CONFIG_LPC17_EMACRAM_SIZE > LPC17_BANK0_SIZE # error "EMAC RAM size cannot exceed the size of AHB SRAM Bank 0" #endif -#if (CONFIG_NET_EMACRAM_SIZE & 3) != 0 +#if (CONFIG_LPC17_EMACRAM_SIZE & 3) != 0 # error "EMAC RAM size must be in multiples of 32-bit words" #endif @@ -108,9 +108,9 @@ #undef LPC17_BANK0_HEAPBASE #undef LPC17_BANK0_HEAPSIZE -#if CONFIG_NET_EMACRAM_SIZE < (LPC17_BANK0_SIZE-128) -# define LPC17_BANK0_HEAPBASE (LPC17_SRAM_BANK0 + CONFIG_NET_EMACRAM_SIZE) -# define LPC17_BANK0_HEAPSIZE (LPC17_BANK0_SIZE - CONFIG_NET_EMACRAM_SIZE) +#if CONFIG_LPC17_EMACRAM_SIZE < (LPC17_BANK0_SIZE-128) +# define LPC17_BANK0_HEAPBASE (LPC17_SRAM_BANK0 + CONFIG_LPC17_EMACRAM_SIZE) +# define LPC17_BANK0_HEAPSIZE (LPC17_BANK0_SIZE - CONFIG_LPC17_EMACRAM_SIZE) #endif /* Memory at the beginning of AHB SRAM, Bank 0 is set aside for EMAC Tx and Rx @@ -119,14 +119,14 @@ */ #define LPC17_EMACRAM_BASE LPC17_SRAM_BANK0 -#define LPC17_EMACRAM_SIZE CONFIG_NET_EMACRAM_SIZE +#define LPC17_EMACRAM_SIZE CONFIG_LPC17_EMACRAM_SIZE /* Descriptor Memory Layout *********************************************************/ /* EMAC DMA RAM and descriptor definitions. The configured number of descriptors * will determine the organization and the size of the descriptor and status tables. * There is a complex interaction between the maximum packet size (CONFIG_NET_ETH_MTU) - * and the number of Rx and Tx descriptors that can be supported (CONFIG_NET_NRXDESC - * and CONFIG_NET_NTXDESC): Small buffers -> more packets. This is something that + * and the number of Rx and Tx descriptors that can be supported (CONFIG_LPC17_ETH_NRXDESC + * and CONFIG_LPC17_ETH_NTXDESC): Small buffers -> more packets. This is something that * needs to be tuned for you system. * * For a 16Kb SRAM region, here is the relationship: @@ -138,12 +138,12 @@ * 15,756 is not well aligned.). */ -#define LPC17_TXDESCTAB_SIZE (CONFIG_NET_NTXDESC*LPC17_TXDESC_SIZE) -#define LPC17_TXSTATTAB_SIZE (CONFIG_NET_NTXDESC*LPC17_TXSTAT_SIZE) +#define LPC17_TXDESCTAB_SIZE (CONFIG_LPC17_ETH_NTXDESC*LPC17_TXDESC_SIZE) +#define LPC17_TXSTATTAB_SIZE (CONFIG_LPC17_ETH_NTXDESC*LPC17_TXSTAT_SIZE) #define LPC17_TXTAB_SIZE (LPC17_TXDESCTAB_SIZE+LPC17_TXSTATTAB_SIZE) -#define LPC17_RXDESCTAB_SIZE (CONFIG_NET_NRXDESC*LPC17_RXDESC_SIZE) -#define LPC17_RXSTATTAB_SIZE (CONFIG_NET_NRXDESC*LPC17_RXSTAT_SIZE) +#define LPC17_RXDESCTAB_SIZE (CONFIG_LPC17_ETH_NRXDESC*LPC17_RXDESC_SIZE) +#define LPC17_RXSTATTAB_SIZE (CONFIG_LPC17_ETH_NRXDESC*LPC17_RXSTAT_SIZE) #define LPC17_RXTAB_SIZE (LPC17_RXDESCTAB_SIZE+LPC17_RXSTATTAB_SIZE) #define LPC17_DESCTAB_SIZE (LPC17_TXTAB_SIZE+LPC17_RXTAB_SIZE) @@ -169,8 +169,8 @@ #define LPC17_PKTMEM_END (LPC17_EMACRAM_BASE+LPC17_PKTMEM_SIZE) #define LPC17_MAXPACKET_SIZE ((CONFIG_NET_ETH_MTU + CONFIG_NET_GUARDSIZE + 3) & ~3) -#define LPC17_NTXPKTS CONFIG_NET_NTXDESC -#define LPC17_NRXPKTS CONFIG_NET_NRXDESC +#define LPC17_NTXPKTS CONFIG_LPC17_ETH_NTXDESC +#define LPC17_NRXPKTS CONFIG_LPC17_ETH_NRXDESC #define LPC17_TXBUFFER_SIZE (LPC17_NTXPKTS * LPC17_MAXPACKET_SIZE) #define LPC17_RXBUFFER_SIZE (LPC17_NRXPKTS * LPC17_MAXPACKET_SIZE) diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 1cfe22d28aa..3d6800cb7bd 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -130,8 +130,8 @@ * interrupt priority to the default. */ -#ifndef CONFIG_NET_PRIORITY -# define CONFIG_NET_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT +#ifndef CONFIG_LPC17_ETH_PRIORITY +# define CONFIG_LPC17_ETH_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT #endif #define PKTBUF_SIZE (MAX_NET_DEV_MTU + CONFIG_NET_GUARDSIZE) @@ -229,14 +229,14 @@ #define LPC17_100BASET_HD (LPC17_SPEED_100 | LPC17_DUPLEX_HALF) #define LPC17_100BASET_FD (LPC17_SPEED_100 | LPC17_DUPLEX_FULL) -#ifdef CONFIG_PHY_SPEED100 -# ifdef CONFIG_PHY_FDUPLEX +#ifdef CONFIG_LPC17_PHY_SPEED100 +# ifdef CONFIG_LPC17_PHY_FDUPLEX # define LPC17_MODE_DEFLT LPC17_100BASET_FD # else # define LPC17_MODE_DEFLT LPC17_100BASET_HD # endif #else -# ifdef CONFIG_PHY_FDUPLEX +# ifdef CONFIG_LPC17_PHY_FDUPLEX # define LPC17_MODE_DEFLT LPC17_10BASET_FD # else # define LPC17_MODE_DEFLT LPC17_10BASET_HD @@ -385,7 +385,7 @@ static void lpc17_phywrite(uint8_t phyaddr, uint8_t regaddr, uint16_t phydata); static uint16_t lpc17_phyread(uint8_t phyaddr, uint8_t regaddr); static inline int lpc17_phyreset(uint8_t phyaddr); -# ifdef CONFIG_PHY_AUTONEG +# ifdef CONFIG_LPC17_PHY_AUTONEG static inline int lpc17_phyautoneg(uint8_t phyaddr); # endif static int lpc17_phymode(uint8_t phyaddr, uint8_t mode); @@ -554,7 +554,7 @@ static int lpc17_txdesc(struct lpc17_driver_s *priv) /* Get the next producer index */ prodidx = lpc17_getreg(LPC17_ETH_TXPRODIDX) & ETH_TXPRODIDX_MASK; - if (++prodidx >= CONFIG_NET_NTXDESC) + if (++prodidx >= CONFIG_LPC17_ETH_NTXDESC) { /* Wrap back to index zero */ @@ -637,7 +637,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv) /* Bump the producer index, making the packet available for transmission. */ - if (++prodidx >= CONFIG_NET_NTXDESC) + if (++prodidx >= CONFIG_LPC17_ETH_NTXDESC) { /* Wrap back to index zero */ @@ -1025,7 +1025,7 @@ static void lpc17_rxdone_work(FAR void *arg) * might also have gotten bumped up by the hardware). */ - if (++considx >= CONFIG_NET_NRXDESC) + if (++considx >= CONFIG_LPC17_ETH_NRXDESC) { /* Wrap back to index zero */ @@ -1146,7 +1146,7 @@ static int lpc17_interrupt(int irq, void *context, FAR void *arg) /* Handle each pending interrupt **************************************/ /* Check for Wake-Up on Lan *******************************************/ -#ifdef CONFIG_NET_WOL +#ifdef CONFIG_LPC17_ETH_WOL if ((status & ETH_INT_WKUP) != 0) { # warning "Missing logic" @@ -1636,7 +1636,7 @@ static int lpc17_ifup(struct net_driver_s *dev) #ifdef CONFIG_LPC17_MULTICAST regval |= (ETH_RXFLCTRL_MCASTEN | ETH_RXFLCTRL_UCASTEN); #endif -#ifdef CONFIG_NET_HASH +#ifdef CONFIG_LPC17_ETH_HASH regval |= (ETH_RXFLCTRL_MCASTHASHEN | ETH_RXFLCTRL_UCASTHASHEN); #endif lpc17_putreg(regval, LPC17_ETH_RXFLCTRL); @@ -1654,9 +1654,9 @@ static int lpc17_ifup(struct net_driver_s *dev) #ifdef CONFIG_ARCH_IRQPRIO #if CONFIG_LPC17_NINTERFACES > 1 - (void)up_prioritize_irq(priv->irq, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(priv->irq, CONFIG_LPC17_ETH_PRIORITY); #else - (void)up_prioritize_irq(LPC17_IRQ_ETH, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(LPC17_IRQ_ETH, CONFIG_LPC17_ETH_PRIORITY); #endif #endif @@ -1664,7 +1664,7 @@ static int lpc17_ifup(struct net_driver_s *dev) * not Wakeup on Lan (WoL) has been configured. */ -#ifdef CONFIG_NET_WOL +#ifdef CONFIG_LPC17_ETH_WOL /* Configure WoL: Clear all receive filter WoLs and enable the perfect * match WoL interrupt. We will wait until the Wake-up to finish * bringing things up. @@ -2300,7 +2300,7 @@ static inline int lpc17_phyreset(uint8_t phyaddr) * ****************************************************************************/ -#if defined(LPC17_HAVE_PHY) && defined(CONFIG_PHY_AUTONEG) +#if defined(LPC17_HAVE_PHY) && defined(CONFIG_LPC17_PHY_AUTONEG) static inline int lpc17_phyautoneg(uint8_t phyaddr) { int32_t timeout; @@ -2521,7 +2521,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) /* Are we configured to do auto-negotiation? */ -#ifdef CONFIG_PHY_AUTONEG +#ifdef CONFIG_LPC17_PHY_AUTONEG /* Setup the Auto-negotiation advertisement: 100 or 10, and HD or FD */ lpc17_phywrite(phyaddr, MII_ADVERTISE, @@ -2695,7 +2695,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) * (probably more than little redundant). * * REVISIT: Revisit the following CONFIG_PHY_CEMENT_DISABLE work-around. - * It is should not needed if CONFIG_PHY_AUTONEG is defined and is known + * It is should not needed if CONFIG_LPC17_PHY_AUTONEG is defined and is known * cause a problem for at least one PHY (DP83848I PHY). It might be * safe just to remove this elided coded for all PHYs. */ @@ -2743,14 +2743,14 @@ static inline void lpc17_txdescinit(struct lpc17_driver_s *priv) lpc17_putreg(LPC17_TXDESC_BASE, LPC17_ETH_TXDESC); lpc17_putreg(LPC17_TXSTAT_BASE, LPC17_ETH_TXSTAT); - lpc17_putreg(CONFIG_NET_NTXDESC-1, LPC17_ETH_TXDESCRNO); + lpc17_putreg(CONFIG_LPC17_ETH_NTXDESC-1, LPC17_ETH_TXDESCRNO); /* Initialize Tx descriptors and link to packet buffers */ txdesc = (uint32_t *)LPC17_TXDESC_BASE; pktaddr = LPC17_TXBUFFER_BASE; - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_LPC17_ETH_NTXDESC; i++) { *txdesc++ = pktaddr; *txdesc++ = (TXDESC_CONTROL_INT | (LPC17_MAXPACKET_SIZE - 1)); @@ -2760,7 +2760,7 @@ static inline void lpc17_txdescinit(struct lpc17_driver_s *priv) /* Initialize Tx status */ txstat = (uint32_t *)LPC17_TXSTAT_BASE; - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_LPC17_ETH_NTXDESC; i++) { *txstat++ = 0; } @@ -2799,14 +2799,14 @@ static inline void lpc17_rxdescinit(struct lpc17_driver_s *priv) lpc17_putreg(LPC17_RXDESC_BASE, LPC17_ETH_RXDESC); lpc17_putreg(LPC17_RXSTAT_BASE, LPC17_ETH_RXSTAT); - lpc17_putreg(CONFIG_NET_NRXDESC-1, LPC17_ETH_RXDESCNO); + lpc17_putreg(CONFIG_LPC17_ETH_NRXDESC-1, LPC17_ETH_RXDESCNO); /* Initialize Rx descriptors and link to packet buffers */ rxdesc = (uint32_t *)LPC17_RXDESC_BASE; pktaddr = LPC17_RXBUFFER_BASE; - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_LPC17_ETH_NRXDESC; i++) { *rxdesc++ = pktaddr; *rxdesc++ = (RXDESC_CONTROL_INT | (LPC17_MAXPACKET_SIZE - 1)); @@ -2816,7 +2816,7 @@ static inline void lpc17_rxdescinit(struct lpc17_driver_s *priv) /* Initialize Rx status */ rxstat = (uint32_t *)LPC17_RXSTAT_BASE; - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_LPC17_ETH_NRXDESC; i++) { *rxstat++ = 0; *rxstat++ = 0; diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig index 52dd7745667..f10c7eba38a 100644 --- a/arch/mips/src/pic32mx/Kconfig +++ b/arch/mips/src/pic32mx/Kconfig @@ -1045,62 +1045,48 @@ endmenu # SPI Driver Configuration menu "PIC32MX PHY/Ethernet device driver settings" depends on PIC32MX_ETHERNET -config PHY_AUTONEG +config PIC32MX_PHY_AUTONEG bool "Auto-negotion" default y depends on PIC32MX_ETHERNET ---help--- Enable auto-negotion -config PHY_SPEED100 +config PIC32MX_PHY_SPEED100 bool "100Mbps spped" default n - depends on PIC32MX_ETHERNET && !PHY_AUTONEG + depends on PIC32MX_ETHERNET && !PIC32MX_PHY_AUTONEG ---help--- Select 100Mbit vs. 10Mbit speed. -config PHY_FDUPLEX +config PIC32MX_PHY_FDUPLEX bool "Full duplex" default n - depends on PIC32MX_ETHERNET && !PHY_AUTONEG + depends on PIC32MX_ETHERNET && !PIC32MX_PHY_AUTONEG ---help--- Select full (vs. half) duplex -config NET_NTXDESC +config PIC32MX_ETH_NTXDESC int "Number Tx descriptors" default 2 depends on PIC32MX_ETHERNET ---help--- Configured number of Tx descriptors. Default: 2 -config NET_NRXDESC +config PIC32MX_ETH_NRXDESC int "Number Rx descriptors" default 4 depends on PIC32MX_ETHERNET ---help--- Configured number of Rx descriptors. Default: 4 -config NET_PRIORITY +config PIC32MX_ETH_PRIORITY int "" default 28 depends on PIC32MX_ETHERNET ---help--- Ethernet interrupt priority. The is default is the higest priority. -config NET_WOL - bool "Wake-up on LAN" - default n - depends on PIC32MX_ETHERNET - ---help--- - Enable Wake-up on LAN (not fully implemented). - -config NET_HASH - bool "Hash" - default n - depends on PIC32MX_ETHERNET - ---help--- - Enable receipt of near-perfect match frames. - config PIC32MX_MULTICAST bool "Multicast" default y if NET_IGMP diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 231cb884fc0..2f5fa307799 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -130,16 +130,16 @@ /* Use defaults if the number of discriptors is not provided */ -#ifndef CONFIG_NET_NTXDESC -# define CONFIG_NET_NTXDESC 2 +#ifndef CONFIG_PIC32MX_ETH_NTXDESC +# define CONFIG_PIC32MX_ETH_NTXDESC 2 #endif -#if CONFIG_NET_NTXDESC > 255 +#if CONFIG_PIC32MX_ETH_NTXDESC > 255 # error "The number of TX descriptors exceeds the range of a uint8_t index" #endif -#ifndef CONFIG_NET_NRXDESC -# define CONFIG_NET_NRXDESC 4 +#ifndef CONFIG_PIC32MX_ETH_NRXDESC +# define CONFIG_PIC32MX_ETH_NRXDESC 4 #endif /* Make sure that the size of each buffer is a multiple of 4 bytes. This @@ -152,7 +152,7 @@ /* The number of buffers will, then, be one for each descriptor plus one extra */ -#define PIC32MX_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1) +#define PIC32MX_NBUFFERS (CONFIG_PIC32MX_ETH_NRXDESC + CONFIG_PIC32MX_ETH_NTXDESC + 1) /* Debug Configuration *****************************************************/ /* CONFIG_NET_DUMPPACKET will dump the contents of each packet to the @@ -261,14 +261,14 @@ #define PIC32MX_100BASET_HD (PIC32MX_SPEED_100 | PIC32MX_DUPLEX_HALF) #define PIC32MX_100BASET_FD (PIC32MX_SPEED_100 | PIC32MX_DUPLEX_FULL) -#ifdef CONFIG_PHY_SPEED100 -# ifdef CONFIG_PHY_FDUPLEX +#ifdef CONFIG_PIC32MX_PHY_SPEED100 +# ifdef CONFIG_PIC32MX_PHY_FDUPLEX # define PIC32MX_MODE_DEFLT PIC32MX_100BASET_FD # else # define PIC32MX_MODE_DEFLT PIC32MX_100BASET_HD # endif #else -# ifdef CONFIG_PHY_FDUPLEX +# ifdef CONFIG_PIC32MX_PHY_FDUPLEX # define PIC32MX_MODE_DEFLT PIC32MX_10BASET_FD # else # define PIC32MX_MODE_DEFLT PIC32MX_10BASET_HD @@ -332,8 +332,8 @@ struct pic32mx_driver_s /* Descriptors and packet buffers */ - struct pic32mx_rxdesc_s pd_rxdesc[CONFIG_NET_NRXDESC]; - struct pic32mx_txdesc_s pd_txdesc[CONFIG_NET_NTXDESC]; + struct pic32mx_rxdesc_s pd_rxdesc[CONFIG_PIC32MX_ETH_NRXDESC]; + struct pic32mx_txdesc_s pd_txdesc[CONFIG_PIC32MX_ETH_NTXDESC]; uint8_t pd_buffers[PIC32MX_NBUFFERS * PIC32MX_ALIGNED_BUFSIZE]; }; @@ -433,7 +433,7 @@ static void pic32mx_phywrite(uint8_t phyaddr, uint8_t regaddr, uint16_t phydata); static uint16_t pic32mx_phyread(uint8_t phyaddr, uint8_t regaddr); static inline int pic32mx_phyreset(uint8_t phyaddr); -# ifdef CONFIG_PHY_AUTONEG +# ifdef CONFIG_PIC32MX_PHY_AUTONEG static inline int pic32mx_phyautoneg(uint8_t phyaddr); # endif static int pic32mx_phymode(uint8_t phyaddr, uint8_t mode); @@ -725,7 +725,7 @@ static inline void pic32mx_txdescinit(struct pic32mx_driver_s *priv) * descriptor as owned by softare andnot linked. */ - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_PIC32MX_ETH_NTXDESC; i++) { /* Point to the next entry */ @@ -745,7 +745,7 @@ static inline void pic32mx_txdescinit(struct pic32mx_driver_s *priv) * creating a ring. */ - if (i == (CONFIG_NET_NRXDESC-1)) + if (i == (CONFIG_PIC32MX_ETH_NRXDESC-1)) { txdesc->nexted = PHYS_ADDR(priv->pd_txdesc); } @@ -796,7 +796,7 @@ static inline void pic32mx_rxdescinit(struct pic32mx_driver_s *priv) * corresponding RX buffer. */ - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_PIC32MX_ETH_NRXDESC; i++) { /* Point to the next entry */ @@ -816,7 +816,7 @@ static inline void pic32mx_rxdescinit(struct pic32mx_driver_s *priv) * creating a ring. */ - if (i == (CONFIG_NET_NRXDESC-1)) + if (i == (CONFIG_PIC32MX_ETH_NRXDESC-1)) { rxdesc->nexted = PHYS_ADDR(priv->pd_rxdesc); } @@ -908,7 +908,7 @@ static inline void pic32mx_txnext(struct pic32mx_driver_s *priv) * for the Tx ring, then reset to first descriptor. */ - if (txnext >= CONFIG_NET_NTXDESC) + if (txnext >= CONFIG_PIC32MX_ETH_NTXDESC) { txnext = 0; } @@ -972,7 +972,7 @@ static struct pic32mx_rxdesc_s *pic32mx_rxdesc(struct pic32mx_driver_s *priv) * RSV and PKT_CHECKSUM to get the message characteristics. */ - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_PIC32MX_ETH_NRXDESC; i++) { /* Check if software owns this descriptor */ @@ -1607,7 +1607,7 @@ static void pic32mx_txdone(struct pic32mx_driver_s *priv) * transmitted. Use TSV to check for the transmission result. */ - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_PIC32MX_ETH_NTXDESC; i++) { txdesc = &priv->pd_txdesc[i]; @@ -2321,11 +2321,11 @@ static int pic32mx_ifup(struct net_driver_s *dev) * priority */ -#if defined(CONFIG_NET_PRIORITY) && defined(CONFIG_ARCH_IRQPRIO) +#if defined(CONFIG_PIC32MX_ETH_PRIORITY) && defined(CONFIG_ARCH_IRQPRIO) #if CONFIG_PIC32MX_NINTERFACES > 1 - (void)up_prioritize_irq(priv->pd_irq, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(priv->pd_irq, CONFIG_PIC32MX_ETH_PRIORITY); #else - (void)up_prioritize_irq(PIC32MX_IRQ_ETH, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(PIC32MX_IRQ_ETH, CONFIG_PIC32MX_ETH_PRIORITY); #endif #endif @@ -2747,7 +2747,7 @@ static inline int pic32mx_phyreset(uint8_t phyaddr) * ****************************************************************************/ -#if defined(PIC32MX_HAVE_PHY) && defined(CONFIG_PHY_AUTONEG) +#if defined(PIC32MX_HAVE_PHY) && defined(CONFIG_PIC32MX_PHY_AUTONEG) static inline int pic32mx_phyautoneg(uint8_t phyaddr) { int32_t timeout; @@ -3003,7 +3003,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) * specific register). */ -#ifdef CONFIG_PHY_AUTONEG +#ifdef CONFIG_PIC32MX_PHY_AUTONEG /* Setup the Auto-negotiation advertisement: 100 or 10, and HD or FD */ pic32mx_phywrite(phyaddr, MII_ADVERTISE, diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig index 47d17eaebb2..c65fdaf3544 100644 --- a/arch/mips/src/pic32mz/Kconfig +++ b/arch/mips/src/pic32mz/Kconfig @@ -372,62 +372,48 @@ config PIC32MZ_T1_SOSC menu "PIC32MZ PHY/Ethernet device driver settings" depends on PIC32MZ_ETHERNET -config PHY_AUTONEG +config PIC32MZ_PHY_AUTONEG bool "Auto-negotiation" default y depends on PIC32MZ_ETHERNET ---help--- Enable auto-negotiation -config PHY_SPEED100 +config PIC32MZ_PHY_SPEED100 bool "100Mbps speed" default n - depends on PIC32MZ_ETHERNET && !PHY_AUTONEG + depends on PIC32MZ_ETHERNET && !PIC32MZ_PHY_AUTONEG ---help--- Select 100Mbit vs. 10Mbit speed. -config PHY_FDUPLEX +config PIC32MZ_PHY_FDUPLEX bool "Full duplex" default n - depends on PIC32MZ_ETHERNET && !PHY_AUTONEG + depends on PIC32MZ_ETHERNET && !PIC32MZ_PHY_AUTONEG ---help--- Select full (vs. half) duplex -config NET_NTXDESC +config PIC32MZ_ETH_NTXDESC int "Number Tx descriptors" default 2 depends on PIC32MZ_ETHERNET ---help--- Configured number of Tx descriptors. Default: 2 -config NET_NRXDESC +config PIC32MZ_ETH_NRXDESC int "Number Rx descriptors" default 4 depends on PIC32MZ_ETHERNET ---help--- Configured number of Rx descriptors. Default: 4 -config NET_PRIORITY +config PIC32MZ_ETH_PRIORITY int "" default 28 depends on PIC32MZ_ETHERNET ---help--- Ethernet interrupt priority. The is default is the higest priority. -config NET_WOL - bool "Wake-up on LAN" - default n - depends on PIC32MZ_ETHERNET - ---help--- - Enable Wake-up on LAN (not fully implemented). - -config NET_HASH - bool "Hash" - default n - depends on PIC32MZ_ETHERNET - ---help--- - Enable receipt of near-perfect match frames. - config PIC32MZ_MULTICAST bool "Multicast" default y if NET_IGMP diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 3437459fbb4..15b03137ffe 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -130,16 +130,16 @@ /* Use defaults if the number of discriptors is not provided */ -#ifndef CONFIG_NET_NTXDESC -# define CONFIG_NET_NTXDESC 2 +#ifndef CONFIG_PIC32MZ_ETH_NTXDESC +# define CONFIG_PIC32MZ_ETH_NTXDESC 2 #endif -#if CONFIG_NET_NTXDESC > 255 +#if CONFIG_PIC32MZ_ETH_NTXDESC > 255 # error "The number of TX descriptors exceeds the range of a uint8_t index" #endif -#ifndef CONFIG_NET_NRXDESC -# define CONFIG_NET_NRXDESC 4 +#ifndef CONFIG_PIC32MZ_ETH_NRXDESC +# define CONFIG_PIC32MZ_ETH_NRXDESC 4 #endif /* Make sure that the size of each buffer is a multiple of 4 bytes. This @@ -152,7 +152,7 @@ /* The number of buffers will, then, be one for each descriptor plus one extra */ -#define PIC32MZ_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1) +#define PIC32MZ_NBUFFERS (CONFIG_PIC32MZ_ETH_NRXDESC + CONFIG_PIC32MZ_ETH_NTXDESC + 1) /* Debug Configuration *****************************************************/ /* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected. @@ -288,14 +288,14 @@ #define PIC32MZ_100BASET_HD (PIC32MZ_SPEED_100 | PIC32MZ_DUPLEX_HALF) #define PIC32MZ_100BASET_FD (PIC32MZ_SPEED_100 | PIC32MZ_DUPLEX_FULL) -#ifdef CONFIG_PHY_SPEED100 -# ifdef CONFIG_PHY_FDUPLEX +#ifdef CONFIG_PIC32MZ_PHY_SPEED100 +# ifdef CONFIG_PIC32MZ_PHY_FDUPLEX # define PIC32MZ_MODE_DEFLT PIC32MZ_100BASET_FD # else # define PIC32MZ_MODE_DEFLT PIC32MZ_100BASET_HD # endif #else -# ifdef CONFIG_PHY_FDUPLEX +# ifdef CONFIG_PIC32MZ_PHY_FDUPLEX # define PIC32MZ_MODE_DEFLT PIC32MZ_10BASET_FD # else # define PIC32MZ_MODE_DEFLT PIC32MZ_10BASET_HD @@ -359,8 +359,8 @@ struct pic32mz_driver_s /* Descriptors and packet buffers */ - struct pic32mz_rxdesc_s pd_rxdesc[CONFIG_NET_NRXDESC]; - struct pic32mz_txdesc_s pd_txdesc[CONFIG_NET_NTXDESC]; + struct pic32mz_rxdesc_s pd_rxdesc[CONFIG_PIC32MZ_ETH_NRXDESC]; + struct pic32mz_txdesc_s pd_txdesc[CONFIG_PIC32MZ_ETH_NTXDESC]; uint8_t pd_buffers[PIC32MZ_NBUFFERS * PIC32MZ_ALIGNED_BUFSIZE]; }; @@ -460,7 +460,7 @@ static void pic32mz_phywrite(uint8_t phyaddr, uint8_t regaddr, uint16_t phydata); static uint16_t pic32mz_phyread(uint8_t phyaddr, uint8_t regaddr); static inline int pic32mz_phyreset(uint8_t phyaddr); -# ifdef CONFIG_PHY_AUTONEG +# ifdef CONFIG_PIC32MZ_PHY_AUTONEG static inline int pic32mz_phyautoneg(uint8_t phyaddr); # endif static int pic32mz_phymode(uint8_t phyaddr, uint8_t mode); @@ -752,7 +752,7 @@ static inline void pic32mz_txdescinit(struct pic32mz_driver_s *priv) * descriptor as owned by softare andnot linked. */ - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_PIC32MZ_ETH_NTXDESC; i++) { /* Point to the next entry */ @@ -772,7 +772,7 @@ static inline void pic32mz_txdescinit(struct pic32mz_driver_s *priv) * creating a ring. */ - if (i == (CONFIG_NET_NRXDESC-1)) + if (i == (CONFIG_PIC32MZ_ETH_NRXDESC-1)) { txdesc->nexted = PHYS_ADDR(priv->pd_txdesc); } @@ -823,7 +823,7 @@ static inline void pic32mz_rxdescinit(struct pic32mz_driver_s *priv) * corresponding RX buffer. */ - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_PIC32MZ_ETH_NRXDESC; i++) { /* Point to the next entry */ @@ -843,7 +843,7 @@ static inline void pic32mz_rxdescinit(struct pic32mz_driver_s *priv) * creating a ring. */ - if (i == (CONFIG_NET_NRXDESC-1)) + if (i == (CONFIG_PIC32MZ_ETH_NRXDESC-1)) { rxdesc->nexted = PHYS_ADDR(priv->pd_rxdesc); } @@ -935,7 +935,7 @@ static inline void pic32mz_txnext(struct pic32mz_driver_s *priv) * for the Tx ring, then reset to first descriptor. */ - if (txnext >= CONFIG_NET_NTXDESC) + if (txnext >= CONFIG_PIC32MZ_ETH_NTXDESC) { txnext = 0; } @@ -999,7 +999,7 @@ static struct pic32mz_rxdesc_s *pic32mz_rxdesc(struct pic32mz_driver_s *priv) * RSV and PKT_CHECKSUM to get the message characteristics. */ - for (i = 0; i < CONFIG_NET_NRXDESC; i++) + for (i = 0; i < CONFIG_PIC32MZ_ETH_NRXDESC; i++) { /* Check if software owns this descriptor */ @@ -1634,7 +1634,7 @@ static void pic32mz_txdone(struct pic32mz_driver_s *priv) * transmitted. Use TSV to check for the transmission result. */ - for (i = 0; i < CONFIG_NET_NTXDESC; i++) + for (i = 0; i < CONFIG_PIC32MZ_ETH_NTXDESC; i++) { txdesc = &priv->pd_txdesc[i]; @@ -2353,11 +2353,11 @@ static int pic32mz_ifup(struct net_driver_s *dev) * priority */ -#if defined(CONFIG_NET_PRIORITY) && defined(CONFIG_ARCH_IRQPRIO) +#if defined(CONFIG_PIC32MZ_ETH_PRIORITY) && defined(CONFIG_ARCH_IRQPRIO) #if CONFIG_PIC32MZ_NINTERFACES > 1 - (void)up_prioritize_irq(priv->pd_irq, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(priv->pd_irq, CONFIG_PIC32MZ_ETH_PRIORITY); #else - (void)up_prioritize_irq(PIC32MZ_IRQ_ETH, CONFIG_NET_PRIORITY); + (void)up_prioritize_irq(PIC32MZ_IRQ_ETH, CONFIG_PIC32MZ_ETH_PRIORITY); #endif #endif @@ -2780,7 +2780,7 @@ static inline int pic32mz_phyreset(uint8_t phyaddr) * ****************************************************************************/ -#if defined(PIC32MZ_HAVE_PHY) && defined(CONFIG_PHY_AUTONEG) +#if defined(PIC32MZ_HAVE_PHY) && defined(CONFIG_PIC32MZ_PHY_AUTONEG) static inline int pic32mz_phyautoneg(uint8_t phyaddr) { int32_t timeout; @@ -3038,7 +3038,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv) * specific register). */ -#ifdef CONFIG_PHY_AUTONEG +#ifdef CONFIG_PIC32MZ_PHY_AUTONEG /* Setup the Auto-negotiation advertisement: 100 or 10, and HD or FD */ pic32mz_phywrite(phyaddr, MII_ADVERTISE, diff --git a/configs/bambino-200e/README.txt b/configs/bambino-200e/README.txt index 92f198b1640..05b8649e684 100644 --- a/configs/bambino-200e/README.txt +++ b/configs/bambino-200e/README.txt @@ -311,19 +311,15 @@ Bambino-200e Configuration Options also require CONFIG_NET and CONFIG_LPC43_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC43_AUTONEG - Enable auto-negotion - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC43_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC43_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. LPC43xx USB Device Configuration diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt index 692961d439f..0ee1aa6fcf1 100644 --- a/configs/lincoln60/README.txt +++ b/configs/lincoln60/README.txt @@ -188,19 +188,19 @@ Lincoln 60 Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig index 1d0e0d0c95d..0c69865d7a4 100644 --- a/configs/lincoln60/netnsh/defconfig +++ b/configs/lincoln60/netnsh/defconfig @@ -13,7 +13,11 @@ CONFIG_ETH0_PHY_KSZ8041=y CONFIG_EXAMPLES_NSH=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP0=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 @@ -28,12 +32,9 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -48,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig index 1844d544d6f..24133bb0a52 100644 --- a/configs/lincoln60/thttpd-binfs/defconfig +++ b/configs/lincoln60/thttpd-binfs/defconfig @@ -21,7 +21,11 @@ CONFIG_FS_UNIONFS=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 +CONFIG_LPC17_EMACRAM_SIZE=9696 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=8 +CONFIG_LPC17_ETH_NTXDESC=8 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -30,13 +34,10 @@ CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y CONFIG_NET_ARP_SEND=y -CONFIG_NET_EMACRAM_SIZE=9696 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_NACTIVESOCKETS=12 -CONFIG_NET_NRXDESC=8 -CONFIG_NET_NTXDESC=8 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y @@ -46,7 +47,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=12 CONFIG_NUNGET_CHARS=0 -CONFIG_PHY_AUTONEG=y CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt index fcd94ce07fd..83ed051736d 100644 --- a/configs/lpc4330-xplorer/README.txt +++ b/configs/lpc4330-xplorer/README.txt @@ -563,19 +563,15 @@ LPC4330-Xplorer Configuration Options also require CONFIG_NET and CONFIG_LPC43_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC43_AUTONEG - Enable auto-negotion - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC43_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC43_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. LPC43xx USB Device Configuration diff --git a/configs/lpc4337-ws/README.txt b/configs/lpc4337-ws/README.txt index 2798879c15e..a66c36bdffa 100644 --- a/configs/lpc4337-ws/README.txt +++ b/configs/lpc4337-ws/README.txt @@ -602,19 +602,15 @@ LPC4337-ws Configuration Options also require CONFIG_NET and CONFIG_LPC43_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC43__AUTONEG - Enable auto-negotion - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC43_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC43_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. LPC43xx USB Device Configuration diff --git a/configs/lpc4357-evb/README.txt b/configs/lpc4357-evb/README.txt index 4110351802f..bb229870efc 100644 --- a/configs/lpc4357-evb/README.txt +++ b/configs/lpc4357-evb/README.txt @@ -599,19 +599,15 @@ LPC4357-EVB Configuration Options also require CONFIG_NET and CONFIG_LPC43_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC43_AUTONEG - Enable auto-negotion - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC43_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC43_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. LPC43xx USB Device Configuration diff --git a/configs/lpc4370-link2/README.txt b/configs/lpc4370-link2/README.txt index 4e8c235af35..9ff62ccf016 100644 --- a/configs/lpc4370-link2/README.txt +++ b/configs/lpc4370-link2/README.txt @@ -602,19 +602,15 @@ LPC4370-Link2 Configuration Options also require CONFIG_NET and CONFIG_LPC43_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC43_AUTONEG - Enable auto-negotion - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC43_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC43_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. LPC43xx USB Device Configuration diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt index d64e33e188b..e0a2a966ced 100644 --- a/configs/lpcxpresso-lpc1768/README.txt +++ b/configs/lpcxpresso-lpc1768/README.txt @@ -506,19 +506,19 @@ LPCXpresso Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig index b2f5341bed3..b8423e8cf90 100644 --- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -17,7 +17,9 @@ CONFIG_EXAMPLES_DHCPD=y CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001 CONFIG_EXAMPLES_DHCPD_NOMAC=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=15776 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART3=y CONFIG_MAX_TASKS=8 CONFIG_MM_REGIONS=2 @@ -25,7 +27,6 @@ CONFIG_NET=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_NETLIB=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=15776 CONFIG_NET_ICMP=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_UDP=y @@ -33,7 +34,6 @@ CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig index 1432886bfa2..b75f03d1a3a 100644 --- a/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -16,7 +16,11 @@ CONFIG_ETH0_PHY_LAN8720=y CONFIG_EXAMPLES_NSH=y CONFIG_FS_FAT=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP1=y CONFIG_LPC17_UART3=y CONFIG_MAX_TASKS=16 @@ -32,12 +36,9 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -51,7 +52,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig index ad6b8f245b5..ab7df3e6924 100644 --- a/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -15,7 +15,9 @@ CONFIG_EXAMPLES_THTTPD=y CONFIG_EXAMPLES_THTTPD_NOMAC=y CONFIG_FS_ROMFS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=15776 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART3=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -23,7 +25,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y -CONFIG_NET_EMACRAM_SIZE=15776 CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y @@ -35,7 +36,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt index c2e090a04bd..2c04127db03 100644 --- a/configs/mbed/README.txt +++ b/configs/mbed/README.txt @@ -151,19 +151,19 @@ mbed Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/mcb1700/README.txt b/configs/mcb1700/README.txt index e6be4334c56..9d863f3c9e9 100644 --- a/configs/mcb1700/README.txt +++ b/configs/mcb1700/README.txt @@ -152,19 +152,19 @@ mcb1700 Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt index 20fadeb03d8..9b460d4b57f 100644 --- a/configs/olimex-lpc1766stk/README.txt +++ b/configs/olimex-lpc1766stk/README.txt @@ -589,19 +589,19 @@ Olimex LPC1766-STK Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig index d4a6b133fe5..474921ead92 100644 --- a/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/configs/olimex-lpc1766stk/ftpc/defconfig @@ -18,7 +18,11 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=8512 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=7 +CONFIG_LPC17_ETH_NTXDESC=7 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP1=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 @@ -30,13 +34,10 @@ CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETUTILS_FTPC=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=8512 CONFIG_NET_ETH_TCP_RECVWNDO=550 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=7 -CONFIG_NET_NTXDESC=7 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y @@ -56,7 +57,6 @@ CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig index 2e947a68997..bbe4a08e82f 100644 --- a/configs/olimex-lpc1766stk/nettest/defconfig +++ b/configs/olimex-lpc1766stk/nettest/defconfig @@ -17,23 +17,23 @@ CONFIG_ETH0_PHY_KS8721=y CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=8 CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig index 1c787d0a551..41b01d63639 100644 --- a/configs/olimex-lpc1766stk/nsh/defconfig +++ b/configs/olimex-lpc1766stk/nsh/defconfig @@ -22,7 +22,11 @@ CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP1=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 @@ -38,12 +42,9 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_SPLIT=y @@ -59,7 +60,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig index 3d691dba300..bacaaddc4cc 100644 --- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig +++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig @@ -19,7 +19,9 @@ CONFIG_FS_ROMFS=y CONFIG_FS_UNIONFS=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=15776 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -27,7 +29,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y -CONFIG_NET_EMACRAM_SIZE=15776 CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y @@ -38,7 +39,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 -CONFIG_PHY_AUTONEG=y CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig index 2bce2b2d869..5d2fc7531dc 100644 --- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig +++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig @@ -15,7 +15,9 @@ CONFIG_EXAMPLES_THTTPD=y CONFIG_EXAMPLES_THTTPD_NOMAC=y CONFIG_FS_ROMFS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=15776 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -23,7 +25,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y -CONFIG_NET_EMACRAM_SIZE=15776 CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y @@ -35,7 +36,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig index 53700b780bd..7570d4e0bac 100644 --- a/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/configs/olimex-lpc1766stk/zmodem/defconfig @@ -20,7 +20,11 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP1=y CONFIG_LPC17_UART0=y CONFIG_LPC17_UART1=y @@ -35,12 +39,9 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_SPLIT=y @@ -56,7 +57,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/pic32mx-starterkit/README.txt b/configs/pic32mx-starterkit/README.txt index eb75f17b6fc..fec4c0c7bc4 100644 --- a/configs/pic32mx-starterkit/README.txt +++ b/configs/pic32mx-starterkit/README.txt @@ -980,17 +980,15 @@ PIC32MX specific PHY/Ethernet device driver settings CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconductor DP83848C PHY CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 2 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_PIC32MX_PHY_AUTONEG - Enable auto-negotion + CONFIG_PIC32MX_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_PIC32MX_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_PIC32MX_ETH_NTXDESC - Configured number of Tx descriptors. Default: 2 + CONFIG_PIC32MX_ETH_NRXDESC - Configured number of Rx descriptors. Default: 4 CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig index 5072e9db3a1..ef5c5d04d7b 100644 --- a/configs/pic32mx-starterkit/nsh2/defconfig +++ b/configs/pic32mx-starterkit/nsh2/defconfig @@ -4,14 +4,14 @@ # CONFIG_NSH_CONSOLE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y +CONFIG_ARCH="mips" CONFIG_ARCH_BOARD="pic32mx-starterkit" -CONFIG_ARCH_CHIP_PIC32MX=y -CONFIG_ARCH_CHIP_PIC32MX7=y +CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y CONFIG_ARCH_CHIP_PIC32MX795F512L=y +CONFIG_ARCH_CHIP_PIC32MX7=y +CONFIG_ARCH_CHIP_PIC32MX=y CONFIG_ARCH_MIPS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="mips" CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y @@ -26,25 +26,23 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_NRXDESC=7 -CONFIG_NET_NTXDESC=7 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -55,16 +53,18 @@ CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_ETHERNET=y +CONFIG_PIC32MX_ETH_NRXDESC=7 +CONFIG_PIC32MX_ETH_NTXDESC=7 CONFIG_PIC32MX_FETHIO=0 CONFIG_PIC32MX_FMIIEN=0 CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 -CONFIG_RAM_SIZE=131072 -CONFIG_RAM_START=0xa0000000 +CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=16384 CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=131072 +CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y diff --git a/configs/pic32mx7mmb/README.txt b/configs/pic32mx7mmb/README.txt index 6f896131777..5843a39c9b5 100644 --- a/configs/pic32mx7mmb/README.txt +++ b/configs/pic32mx7mmb/README.txt @@ -562,17 +562,15 @@ PIC32MX specific PHY/Ethernet device driver settings CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconductor DP83848C PHY CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 2 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_PIC32MX_PHY_AUTONEG - Enable auto-negotion + CONFIG_PIC32MX_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_PIC32MX_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_PIC32MX_ETH_NTXDESC - Configured number of Tx descriptors. Default: 2 + CONFIG_PIC32MX_ETH_NRXDESC - Configured number of Rx descriptors. Default: 4 CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig index 497af6031d6..09d680b2942 100644 --- a/configs/pic32mx7mmb/nsh/defconfig +++ b/configs/pic32mx7mmb/nsh/defconfig @@ -3,14 +3,14 @@ # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_SPI_CALLBACK is not set # CONFIG_SPI_EXCHANGE is not set -CONFIG_ARCH_BOARD_PIC32MX7MMB=y +CONFIG_ARCH="mips" CONFIG_ARCH_BOARD="pic32mx7mmb" -CONFIG_ARCH_CHIP_PIC32MX=y -CONFIG_ARCH_CHIP_PIC32MX7=y +CONFIG_ARCH_BOARD_PIC32MX7MMB=y CONFIG_ARCH_CHIP_PIC32MX795F512L=y +CONFIG_ARCH_CHIP_PIC32MX7=y +CONFIG_ARCH_CHIP_PIC32MX=y CONFIG_ARCH_MIPS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="mips" CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_LAN8720=y @@ -25,28 +25,26 @@ CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y -CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_MMCSD=y +CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_NRXDESC=7 -CONFIG_NET_NTXDESC=7 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -59,6 +57,8 @@ CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_ETHERNET=y +CONFIG_PIC32MX_ETH_NRXDESC=7 +CONFIG_PIC32MX_ETH_NTXDESC=7 CONFIG_PIC32MX_FETHIO=0 CONFIG_PIC32MX_FMIIEN=0 CONFIG_PIC32MX_PMP=y @@ -83,6 +83,7 @@ CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_EPBULKIN=2 CONFIG_USBMSC_EPBULKOUT=1 @@ -91,6 +92,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig index 2bdda43fc82..825027cf4e9 100644 --- a/configs/u-blox-c027/nsh/defconfig +++ b/configs/u-blox-c027/nsh/defconfig @@ -30,9 +30,13 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR_SHORT=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 CONFIG_LPC17_I2C0=y CONFIG_LPC17_I2C1=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_LPC17_UART1=y CONFIG_LPC17_UART2=y @@ -55,13 +59,10 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_HOSTNAME="c027" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y @@ -83,7 +84,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_NSH_TELNET_LOGIN=y CONFIG_NSH_WGET_USERAGENT="NuttX/7.xx.x (; http://www.nuttx.org/)" -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt index 03366e076b5..0492df737c8 100644 --- a/configs/zkit-arm-1769/README.txt +++ b/configs/zkit-arm-1769/README.txt @@ -317,19 +317,19 @@ ZKit-ARM Configuration Options also require CONFIG_NET and CONFIG_LPC17_ETHERNET. CONFIG_ETH0_PHY_KS8721 - Selects Micrel KS8721 PHY - CONFIG_PHY_AUTONEG - Enable auto-negotion - CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. - CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex + CONFIG_LPC17_PHY_AUTONEG - Enable auto-negotion + CONFIG_LPC17_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. + CONFIG_LPC17_PHY_FDUPLEX - Select full (vs. half) duplex - CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb - CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18 - CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18 - CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented). + CONFIG_LPC17_EMACRAM_SIZE - Size of EMAC RAM. Default: 16Kb + CONFIG_LPC17_ETH_NTXDESC - Configured number of Tx descriptors. Default: 18 + CONFIG_LPC17_ETH_NRXDESC - Configured number of Rx descriptors. Default: 18 + CONFIG_LPC17_ETH_WOL - Enable Wake-up on Lan (not fully implemented). CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs CONFIG_DEBUG_FEATURES. CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets. Also needs CONFIG_DEBUG_FEATURES. - CONFIG_NET_HASH - Enable receipt of near-perfect match frames. + CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames. CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames. Automatically set if CONFIG_NET_IGMP is selected. diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig index b4aca772b15..92eb218b9f1 100644 --- a/configs/zkit-arm-1769/hello/defconfig +++ b/configs/zkit-arm-1769/hello/defconfig @@ -15,13 +15,14 @@ CONFIG_ETH0_PHY_DP83848C=y CONFIG_EXAMPLES_HELLO=y CONFIG_FS_ROMFS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=15776 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NET=y -CONFIG_NET_EMACRAM_SIZE=15776 CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y @@ -33,7 +34,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig index cfd35cc6435..e6c697d60d3 100644 --- a/configs/zkit-arm-1769/nsh/defconfig +++ b/configs/zkit-arm-1769/nsh/defconfig @@ -22,7 +22,11 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_INTELHEX_BINARY=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SPI=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 @@ -38,12 +42,9 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_SPLIT=y @@ -56,7 +57,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index 32f01af4b9c..329b1d1b829 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -28,7 +28,11 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=255 CONFIG_LCD_ST7567=y +CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=6 +CONFIG_LPC17_ETH_NTXDESC=6 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_SSP0=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 @@ -45,12 +49,9 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_BROADCAST=y -CONFIG_NET_EMACRAM_SIZE=7296 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=6 -CONFIG_NET_NTXDESC=6 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCP_SPLIT=y @@ -72,7 +73,6 @@ CONFIG_NXTK_BORDERCOLOR3=0 CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y -CONFIG_PHY_AUTONEG=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig index 52b266d328f..f67d826a28d 100644 --- a/configs/zkit-arm-1769/thttpd/defconfig +++ b/configs/zkit-arm-1769/thttpd/defconfig @@ -18,6 +18,9 @@ CONFIG_EXAMPLES_THTTPD_NOMAC=y CONFIG_FS_ROMFS=y CONFIG_INTELHEX_BINARY=y CONFIG_LPC17_ETHERNET=y +CONFIG_LPC17_ETH_NRXDESC=18 +CONFIG_LPC17_ETH_NTXDESC=18 +CONFIG_LPC17_PHY_AUTONEG=y CONFIG_LPC17_UART0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -27,8 +30,6 @@ CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_THTTPD=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_NRXDESC=18 -CONFIG_NET_NTXDESC=18 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y @@ -38,7 +39,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y -CONFIG_PHY_AUTONEG=y CONFIG_PIPES=y CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768