diff --git a/configs/b-l475e-iot01a/spirit-6lowpan/defconfig b/configs/b-l475e-iot01a/spirit-6lowpan/defconfig index 0c1bcf905d2..9857c3e2380 100644 --- a/configs/b-l475e-iot01a/spirit-6lowpan/defconfig +++ b/configs/b-l475e-iot01a/spirit-6lowpan/defconfig @@ -37,6 +37,7 @@ CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 CONFIG_LIBM=y +CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -48,7 +49,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="B-L475E-IOT01A" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/b-l475e-iot01a/spirit-starhub/defconfig b/configs/b-l475e-iot01a/spirit-starhub/defconfig index 52cd7f2a694..252eebd1eb6 100644 --- a/configs/b-l475e-iot01a/spirit-starhub/defconfig +++ b/configs/b-l475e-iot01a/spirit-starhub/defconfig @@ -26,6 +26,7 @@ CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 CONFIG_LIBM=y +CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -37,7 +38,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="B-L475E-IOT01A" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y diff --git a/configs/b-l475e-iot01a/spirit-starpoint/defconfig b/configs/b-l475e-iot01a/spirit-starpoint/defconfig index 3029bd1d3cf..f412e4ba60b 100644 --- a/configs/b-l475e-iot01a/spirit-starpoint/defconfig +++ b/configs/b-l475e-iot01a/spirit-starpoint/defconfig @@ -38,6 +38,7 @@ CONFIG_IOB_BUFSIZE=94 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 CONFIG_LIBM=y +CONFIG_LIB_HOSTNAME="B-L475E-IOT01A" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -49,7 +50,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="B-L475E-IOT01A" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y diff --git a/configs/bambino-200e/netnsh/defconfig b/configs/bambino-200e/netnsh/defconfig index 14ee12b9a34..1b687bfdf0e 100644 --- a/configs/bambino-200e/netnsh/defconfig +++ b/configs/bambino-200e/netnsh/defconfig @@ -12,6 +12,7 @@ CONFIG_BUILTIN=y CONFIG_DISCOVER_DESCR="BAMBINO" CONFIG_FS_PROCFS=y CONFIG_LIBM=y +CONFIG_LIB_HOSTNAME="Bambino-200E" CONFIG_LPC43_BOOT_SPIFI=y CONFIG_LPC43_ETHERNET=y CONFIG_LPC43_PHYADDR=0 @@ -40,7 +41,6 @@ CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=650 -CONFIG_NET_HOSTNAME="Bambino-200E" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig index 7394e0ad128..4d34bf520b9 100644 --- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig +++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig @@ -52,6 +52,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="MRF24J40" CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -63,7 +64,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="MRF24J40" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/clicker2-stm32/mrf24j40-starhub/defconfig b/configs/clicker2-stm32/mrf24j40-starhub/defconfig index 61c8e421967..2cd11f74779 100644 --- a/configs/clicker2-stm32/mrf24j40-starhub/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starhub/defconfig @@ -35,6 +35,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="MRF24J40" CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -46,7 +47,6 @@ CONFIG_NETDEV_TELNET=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="MRF24J40" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y diff --git a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig index 8b52de4bc41..404bc4df4a6 100644 --- a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig @@ -52,6 +52,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="MRF24J40" CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -64,7 +65,6 @@ CONFIG_NETUTILS_TELNETC=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="MRF24J40" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y diff --git a/configs/clicker2-stm32/xbee-6lowpan/defconfig b/configs/clicker2-stm32/xbee-6lowpan/defconfig index b3b87e4a8a2..a833b484750 100644 --- a/configs/clicker2-stm32/xbee-6lowpan/defconfig +++ b/configs/clicker2-stm32/xbee-6lowpan/defconfig @@ -50,6 +50,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="XBee" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET=y @@ -59,7 +60,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="XBee" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig index 727db576326..51fa51cc9d0 100644 --- a/configs/freedom-k64f/netnsh/defconfig +++ b/configs/freedom-k64f/netnsh/defconfig @@ -18,6 +18,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_KINETIS_ENET=y CONFIG_KINETIS_ENET_MDIOPULLUP=y CONFIG_KINETIS_UART3=y +CONFIG_LIB_HOSTNAME="Freedom-K64F" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y @@ -29,7 +30,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="Freedom-K64F" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/freedom-k66f/netnsh/defconfig b/configs/freedom-k66f/netnsh/defconfig index 2af3cb7c953..6ba6f78b9ac 100644 --- a/configs/freedom-k66f/netnsh/defconfig +++ b/configs/freedom-k66f/netnsh/defconfig @@ -27,6 +27,7 @@ CONFIG_KINETIS_PORTAINTS=y CONFIG_KINETIS_PORTDINTS=y CONFIG_KINETIS_UART1=y CONFIG_KINETIS_UART4=y +CONFIG_LIB_HOSTNAME="Freedom-K66F" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NETDB_DNSCLIENT=y @@ -37,7 +38,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="Freedom-K66F" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/imxrt1050-evk/netnsh/defconfig b/configs/imxrt1050-evk/netnsh/defconfig index 1c94c371724..a4fa1054b5d 100644 --- a/configs/imxrt1050-evk/netnsh/defconfig +++ b/configs/imxrt1050-evk/netnsh/defconfig @@ -17,6 +17,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_ENET=y CONFIG_IMXRT_LPUART1=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="i.MXRT1050 EVK" CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -25,7 +26,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="i.MXRT1050 EVK" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMPv6=y diff --git a/configs/imxrt1060-evk/netnsh/defconfig b/configs/imxrt1060-evk/netnsh/defconfig index a4667fc769e..993f594ba84 100644 --- a/configs/imxrt1060-evk/netnsh/defconfig +++ b/configs/imxrt1060-evk/netnsh/defconfig @@ -17,6 +17,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_ENET=y CONFIG_IMXRT_LPUART1=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="i.MXRT1050 EVK" CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -25,7 +26,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="i.MXRT1050 EVK" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMPv6=y diff --git a/configs/lpcxpresso-lpc54628/netnsh/defconfig b/configs/lpcxpresso-lpc54628/netnsh/defconfig index fdf713c847a..1d3060b598b 100644 --- a/configs/lpcxpresso-lpc54628/netnsh/defconfig +++ b/configs/lpcxpresso-lpc54628/netnsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ETH0_PHY_LAN8720=y CONFIG_FS_PROCFS=y CONFIG_FS_WRITABLE=y CONFIG_INPUT=y +CONFIG_LIB_HOSTNAME="LpcXpresso-Lpc54628" CONFIG_LPC54_EMC=y CONFIG_LPC54_EMC_DYNAMIC_CS0=y CONFIG_LPC54_EMC_DYNAMIC_CS0_SIZE=0x01000000 @@ -30,7 +31,6 @@ CONFIG_NET=y CONFIG_NETUTILS_TELNETC=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_ARP_SEND=y -CONFIG_NET_HOSTNAME="LpcXpresso-Lpc54628" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMPv6=y diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig index 8737cfb2f5a..da278e2fa9f 100644 --- a/configs/misoc/hello/defconfig +++ b/configs/misoc/hello/defconfig @@ -27,6 +27,7 @@ CONFIG_EXAMPLES_TELNETD_NOMAC=y CONFIG_HAVE_CXX=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IOB_NBUFFERS=24 +CONFIG_LIB_HOSTNAME="nuttx" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MISOC_ETHERNET=y @@ -43,7 +44,6 @@ CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1400 CONFIG_NET_GUARDSIZE=648 -CONFIG_NET_HOSTNAME="nuttx" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 3300242b03a..f757cae8126 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -45,6 +45,7 @@ CONFIG_I2C_RESET=y CONFIG_INPUT=y CONFIG_INPUT_MXT=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="SAMA5D4-EK" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -59,7 +60,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="SAMA5D4-EK" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/same70-xplained/mrf24j40-starhub/defconfig b/configs/same70-xplained/mrf24j40-starhub/defconfig index 1f629fe9bcd..1fd16fd52ff 100644 --- a/configs/same70-xplained/mrf24j40-starhub/defconfig +++ b/configs/same70-xplained/mrf24j40-starhub/defconfig @@ -43,6 +43,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="MRF24J40-Hub" CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -61,7 +62,6 @@ CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=590 -CONFIG_NET_HOSTNAME="MRF24J40-Hub" CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y @@ -102,7 +102,6 @@ CONFIG_SAMV7_EMAC0_PHYSR_10HD=0x1 CONFIG_SAMV7_EMAC0_PHYSR_ALTCONFIG=y CONFIG_SAMV7_EMAC0_PHYSR_ALTMODE=0x7 CONFIG_SAMV7_EMAC0_RMII=y -CONFIG_SAMV7_EMAC_HPWORK=y CONFIG_SAMV7_GPIOA_IRQ=y CONFIG_SAMV7_GPIOC_IRQ=y CONFIG_SAMV7_GPIO_IRQ=y diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig index 4ea601442dd..52086592169 100644 --- a/configs/same70-xplained/netnsh/defconfig +++ b/configs/same70-xplained/netnsh/defconfig @@ -1,22 +1,21 @@ # CONFIG_ARCH_RAMFUNCS is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_MMCSD_SPI is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_DISABLE_DATE is not set # CONFIG_SAMV7_UART0 is not set # CONFIG_SAMV7_UART2 is not set # CONFIG_SAMV7_UART4 is not set -CONFIG_ARCH_BOARD_SAME70_XPLAINED=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" +CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_SAME70=y -CONFIG_ARCH_CHIP_SAME70Q=y CONFIG_ARCH_CHIP_SAME70Q21=y +CONFIG_ARCH_CHIP_SAME70Q=y CONFIG_ARCH_CHIP_SAMV7=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_DCACHE=y CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_LAZYFPU=y @@ -27,7 +26,6 @@ CONFIG_AT24XX_SIZE=2 CONFIG_BOARD_LOOPSPERMSEC=51262 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_KSZ8081=y -CONFIG_SYSTEM_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -35,25 +33,15 @@ CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_I2CTOOL_MAXBUS=0 CONFIG_IOB_NBUFFERS=24 +CONFIG_LIB_HOSTNAME="SAME70-Xplained" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y +CONFIG_MTD=y CONFIG_MTD_AT24XX=y CONFIG_MTD_AT25=y CONFIG_MTD_CONFIG=y -CONFIG_MTD=y -CONFIG_NET_ARP_SEND=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="SAME70-Xplained" -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y @@ -62,6 +50,16 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ARP_SEND=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y +CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -77,18 +75,18 @@ CONFIG_RAM_SIZE=393216 CONFIG_RAM_START=0x20400000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_SAMV7_EMAC0=y +CONFIG_SAMV7_EMAC0_PHYSR=30 CONFIG_SAMV7_EMAC0_PHYSR_100FD=0x6 CONFIG_SAMV7_EMAC0_PHYSR_100HD=0x2 CONFIG_SAMV7_EMAC0_PHYSR_10FD=0x5 CONFIG_SAMV7_EMAC0_PHYSR_10HD=0x1 CONFIG_SAMV7_EMAC0_PHYSR_ALTCONFIG=y CONFIG_SAMV7_EMAC0_PHYSR_ALTMODE=0x7 -CONFIG_SAMV7_EMAC0_PHYSR=30 CONFIG_SAMV7_EMAC0_RMII=y -CONFIG_SAMV7_EMAC0=y -CONFIG_SAMV7_GPIO_IRQ=y CONFIG_SAMV7_GPIOA_IRQ=y CONFIG_SAMV7_GPIOC_IRQ=y +CONFIG_SAMV7_GPIO_IRQ=y CONFIG_SAMV7_HSMCI0=y CONFIG_SAMV7_TWIHS0=y CONFIG_SAMV7_USART1=y @@ -101,6 +99,7 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 CONFIG_SYSTEM_I2CTOOL=y +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/samv71-xult/mrf24j40-starhub/defconfig b/configs/samv71-xult/mrf24j40-starhub/defconfig index 3ff7ecb2634..e6b731f07fa 100644 --- a/configs/samv71-xult/mrf24j40-starhub/defconfig +++ b/configs/samv71-xult/mrf24j40-starhub/defconfig @@ -42,6 +42,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 +CONFIG_LIB_HOSTNAME="MRF24J40-Hub" CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -63,7 +64,6 @@ CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=590 -CONFIG_NET_HOSTNAME="MRF24J40-Hub" CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y @@ -108,7 +108,6 @@ CONFIG_SAMV7_EMAC0_PHYSR_10HD=0x1 CONFIG_SAMV7_EMAC0_PHYSR_ALTCONFIG=y CONFIG_SAMV7_EMAC0_PHYSR_ALTMODE=0x7 CONFIG_SAMV7_EMAC0_RMII=y -CONFIG_SAMV7_EMAC_HPWORK=y CONFIG_SAMV7_GPIOA_IRQ=y CONFIG_SAMV7_GPIOB_IRQ=y CONFIG_SAMV7_GPIOD_IRQ=y diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig index 48551bb2be8..48739d6a3cd 100644 --- a/configs/samv71-xult/netnsh/defconfig +++ b/configs/samv71-xult/netnsh/defconfig @@ -32,6 +32,7 @@ CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_I2CTOOL_MAXBUS=0 +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y @@ -49,7 +50,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig index 5adddcd0e76..03e0e76c7bd 100644 --- a/configs/samv71-xult/vnc/defconfig +++ b/configs/samv71-xult/vnc/defconfig @@ -38,6 +38,7 @@ CONFIG_HOST_WINDOWS=y CONFIG_I2C_DRIVER=y CONFIG_IOB_NBUFFERS=72 CONFIG_IOB_THROTTLE=32 +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y @@ -53,7 +54,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig index 57b05b74721..c5b523a2f03 100644 --- a/configs/samv71-xult/vnxwm/defconfig +++ b/configs/samv71-xult/vnxwm/defconfig @@ -40,6 +40,7 @@ CONFIG_IOB_NBUFFERS=72 CONFIG_IOB_THROTTLE=32 CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y @@ -55,7 +56,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/sim/bluetooth/defconfig b/configs/sim/bluetooth/defconfig index 83d687b46a4..98e308276f3 100644 --- a/configs/sim/bluetooth/defconfig +++ b/configs/sim/bluetooth/defconfig @@ -23,7 +23,6 @@ CONFIG_DRIVERS_BLUETOOTH=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLO_STACKSIZE=8192 -CONFIG_SYSTEM_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FSUTILS_PASSWD=y @@ -34,13 +33,13 @@ CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_LIBC_EXECFUNCS=y CONFIG_LIB_ENVPATH=y +CONFIG_LIB_HOSTNAME="NuttX-SIM" CONFIG_MAX_TASKS=64 CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NET_BLUETOOTH=y -CONFIG_NET_HOSTNAME="NuttX-SIM" CONFIG_NET_STATISTICS=y CONFIG_NFILE_DESCRIPTORS=32 CONFIG_NSH_ARCHINIT=y @@ -64,6 +63,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SIM_WALLTIME=y CONFIG_START_DAY=3 CONFIG_START_MONTH=4 +CONFIG_SYSTEM_NSH=y CONFIG_TIME_EXTENDED=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/sim/ipforward/defconfig b/configs/sim/ipforward/defconfig index e096bb3f35b..d6507714498 100644 --- a/configs/sim/ipforward/defconfig +++ b/configs/sim/ipforward/defconfig @@ -28,10 +28,10 @@ CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_LIBC_EXECFUNCS=y CONFIG_LIB_ENVPATH=y +CONFIG_LIB_HOSTNAME="IP-Forward" CONFIG_MAX_TASKS=64 CONFIG_NET=y CONFIG_NETDEVICES=y -CONFIG_NET_HOSTNAME="IP-Forward" CONFIG_NET_IPFORWARD=y CONFIG_NET_IPv6=y CONFIG_NET_IPv6_NCONF_ENTRIES=4 diff --git a/configs/sim/pf_ieee802154/defconfig b/configs/sim/pf_ieee802154/defconfig index 13d33a0c9ca..4066d9efc2a 100644 --- a/configs/sim/pf_ieee802154/defconfig +++ b/configs/sim/pf_ieee802154/defconfig @@ -31,6 +31,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -43,7 +44,6 @@ CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_STATISTICS=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_IEEE802154=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/sim/pktradio/defconfig b/configs/sim/pktradio/defconfig index 9b05ec7ef66..81baa4d72fe 100644 --- a/configs/sim/pktradio/defconfig +++ b/configs/sim/pktradio/defconfig @@ -47,6 +47,7 @@ CONFIG_I2C_DRIVER=y CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -63,7 +64,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETDEV_TELNET=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/sim/sixlowpan/defconfig b/configs/sim/sixlowpan/defconfig index 1697fe70d79..28d4bdfc50c 100644 --- a/configs/sim/sixlowpan/defconfig +++ b/configs/sim/sixlowpan/defconfig @@ -49,6 +49,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_IEEE802154_LOOPBACK=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=48 +CONFIG_LIB_HOSTNAME="SAMV71-XULT" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -65,7 +66,6 @@ CONFIG_NETDEV_STATISTICS=y CONFIG_NETDEV_TELNET=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="SAMV71-XULT" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y diff --git a/configs/stm32butterfly2/nshnet/defconfig b/configs/stm32butterfly2/nshnet/defconfig index 2a37d264b2b..f679517ec0e 100644 --- a/configs/stm32butterfly2/nshnet/defconfig +++ b/configs/stm32butterfly2/nshnet/defconfig @@ -31,13 +31,13 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR_SHORT=y +CONFIG_LIB_HOSTNAME="butterfly2" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_NET=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_ETH_PKTSIZE=1500 -CONFIG_NET_HOSTNAME="butterfly2" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_LOCAL=y diff --git a/configs/stm32f4discovery/hciuart/defconfig b/configs/stm32f4discovery/hciuart/defconfig index 9ba279f8237..861610c4acc 100644 --- a/configs/stm32f4discovery/hciuart/defconfig +++ b/configs/stm32f4discovery/hciuart/defconfig @@ -32,6 +32,7 @@ CONFIG_IOB_BUFSIZE=80 CONFIG_IOB_NBUFFERS=64 CONFIG_IOB_NCHAINS=16 CONFIG_IOB_THROTTLE=16 +CONFIG_LIB_HOSTNAME="STM32F4-Discovery" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET=y @@ -39,7 +40,6 @@ CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NET_BLUETOOTH=y -CONFIG_NET_HOSTNAME="STM32F4-Discovery" CONFIG_NET_SOCKOPTS=y CONFIG_NET_SOLINGER=y CONFIG_NFILE_DESCRIPTORS=8 diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig index a09b3e8efdc..93435223cea 100644 --- a/configs/stm32f4discovery/ipv6/defconfig +++ b/configs/stm32f4discovery/ipv6/defconfig @@ -24,6 +24,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="STM32F4-Discovery" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -32,7 +33,6 @@ CONFIG_MMCSD_SDIO=y CONFIG_NET=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=590 -CONFIG_NET_HOSTNAME="STM32F4-Discovery" CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig index d4cc268e00a..db0991ed398 100644 --- a/configs/stm32f4discovery/netnsh/defconfig +++ b/configs/stm32f4discovery/netnsh/defconfig @@ -24,6 +24,7 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="STM32F4-Discovery" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -38,7 +39,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="STM32F4-Discovery" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig index 9cacb002333..b656d3d684d 100644 --- a/configs/stm32f746g-disco/netnsh/defconfig +++ b/configs/stm32f746g-disco/netnsh/defconfig @@ -20,6 +20,7 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="stntest" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=3 @@ -31,7 +32,6 @@ CONFIG_NET_ARP_IPIN=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1500 -CONFIG_NET_HOSTNAME="stntest" CONFIG_NET_ICMP=y CONFIG_NET_IGMP=y CONFIG_NET_ROUTE=y diff --git a/configs/stm32f769i-disco/netnsh/defconfig b/configs/stm32f769i-disco/netnsh/defconfig index 0bfacf03bb6..ea21861b821 100644 --- a/configs/stm32f769i-disco/netnsh/defconfig +++ b/configs/stm32f769i-disco/netnsh/defconfig @@ -19,6 +19,7 @@ CONFIG_FS_PROCFS_REGISTER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIB_HOSTNAME="stntest" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -29,7 +30,6 @@ CONFIG_NET_ARP_IPIN=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=1500 -CONFIG_NET_HOSTNAME="stntest" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y diff --git a/configs/twr-k64f120m/netnsh/defconfig b/configs/twr-k64f120m/netnsh/defconfig index b3d1ecc415f..fcbeae1858b 100644 --- a/configs/twr-k64f120m/netnsh/defconfig +++ b/configs/twr-k64f120m/netnsh/defconfig @@ -8,7 +8,6 @@ CONFIG_ARCH_CHIP_MK64FN1M0VMD12=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=9535 CONFIG_ETH0_PHY_KSZ8041=y -CONFIG_SYSTEM_NSH=y CONFIG_FAT_LFN=y CONFIG_FS_AUTOMOUNTER=y CONFIG_FS_FAT=y @@ -19,6 +18,7 @@ CONFIG_KINETIS_GPIOIRQ=y CONFIG_KINETIS_PORTBINTS=y CONFIG_KINETIS_SDHC=y CONFIG_KINETIS_UART1=y +CONFIG_LIB_HOSTNAME="TWRK64" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -27,7 +27,6 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="TWRK64" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y @@ -52,6 +51,7 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=23 +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=10 CONFIG_TWR_K64F120M_SDHC_AUTOMOUNT=y diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig index 5231c60a5ff..e091d23c31c 100644 --- a/configs/u-blox-c027/nsh/defconfig +++ b/configs/u-blox-c027/nsh/defconfig @@ -29,6 +29,7 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR_SHORT=y +CONFIG_LIB_HOSTNAME="c027" CONFIG_LPC17_EMACRAM_SIZE=7296 CONFIG_LPC17_ETHERNET=y CONFIG_LPC17_ETH_NRXDESC=6 @@ -52,14 +53,12 @@ CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETDEV_LATEINIT=y CONFIG_NETUTILS_DHCPC=y -CONFIG_NETUTILS_PPPD=y CONFIG_NETUTILS_PPPD_PAP=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="c027" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig index 1531bd16167..4695c2638a5 100644 --- a/configs/viewtool-stm32f107/netnsh/defconfig +++ b/configs/viewtool-stm32f107/netnsh/defconfig @@ -15,6 +15,7 @@ CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 +CONFIG_LIB_HOSTNAME="Viewtool-STM32F107" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET=y @@ -27,7 +28,6 @@ CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_PKTSIZE=650 -CONFIG_NET_HOSTNAME="Viewtool-STM32F107" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMPv6=y diff --git a/configs/viewtool-stm32f107/tcpblaster/defconfig b/configs/viewtool-stm32f107/tcpblaster/defconfig index 77bb41a3950..0b02e83f88b 100644 --- a/configs/viewtool-stm32f107/tcpblaster/defconfig +++ b/configs/viewtool-stm32f107/tcpblaster/defconfig @@ -15,14 +15,13 @@ CONFIG_FS_PROCFS=y CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=50 CONFIG_IOB_NCHAINS=12 -CONFIG_LIBC_FLOATINGPOINT=y +CONFIG_LIB_HOSTNAME="Viewtool-STM32F107" CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET=y CONFIG_NETUTILS_TELNETD=y CONFIG_NET_ARP_SEND=y CONFIG_NET_ETH_PKTSIZE=1514 -CONFIG_NET_HOSTNAME="Viewtool-STM32F107" CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 diff --git a/include/sys/utsname.h b/include/sys/utsname.h index cb1f96492b2..53eb0e32b35 100644 --- a/include/sys/utsname.h +++ b/include/sys/utsname.h @@ -56,7 +56,7 @@ * * FIELD Default * sysname NuttX - * nodename CONFIG_NET_HOSTNAME + * nodename CONFIG_LIB_HOSTNAME * release From version.h * version From version.h * machine CONFIG_ARCH diff --git a/include/unistd.h b/include/unistd.h index f9e92f8633c..1918c87ac7a 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -361,10 +361,8 @@ FAR char **getoptargp(void); /* Optional argument following option */ FAR int *getoptindp(void); /* Index into argv */ FAR int *getoptoptp(void); /* Unrecognized option character */ -#ifdef CONFIG_NET int gethostname(FAR char *name, size_t size); int sethostname(FAR const char *name, size_t size); -#endif /* Get configurable system variables */ diff --git a/libs/libc/libc.csv b/libs/libc/libc.csv index fbeb3d9e161..fdbfa5adeec 100644 --- a/libs/libc/libc.csv +++ b/libs/libc/libc.csv @@ -47,7 +47,7 @@ "ftell","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","long","FAR FILE *" "fwrite","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","size_t","FAR const void *","size_t","size_t","FAR FILE *" "getcwd","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","FAR char","FAR char *","size_t" -"gethostname","unistd.h","defined(CONFIG_LIBC_NETDB)","int","FAR char*","size_t" +"gethostname","unistd.h","","int","FAR char*","size_t" "getopt","unistd.h","","int","int","FAR char *const[]","FAR const char *" "getoptargp","unistd.h","","FAR char *" "getoptindp","unistd.h","","int" diff --git a/libs/libc/misc/lib_utsname.c b/libs/libc/misc/lib_utsname.c index 0a97a6f8074..0bcc4154df2 100644 --- a/libs/libc/misc/lib_utsname.c +++ b/libs/libc/misc/lib_utsname.c @@ -99,7 +99,6 @@ int uname(FAR struct utsname *name) strncpy(name->sysname, "NuttX", SYS_NAMELEN); -#ifdef CONFIG_LIBC_NETDB /* Get the hostname */ if (-1 == gethostname(name->nodename, HOST_NAME_MAX)) @@ -109,10 +108,6 @@ int uname(FAR struct utsname *name) name->nodename[HOST_NAME_MAX-1] = '\0'; -#else - strncpy(name->nodename, "", HOST_NAME_MAX); -#endif - strncpy(name->release, CONFIG_VERSION_STRING, SYS_NAMELEN); name->release[SYS_NAMELEN-1] = '\0'; diff --git a/libs/libc/unistd/Kconfig b/libs/libc/unistd/Kconfig index ba00dd0c64a..1c9795f4d0a 100644 --- a/libs/libc/unistd/Kconfig +++ b/libs/libc/unistd/Kconfig @@ -99,3 +99,9 @@ config TASK_SPAWN_DEFAULT_STACKSIZE Default: 2048. endmenu # Program Execution Options + +config LIB_HOSTNAME + string "Host name for this device" + default "" + ---help--- + A unique name to identify device on the network diff --git a/libs/libc/unistd/Make.defs b/libs/libc/unistd/Make.defs index f258bd9fcdf..8fbb351a65f 100644 --- a/libs/libc/unistd/Make.defs +++ b/libs/libc/unistd/Make.defs @@ -60,9 +60,7 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y) CSRCS += lib_sleep.c lib_usleep.c endif -ifeq ($(CONFIG_NET),y) CSRCS += lib_gethostname.c lib_sethostname.c -endif # Add the unistd directory to the build diff --git a/libs/libc/unistd/lib_gethostname.c b/libs/libc/unistd/lib_gethostname.c index d18d16ee03c..fc986c26816 100644 --- a/libs/libc/unistd/lib_gethostname.c +++ b/libs/libc/unistd/lib_gethostname.c @@ -47,10 +47,6 @@ #include -/* This file is only compiled if network support is enabled */ - -#ifdef CONFIG_NET - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -59,8 +55,8 @@ * changed via sethostname(), however. */ -#ifndef CONFIG_NET_HOSTNAME -# define CONFIG_NET_HOSTNAME "" +#ifndef CONFIG_LIB_HOSTNAME +# define CONFIG_LIB_HOSTNAME "" #endif /**************************************************************************** @@ -69,7 +65,7 @@ /* This is the system hostname */ -char g_hostname[HOST_NAME_MAX + 1] = CONFIG_NET_HOSTNAME; +char g_hostname[HOST_NAME_MAX + 1] = CONFIG_LIB_HOSTNAME; /**************************************************************************** * Public Functions @@ -145,5 +141,3 @@ int gethostname(FAR char *name, size_t namelen) #endif } - -#endif /* CONFIG_NET */ diff --git a/libs/libc/unistd/lib_sethostname.c b/libs/libc/unistd/lib_sethostname.c index 112799ae954..f2cb1fc71f4 100644 --- a/libs/libc/unistd/lib_sethostname.c +++ b/libs/libc/unistd/lib_sethostname.c @@ -46,10 +46,6 @@ #include -/* This file is only compiled if network support is enabled */ - -#ifdef CONFIG_NET - /* Further, in the protected and kernel build modes where kernel and * application code are separated, the hostname is a common system property * and must reside only in the kernel. In that case, this accessor @@ -128,5 +124,4 @@ int sethostname(FAR const char *name, size_t size) return 0; } -#endif /* CONFIG_NET */ #endif /* (!CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL) || __KERNEL__ */ diff --git a/net/Kconfig b/net/Kconfig index 89ff649fbca..a9a417f0779 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -380,10 +380,4 @@ endmenu # Network Topologies source "net/route/Kconfig" -config NET_HOSTNAME - string "Host name for this device" - default "" - ---help--- - A unique name to identify device on the network - endif # NET