diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 51c8758f6e072..d82e7407534b5 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -6400,7 +6400,7 @@

Release Notes and Change Logs:

However, testing has not yet begun due to issues with BDMs, Code Warrior, and the paging in the build process. Progress is slow, but I hope to see a fully verified MC9S12NE64 port in the near future. - Refer to the NuttX board README files for DEMO9S12NE64 and for the NE64 /PoE Badge for further information. + Refer to the NuttX board README files for DEMO9S12NE64 and for the NE64 /PoE Badge for further information.

@@ -6709,7 +6709,7 @@

Release Notes and Change Logs:

(which has very limit SH-1 support to begin with), or perhaps with the CMON debugger. At any rate, I have exhausted all of the energy that I am willing to put into this cool old processor for the time being. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information.

@@ -6746,7 +6746,7 @@

Release Notes and Change Logs:

No workaround is known at this time. This is a show stopper for M16C. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information.

@@ -6859,7 +6859,7 @@

Release Notes and Change Logs:

The initial release of support for the z16f was made available in NuttX version 0.3.7. A working NuttShell (NSH) configuration as added in NuttX-6.33 (although a patch is required to work around an issue with a ZDS-II 5.0.1 tool problem). An ESPI driver was added in NuttX-7.2. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information.

diff --git a/Documentation/README.html b/Documentation/README.html index c671ad2a9c03f..d74d420d97d7a 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -409,11 +409,11 @@

NuttX README Files

| | `- moteino-mega/ | | `- README.txt | |- hc/ - | | `- mcs92s12ne64/ + | | `- m9s12/ | | |- demo9s12ne64/ - | | |` `- README.txt + | | |` `- README.txt | | `- ne64badge/ - | | `- README.txt + | | `- README.txt | |- mips/ | | |- pic32mx/ | | | |- mirtoo/ @@ -440,12 +440,12 @@

NuttX README Files

| | `- or1k/ | | `- README.txt | |- renesas/ - | | |- m32262f8/ + | | |- m16c/ | | | `- skp16c26/ - | | | `- README.txt - | | `-sh7032/ + | | | `- README.txt + | | `-sh1/ | | `- us7032evb1/ - | | `- README.txt + | | `- README.txt | |- risc-v/ | | |- gap8/ | | | `- gapuino/ @@ -467,12 +467,12 @@

NuttX README Files

| | `- esp32-core/ | | `- README.txt | |- z16/ - | | `- z16f2811/ + | | `- z16f/ | | `- z16f2800100zcog/ - | | |- configs/nsh/README.txt - | | |- configs/ostest/README.txt - | | |- configs/pashello/README.txt - | | `- README.txt + | | |- configs/nsh/README.txt + | | |- configs/ostest/README.txt + | | |- configs/pashello/README.txt + | | `- README.txt | |- z80/ | | |- ez80/ | | | |- ez80f910200kitg/ diff --git a/README.txt b/README.txt index 50ac6c74e522a..cdf87912956f6 100644 --- a/README.txt +++ b/README.txt @@ -2121,7 +2121,7 @@ nuttx/ | | `- moteino-mega/ | | `- README.txt | |- hc/ - | | `- mcs92s12ne64/ + | | `- m9s12/ | | |- demo9s12ne64/ | | | `- README.txt | | `- ne64badge/ @@ -2152,10 +2152,10 @@ nuttx/ | | `- or1k/ | | `- README.txt | |- renesas/ - | | |- m32262f8/ + | | |- m16c/ | | | `- skp16c26/ | | | `- README.txt - | | `-sh7032/ + | | `-sh1/ | | `- us7032evb1/ | | `- README.txt | |- risc-v/ @@ -2179,7 +2179,7 @@ nuttx/ | | `- esp32-core/ | | `- README.txt | |- z16/ - | | `- z16f2811/ + | | `- z16f/ | | `- z16f2800100zcog/ | | |- configs/nsh/README.txt | | |- configs/ostest/README.txt diff --git a/boards/Kconfig b/boards/Kconfig index fc2bf68c05d6b..552641e408cdb 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2125,9 +2125,9 @@ config ARCH_BOARD default "pic32mz-starterkit" if ARCH_BOARD_PIC32MZ_STARTERKIT default "qemu-i486" if ARCH_BOARD_QEMU_I486 default "rx65n" if ARCH_BOARD_RX65N - default "rx65n" if ARCH_BOARD_RX65N_RSK1MB - default "rx65n" if ARCH_BOARD_RX65N_RSK2MB - default "rx65n" if ARCH_BOARD_RX65N_GRROSE + default "rx65n-rsk1mb" if ARCH_BOARD_RX65N_RSK1MB + default "rx65n-rsk2mb" if ARCH_BOARD_RX65N_RSK2MB + default "rx65n-grrose" if ARCH_BOARD_RX65N_GRROSE default "s32k118evb" if ARCH_BOARD_S32K118EVB default "s32k146evb" if ARCH_BOARD_S32K146EVB default "s32k148evb" if ARCH_BOARD_S32K148EVB @@ -2720,10 +2720,10 @@ if ARCH_BOARD_CUSTOM source "boards/dummy/Kconfig" endif if ARCH_BOARD_DEMOS92S12NEC64 -source "boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig" +source "boards/hc/m9s12/demo9s12ne64/Kconfig" endif if ARCH_BOARD_NE64BADGE -source "boards/hc/mcs92s12ne64/ne64badge/Kconfig" +source "boards/hc/m9s12/ne64badge/Kconfig" endif if ARCH_BOARD_MIRTOO source "boards/mips/pic32mx/mirtoo/Kconfig" @@ -2753,10 +2753,10 @@ if ARCH_BOARD_OR1K source "boards/or1k/mor1kx/or1k/Kconfig" endif if ARCH_BOARD_SKP16C26 -source "boards/renesas/m32262f8/skp16c26/Kconfig" +source "boards/renesas/m16c/skp16c26/Kconfig" endif if ARCH_BOARD_US7032EVB1 -source "boards/renesas/sh7032/us7032evb1/Kconfig" +source "boards/renesas/sh1/us7032evb1/Kconfig" endif if ARCH_BOARD_GAPUINO source "boards/risc-v/gap8/gapuino/Kconfig" @@ -2792,7 +2792,7 @@ if ARCH_BOARD_ESP32CORE source "boards/xtensa/esp32/esp32-core/Kconfig" endif if ARCH_BOARD_Z16F2800100ZCOG -source "boards/z16/z16f2811/z16f2800100zcog/Kconfig" +source "boards/z16/z16f/z16f2800100zcog/Kconfig" endif if ARCH_BOARD_EZ80F910200KITG source "boards/z80/ez80/ez80f910200kitg/Kconfig" diff --git a/boards/README.txt b/boards/README.txt index 47d7781d22e10..3fd2bf5812ffb 100644 --- a/boards/README.txt +++ b/boards/README.txt @@ -218,7 +218,7 @@ boards/arm/stm32/cloudctrl board. Based on the Shenzhou IV development board design. It is based on the STM32F107VC MCU. -boards/hc/mcs92s12ne64/demo9s12ne64 +boards/hc/m9s12/demo9s12ne64 NXP/FreeScale DMO9S12NE64 board based on the MC9S12NE64 hcs12 cpu. This port uses the m9s12x GCC toolchain. STATUS: (Still) under development; it is code complete but has not yet been verified. @@ -717,7 +717,7 @@ boards/arm/stm32/shenzhou This is the port of NuttX to the Shenzhou development board from www.armjishu.com. This board features the STMicro STM32F107VCT MCU. -boards/renesas/m32262f8/skp16c26 +boards/renesas/m16c/skp16c26 Renesas M16C processor on the Renesas SKP16C26 StarterKit. This port uses the GNU m32c toolchain. STATUS: The port is complete but untested due to issues with compiler internal errors. @@ -853,7 +853,7 @@ boards/mips/pic32mx/ubw32 with this board http://www.sparkfun.com/products/9713. See also http://www.schmalzhaus.com/UBW32/. -boards/renesas/sh7032/us7032evb1 +boards/renesas/sh1/us7032evb1 This is a port of the Hitachi SH-1 on the Hitachi SH-1/US7032EVB1 board. STATUS: Work has just began on this port. @@ -865,7 +865,7 @@ boards/arm/stm32/viewtool-stm32f107 config/xmc4500-relax Infineon XMC4000 Relax Lite v1 -boards/z16/z16f2811/z16f2800100zcog +boards/z16/z16f/z16f2800100zcog z16f Microcontroller. This port use the Zilog z16f2800100zcog development kit and the Zilog ZDS-II Windows command line tools. The development environment is Cygwin under WinXP. diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig index ff974a3205d03..17ccb36ae5e13 100644 --- a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig +++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig @@ -13,9 +13,9 @@ CONFIG_A1X_UART0=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pcduino-a10" CONFIG_ARCH_BOARD_PCDUINO_A10=y +CONFIG_ARCH_CHIP="a1x" CONFIG_ARCH_CHIP_A10=y CONFIG_ARCH_CHIP_A1X=y -CONFIG_ARCH_CHIP="a1x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig index 6567c1ee5fe64..7a774500f6ad7 100644 --- a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig @@ -15,9 +15,9 @@ CONFIG_AM335X_UART0=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="beaglebone-black" CONFIG_ARCH_BOARD_BEAGLEBONE_BLACK=y +CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_CHIP_AM3358=y CONFIG_ARCH_CHIP_AM335X=y -CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig index 0eb6022b83488..c1f061b6adfc4 100644 --- a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig @@ -5,27 +5,24 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set CONFIG_AM335X_UART0=y -CONFIG_ARCH_BOARD_BEAGLEBONE_BLACK=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="beaglebone-black" +CONFIG_ARCH_BOARD_BEAGLEBONE_BLACK=y +CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_CHIP_AM3358=y CONFIG_ARCH_CHIP_AM335X=y -CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=49341 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y CONFIG_DISABLE_ENVIRON=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -50,10 +47,11 @@ CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_START_DAY=1 CONFIG_START_MONTH=4 CONFIG_START_YEAR=2015 CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/c5471/c5471evm/configs/httpd/defconfig b/boards/arm/c5471/c5471evm/configs/httpd/defconfig index 56a85aad12785..ecf9ce2ac6f66 100644 --- a/boards/arm/c5471/c5471evm/configs/httpd/defconfig +++ b/boards/arm/c5471/c5471evm/configs/httpd/defconfig @@ -9,8 +9,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y -CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_CHIP="c5471" +CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/c5471/c5471evm/configs/nettest/defconfig b/boards/arm/c5471/c5471evm/configs/nettest/defconfig index d3ba386bb42cb..3ec8434dc3b7a 100644 --- a/boards/arm/c5471/c5471evm/configs/nettest/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nettest/defconfig @@ -9,8 +9,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y -CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_CHIP="c5471" +CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/c5471/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig index dc07ded95a5da..53ca9deca423f 100644 --- a/boards/arm/c5471/c5471evm/configs/nsh/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig @@ -12,8 +12,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y -CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_CHIP="c5471" +CONFIG_ARCH_CHIP_C5471=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig index 6f0d5399c0c2b..99e0dde7ccd50 100644 --- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig @@ -31,8 +31,6 @@ CONFIG_COMPOSITE_PRODUCTID=0x0bc2 CONFIG_COMPOSITE_VENDORID=0x054c CONFIG_COMPOSITE_VENDORSTR="Sony" CONFIG_CXD56_BINARY=y -CONFIG_CXD56_DMAC_SPI4_RX=y -CONFIG_CXD56_DMAC_SPI4_TX=y CONFIG_CXD56_I2C0=y CONFIG_CXD56_I2C=y CONFIG_CXD56_SDIO=y diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig index 1f5ed0895d321..0996874dca3e6 100644 --- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig @@ -29,8 +29,6 @@ CONFIG_COMPOSITE_PRODUCTID=0x0bc2 CONFIG_COMPOSITE_VENDORID=0x054c CONFIG_COMPOSITE_VENDORSTR="Sony" CONFIG_CXD56_BINARY=y -CONFIG_CXD56_DMAC_SPI4_RX=y -CONFIG_CXD56_DMAC_SPI4_TX=y CONFIG_CXD56_I2C0=y CONFIG_CXD56_I2C=y CONFIG_CXD56_SDIO=y diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig index a874b0cef61cc..48bac25184b0e 100644 --- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig @@ -21,8 +21,8 @@ CONFIG_BOARD_LOOPSPERMSEC=5434 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y -CONFIG_CXD56_BINARY=y CONFIG_CXD56_ADC=y +CONFIG_CXD56_BINARY=y CONFIG_CXD56_CISIF=y CONFIG_CXD56_HPADC0=y CONFIG_CXD56_HPADC1=y diff --git a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig index d17c6fc94025e..17fe553c769c7 100644 --- a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NET_DM90x0=y CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig index ae28ea7a4d62e..c54b2ac5a5213 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig @@ -24,9 +24,7 @@ CONFIG_IMXRT_LPUART1=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBCXX=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LOCALE=y CONFIG_LIBC_LOCALTIME=y -CONFIG_LIBC_WCHAR=y CONFIG_LIBM=y CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig index a681245e28411..b7933dc8d5740 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig @@ -24,9 +24,7 @@ CONFIG_IMXRT_LPUART1=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBCXX=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LOCALE=y CONFIG_LIBC_LOCALTIME=y -CONFIG_LIBC_WCHAR=y CONFIG_LIBM=y CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index 6a6208fd24e0c..f9844fe1786ad 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -15,7 +15,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_AUDIO=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index 6968c27a5f658..609309ab9fc4c 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -15,7 +15,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_ARMV7M_MEMCPY=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index d4a47f8679f8e..e4932c08039da 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig @@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BINFMT_CONSTRUCTORS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig index 100466b3e8a40..713272e19c511 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig @@ -10,7 +10,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BOARD_LOOPSPERMSEC=12061 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index 8e98ae53e61a7..08f04637503b8 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_ARM_MPU=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 670b69b3e4cbc..739204b8d1be3 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -15,7 +15,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_ARM_MPU=y @@ -90,7 +89,6 @@ CONFIG_NETDEVICES=y CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_DRIPADDR=0xa9feab5a CONFIG_NETINIT_MACADDR_1=0xdeadbeff -CONFIG_NETINIT_MACADDR_2=0x00e0 CONFIG_NETINIT_NETMASK=0xffff0000 CONFIG_NETINIT_NOMAC=y CONFIG_NETINIT_THREAD=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index e687b3832e200..b00348abce3fb 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BOARDCTL_RESET=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index 3b7c7e0a0886f..c01aae4fb2a67 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig @@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BOARDCTL_APP_SYMTAB=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index b6411fbee08ab..10cd11b80d4c1 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -15,7 +15,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_AUDIO=y @@ -87,7 +86,6 @@ CONFIG_NETDEVICES=y CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_DRIPADDR=0xa9feab5a CONFIG_NETINIT_MACADDR_1=0xdeadbeff -CONFIG_NETINIT_MACADDR_2=0x00e0 CONFIG_NETINIT_NETMASK=0xffff0000 CONFIG_NETINIT_NOMAC=y CONFIG_NETINIT_THREAD=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index 73f214139263d..e8f69c4321c18 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -16,7 +16,6 @@ CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y CONFIG_BOARDCTL_RESET=y diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig index e239824e84c76..718c8dfac5241 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig @@ -24,7 +24,6 @@ CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=11934 CONFIG_BUILD_PROTECTED=y CONFIG_DEV_LOOP=y -CONFIG_DISABLE_POLL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig index 01b2c0d3988f8..44cb24a3b601d 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig @@ -63,10 +63,7 @@ CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_DHCPC=y CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_NETMASK=0xffff0000 -CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PIPES=y diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig index 3ce4a11de7b72..720860c5ec73e 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig @@ -24,7 +24,6 @@ CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=11934 CONFIG_BUILD_PROTECTED=y CONFIG_DEV_LOOP=y -CONFIG_DISABLE_POLL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig index d88ec6f41258c..c5ea3fb8b7529 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig @@ -7,7 +7,6 @@ # # CONFIG_EXAMPLES_ELF_FSMOUNT is not set # CONFIG_FS_PROCFS_EXCLUDE_ENVIRON is not set -# CONFIG_FS_PROCFS_EXCLUDE_VERSION is not set # CONFIG_NSH_DISABLE_DATE is not set # CONFIG_NSH_DISABLE_PRINTF is not set # CONFIG_NSH_DISABLE_SHUTDOWN is not set diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig index c6e15db1e9df3..702444ccf12f2 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig @@ -47,7 +47,6 @@ CONFIG_SPI=y CONFIG_START_MONTH=10 CONFIG_START_YEAR=2008 CONFIG_SYSTEM_COMPOSITE=y -CONFIG_SYSTEM_COMPOSITE_SERDEV="/dev/ttyUSB0" CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig index 43b0c174eaa99..8afba258e0bc1 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig @@ -22,7 +22,6 @@ CONFIG_BUTTONS=y CONFIG_BUTTONS_LOWER=y 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 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig index ac256556372b6..99d9b77ffa064 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig @@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INPUT=y CONFIG_INPUT_FT5X06=y -CONFIG_LIB_BOARDCTL=y CONFIG_LPC54_EMC=y CONFIG_LPC54_EMC_DYNAMIC_CS0=y CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000 diff --git a/boards/arm/moxart/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig index adade9b02a74f..506993d9cac1f 100644 --- a/boards/arm/moxart/moxa/configs/nsh/defconfig +++ b/boards/arm/moxart/moxa/configs/nsh/defconfig @@ -60,7 +60,6 @@ CONFIG_HAVE_CXX=y CONFIG_IOB_NBUFFERS=24 CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_LONG_LONG=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NET=y diff --git a/boards/arm/sam34/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig index 3036ec3bdf75a..641e3174f7127 100644 --- a/boards/arm/sam34/arduino-due/configs/nsh/defconfig +++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig @@ -9,8 +9,8 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="arduino-due" CONFIG_ARCH_BOARD_ARDUINO_DUE=y -CONFIG_ARCH_CHIP_ATSAM3X8E=y CONFIG_ARCH_CHIP="sam34" +CONFIG_ARCH_CHIP_ATSAM3X8E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig index f28f4acbe701b..63f72083f8fc0 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_ARCH_RAMFUNCS is not set -# CONFIG_EXAMPLES_SERIALRX_BUFFERED is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4s-xplained-pro" CONFIG_ARCH_BOARD_SAM4S_XPLAINED_PRO=y diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-telnetd/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-telnetd/defconfig index b95a1495e2edc..a070bf4d519ed 100644 --- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-telnetd/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-telnetd/defconfig @@ -40,7 +40,6 @@ CONFIG_FS_PROCFS_EXCLUDE_VERSION=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_INTERPRETERS_CHIBI_SCHEME=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_THROTTLE=0 CONFIG_MAX_TASKS=16 diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb/defconfig index 6853980f50b20..d80df13df3229 100644 --- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb/defconfig @@ -40,7 +40,6 @@ CONFIG_FS_PROCFS_EXCLUDE_VERSION=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_INTERPRETERS_CHIBI_SCHEME=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_THROTTLE=0 CONFIG_MAX_TASKS=16 diff --git a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig index 21bd66912bc0f..0aee4540f632c 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig @@ -65,7 +65,6 @@ CONFIG_NETINIT_IPv6NETMASK_8=0xff80 CONFIG_NETINIT_NOMAC=y CONFIG_NETINIT_THREAD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig index 8dc63c1f5ccb7..f6d76f08c4a62 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_EXECFUNCS_HAVE_SYMTAB is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_SAMA5_UART0 is not set diff --git a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig index 4e3a1ebeaa694..b58be35391db2 100644 --- a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig +++ b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig @@ -39,7 +39,6 @@ CONFIG_CDCACM_CONSOLE=y CONFIG_DEFAULT_SMALL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig index f3206f979627c..19546f3ed0240 100644 --- a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig @@ -71,7 +71,6 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/boards/arm/samv7/samv71-xult/configs/module/defconfig b/boards/arm/samv7/samv71-xult/configs/module/defconfig index 376ca13a0cee6..f6d006ea27365 100644 --- a/boards/arm/samv7/samv71-xult/configs/module/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/module/defconfig @@ -29,7 +29,6 @@ CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=51262 CONFIG_BUILTIN=y CONFIG_EXAMPLES_MODULE=y -CONFIG_SYSTEM_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -65,6 +64,7 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig index 10f5c6529ecbe..e4d5f4a3ce03a 100644 --- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig @@ -73,7 +73,6 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig index d9818cffe15d9..f2b1f74cc8712 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig @@ -18,8 +18,6 @@ CONFIG_ARM_MPU=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y @@ -59,6 +57,8 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig index fe8b75106b241..a3abcf9b2b7cc 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig @@ -19,10 +19,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DRIVERS_IEEE802154=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y -CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=2048 @@ -64,6 +61,8 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig index aebfc3bd54470..4038ed4f53a3e 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig @@ -18,11 +18,9 @@ CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_FS_PROCFS=y -CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig index e1c25a8ca82d9..e8fd14a715f5b 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig @@ -23,7 +23,6 @@ CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig index da66502df978d..fd36591e5e220 100644 --- a/boards/arm/stm32/maple/configs/usbnsh/defconfig +++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig @@ -37,7 +37,6 @@ CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_DEFAULT_SMALL=y CONFIG_I2C=y -CONFIG_LIB_BOARDCTL=y CONFIG_LIB_RAND_ORDER=2 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 diff --git a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig index a9b30eda80fa9..1574d2c0f7c1d 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig @@ -47,8 +47,8 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_FORCEPOWER=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_TIM1_CH1OUT=y +CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig index 9588918d72fc5..75eeea1ef201e 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F302R8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_BUILTIN_PROXY_STACKSIZE=512 @@ -90,7 +89,6 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 -CONFIG_STM32_CCMEXCLUDE=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig index e993ece0d96ae..f3c92eb61a77c 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig @@ -37,7 +37,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUCLEOF334R8_SPWM=y CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=4 -CONFIG_NUCLEOF334R8_SPWM_PWM_FREQ=100000 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 CONFIG_PREALLOC_WDOGS=1 diff --git a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig index 5057bff939e6f..0428e23d8238c 100644 --- a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig @@ -25,7 +25,6 @@ CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_EXAMPLES_HELLO=y -CONFIG_SYSTEM_NSH=y CONFIG_HAVE_CXX=y CONFIG_HEAP_COLORATION=y CONFIG_INTELHEX_BINARY=y @@ -59,6 +58,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_CLE=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERLED=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig index db9a57deb933a..4b946f54ada43 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig @@ -29,7 +29,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig index 4a1b594597533..0cab6ad581ddf 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig @@ -32,7 +32,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig index 9868fb4bf11cf..ee03e94c46103 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig @@ -37,7 +37,6 @@ CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig index 1b4570263eda1..c6eaf69dfec58 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig @@ -51,7 +51,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 -CONFIG_LIB_BOARDCTL=y CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig index 835dae3e5d287..5c24f07c5b4a9 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig @@ -40,7 +40,6 @@ CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig index dfb6120008f68..959a0ae2c1330 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig @@ -43,7 +43,6 @@ CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig index f0a95640b71d1..8d76b1ce7c594 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig @@ -28,7 +28,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig index dad9d19b374e8..97be2fe122564 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig @@ -39,7 +39,6 @@ CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig index a6731b0efe20e..b131f1e6e0881 100644 --- a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig @@ -35,7 +35,6 @@ CONFIG_EXAMPLES_CAN=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig index 0199fe6c45e31..3b118fbf06542 100644 --- a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_EXAMPLES_ADC_GROUPSIZE=1 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig index f84cf53fc56d8..01227cfa582f8 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig @@ -29,7 +29,6 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig index b156075601ca2..e9be67e94e0b9 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig @@ -61,7 +61,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_HIDKBD=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig index 9a0e89e948ba7..6f16f687058cd 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig @@ -61,7 +61,6 @@ CONFIG_STM32_USBHOST=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYS_RESERVED=8 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USERMAIN_STACKSIZE=4096 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig index be0a886b7aa42..121422de3b0a4 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig @@ -59,7 +59,6 @@ CONFIG_STM32_USBHOST=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYS_RESERVED=8 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="module_main" diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig index 4c666c3f0ea71..be48dade6a637 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig @@ -18,8 +18,6 @@ CONFIG_ARM_MPU=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -58,6 +56,8 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig index d1d4b5fcb6c18..c748cc51f1096 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig @@ -24,7 +24,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 @@ -60,7 +59,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig index be965ec4e052f..644e533c2aee9 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig @@ -76,7 +76,6 @@ CONFIG_USART3_IFLOWCONTROL=y CONFIG_USART3_OFLOWCONTROL=y CONFIG_USART3_RXBUFSIZE=512 CONFIG_USART6_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig index df00e935179df..a62b3b6d8a259 100644 --- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig +++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig @@ -126,9 +126,7 @@ CONFIG_STM32_USART6=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_SYSTEM_ZMODEM=y -CONFIG_USART1_DMA=y CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USART6_DMA=y CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_DMA=y diff --git a/boards/arm/stm32/photon/configs/usbnsh/defconfig b/boards/arm/stm32/photon/configs/usbnsh/defconfig index 096fb11ec5087..671ade75f529a 100644 --- a/boards/arm/stm32/photon/configs/usbnsh/defconfig +++ b/boards/arm/stm32/photon/configs/usbnsh/defconfig @@ -21,7 +21,6 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y -CONFIG_SYSTEM_NSH=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -57,5 +56,6 @@ CONFIG_STM32_OTGHS=y CONFIG_STM32_USART1=y CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" +CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig index 37f0607b8860e..96067f9f7095b 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig @@ -40,7 +40,6 @@ CONFIG_NET_BROADCAST=y CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig index 559809a37d8a3..f1ad7c532ced7 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig @@ -37,7 +37,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig index 55c51c2c60f22..f92698304e6f4 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig @@ -64,8 +64,8 @@ CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=17 CONFIG_START_MONTH=9 -CONFIG_STM32_FSMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FSMC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig index 5ebf0a4cf51d8..048d528bc0bd2 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig @@ -92,8 +92,8 @@ CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y -CONFIG_STM32_FSMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FSMC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig index 7a607aa884e4b..ce72435984837 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig @@ -36,7 +36,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig index 96710ca3f7f18..c5e213584c3c4 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig @@ -20,7 +20,6 @@ CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_EXAMPLES_NETTEST=y -CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_WEBSERVER=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y diff --git a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig index aa0d98127dfcd..9872577ecbbea 100644 --- a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig @@ -34,7 +34,6 @@ CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_DEFAULT_SMALL=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig index 79439906a1d75..d09a2469a18d1 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig @@ -78,7 +78,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig index bd6412f174594..84b19c59d682f 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig @@ -28,7 +28,6 @@ CONFIG_CLOCK_MONOTONIC=y CONFIG_EXAMPLES_ADC=y CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_MOUNT=y -CONFIG_SYSTEM_NSH=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y @@ -73,6 +72,7 @@ CONFIG_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_STM32_USART2_REMAP=y CONFIG_SYSLOG_TIMESTAMP=y +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig index 79439906a1d75..d09a2469a18d1 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig @@ -78,7 +78,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig index fdf0142996be2..98ccda5566239 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig @@ -28,7 +28,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_SYSTEM_NSH=y CONFIG_FDCLONE_STDIO=y CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=2 @@ -62,6 +61,7 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_NOEXT_VECTORS=y CONFIG_STM32_USART1=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig index f678652d5b25b..9aac1f65e0237 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig @@ -29,7 +29,6 @@ CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_NRF24L01TERM=y -CONFIG_SYSTEM_NSH=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 @@ -58,6 +57,7 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig index 48b4d3b7ce265..de1aec824362e 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig @@ -27,7 +27,6 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y -CONFIG_SYSTEM_NSH=y CONFIG_EXAMPLES_PWM=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -61,6 +60,7 @@ CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig index feff48184efdb..2adca0dcda32d 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig @@ -34,7 +34,6 @@ CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_DEFAULT_SMALL=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig index a0ece61ba65ae..bb78995934180 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig @@ -99,7 +99,6 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_COMP4=y -CONFIG_STM32_COMP=y CONFIG_STM32_DAC1=y CONFIG_STM32_DAC1CH1=y CONFIG_STM32_DAC1CH1_DMA=y diff --git a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig index 178bf2e10e212..821decb76a239 100644 --- a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig @@ -26,7 +26,6 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig index 4e58334711da8..f1fb11a1f68ce 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig @@ -57,8 +57,8 @@ CONFIG_STM32_ADC3=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_DMA1=y CONFIG_STM32_DMA2=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_TIM1=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig index adeb4c3534900..7fff5ea7c53f9 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig @@ -59,8 +59,8 @@ CONFIG_STM32F429I_DISCO_FLASH_PART=y CONFIG_STM32F429I_DISCO_RAMMTD=y CONFIG_STM32F429I_DISCO_RAMMTD_SIZE=256 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_RNG=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig index d31c54d317fbc..472c9fc75a1b9 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig @@ -67,8 +67,8 @@ CONFIG_STM32_DMA2D_FB_BASE=0xD07B5000 CONFIG_STM32_DMA2D_FB_SIZE=307200 CONFIG_STM32_DMA2D_LAYER_PPLINE=240 CONFIG_STM32_DMA2D_NLAYERS=2 -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_I2C3=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_LTDC=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig index a3e7da96f10bd..2dadbc3e72801 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig @@ -13,7 +13,6 @@ CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y -CONFIG_ARCH_FPU=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y @@ -51,11 +50,10 @@ CONFIG_STM32_ADC1_DMA_CFG=1 CONFIG_STM32_ADC1_INJECTED_CHAN=1 CONFIG_STM32_ADC_LL_OPS=y CONFIG_STM32_ADC_NOIRQ=y -CONFIG_STM32_CCMEXCLUDE=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_DMA2=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWM_LL_OPS=y CONFIG_STM32_PWR=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig index ba335c92a5b97..5b5280d0a8859 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig @@ -63,8 +63,8 @@ CONFIG_STM32F429I_DISCO_ILI9341=y CONFIG_STM32F429I_DISCO_ILI9341_SPIBITS16=y CONFIG_STM32F429I_DISCO_ILI9341_SPIFREQUENCY=20000000 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig index 77a7576379abf..8b72995e0b536 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig @@ -65,8 +65,8 @@ CONFIG_START_YEAR=2017 CONFIG_STM32F429I_DISCO_ILI9341=y CONFIG_STM32_CCMEXCLUDE=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_I2C3=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_LTDC=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig index 04af138831703..e4966c4212849 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig @@ -47,8 +47,8 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig index 765ad49a3fd55..ed05087f59851 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig @@ -68,8 +68,8 @@ CONFIG_STM32_DMA2D_FB_BASE=0xD07B5000 CONFIG_STM32_DMA2D_FB_SIZE=307200 CONFIG_STM32_DMA2D_LAYER_PPLINE=240 CONFIG_STM32_DMA2D_NLAYERS=2 -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_LTDC=y CONFIG_STM32_LTDC_FB_BASE=0xD076A000 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig index f2bba7f96f0cd..754592a91c4e3 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig @@ -99,8 +99,8 @@ CONFIG_START_MONTH=11 CONFIG_STM32F429I_DISCO_ILI9341=y CONFIG_STM32_CCMEXCLUDE=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_I2C3=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_LTDC=y diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig index 617e06b77b0b3..d2e76e59ca001 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig @@ -51,8 +51,8 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGHS=y CONFIG_STM32_PWR=y @@ -62,7 +62,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBHOST=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig index ea80c4b0b3499..01747dee380d1 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig @@ -58,8 +58,8 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FMC=y CONFIG_STM32_EXTERNAL_RAM=y +CONFIG_STM32_FMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGHS=y CONFIG_STM32_PWR=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig index 19ef4391cc24a..e892d94ba3c33 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig @@ -80,7 +80,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USBHOST=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index b4f72c43ac29b..2d05f82e1f75a 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -27,7 +27,6 @@ CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig index 6a1184a3b8726..ecf17b4f1feb5 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig @@ -12,14 +12,12 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_C99_BOOL8=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y -CONFIG_TESTING_CXXTEST=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y @@ -46,6 +44,7 @@ CONFIG_START_YEAR=2012 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_TESTING_CXXTEST=y CONFIG_UCLIBCXX=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig index 63b6388629723..28ccd1c137d65 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig @@ -32,7 +32,6 @@ CONFIG_BUILTIN=y CONFIG_DRIVERS_BLUETOOTH=y CONFIG_DRIVERS_WIRELESS=y CONFIG_FS_PROCFS=y -CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y @@ -49,7 +48,6 @@ CONFIG_NETDEV_LATEINIT=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NET_BLUETOOTH=y CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig index b912918d899d3..ab8acdf6ae600 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig @@ -42,7 +42,6 @@ CONFIG_NET=y CONFIG_NETINIT_IPv6NETMASK_8=0xff80 CONFIG_NETINIT_NOMAC=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig index c09cfc2a9f7c4..49eb9c4bb1635 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig @@ -20,8 +20,6 @@ CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_RGBLED=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -65,6 +63,8 @@ CONFIG_STM32_TIM3_CH3OUT=y CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y CONFIG_STM32_USART2=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index b80128f850a9c..4c1b5c7709199 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -47,7 +47,6 @@ CONFIG_NETDEVICES=y CONFIG_NETINIT_DHCPC=y CONFIG_NETINIT_DRIPADDR=0x0 CONFIG_NETINIT_MACADDR_1=0xdeadcafe -CONFIG_NETINIT_MACADDR_2=0x00e0 CONFIG_NETINIT_NETMASK=0x0 CONFIG_NETINIT_NOMAC=y CONFIG_NETINIT_THREAD=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig index 240a73d6c25b9..076ac11e0b412 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig @@ -12,7 +12,6 @@ CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y -CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -26,9 +25,7 @@ CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBCXX=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LOCALE=y CONFIG_LIBC_LOCALTIME=y -CONFIG_LIBC_WCHAR=y CONFIG_LIBM=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig index dc4ff4248ae34..6909ed4d5ea1e 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig @@ -6,13 +6,13 @@ # modifications. # # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y @@ -40,9 +40,9 @@ CONFIG_START_YEAR=2009 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 -CONFIG_TESTING_OSTEST=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig index 74770ad83d851..0f1ea37309ba9 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig @@ -53,8 +53,8 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_TIM1_CH1OUT=y +CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_CXXINITIALIZE=y diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index 536ca9d9de31d..b8d386562b219 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NET_ARP_SEND=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=650 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMPv6=y diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index ec13c111fb6d4..8d2088b75bf7a 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y +CONFIG_ARCH_CHIP_STM32L072XX=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=2796 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 8d5ba51abe09c..39094dbccebc3 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -19,7 +19,6 @@ CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=2796 CONFIG_BUILTIN=y -CONFIG_DEBUG_FULLOPT=y CONFIG_EXAMPLES_NXLINES=y CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=1 CONFIG_EXAMPLES_NXLINES_BPP=1 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 487dcb852bf26..380b2167a0538 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y +CONFIG_ARCH_CHIP_STM32L072XX=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=2796 diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index b17d3284aecd8..0765637d65d0d 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -25,7 +25,6 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE=y -CONFIG_SYSTEM_NSH=y CONFIG_FS_PROCFS=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 @@ -60,6 +59,7 @@ CONFIG_START_YEAR=2013 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_STM32F0L0G0_PWR=y CONFIG_STM32F0L0G0_USART2=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index 20ea3326c6280..c1e1587cd891d 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -26,7 +26,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_DRIVERS_LPWAN=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y -CONFIG_EXAMPLES_SX127X_RFFREQ=433000000 CONFIG_INTELHEX_BINARY=y CONFIG_LPWAN_SX127X=y CONFIG_LPWAN_SX127X_FSKOOK=y diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index cec3f610eb998..dcdc2f1ba52cf 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH_BOARD="nucleo-l073rz" CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L073RZ=y +CONFIG_ARCH_CHIP_STM32L073XX=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=2796 diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index 515f0c030ceaa..b9e8de570dcc7 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L073RZ=y +CONFIG_ARCH_CHIP_STM32L073XX=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y @@ -26,7 +27,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y CONFIG_DRIVERS_LPWAN=y CONFIG_DRIVERS_WIRELESS=y CONFIG_EXAMPLES_HELLO=y -CONFIG_EXAMPLES_SX127X_RFFREQ=433000000 CONFIG_INTELHEX_BINARY=y CONFIG_LPWAN_SX127X=y CONFIG_LPWAN_SX127X_FSKOOK=y diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig index c7bb5dfcccaf5..fba4ecc50c071 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_IGMP=y CONFIG_NET_LOOPBACK=y CONFIG_NET_ROUTE=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig index 81bee172a2f0e..7de3119a038fd 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NET_ICMP=y CONFIG_NET_IGMP=y CONFIG_NET_ROUTE=y CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig index 23b3e146b0d38..39be98aea221a 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NET_ETH_PKTSIZE=1500 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y @@ -73,7 +72,6 @@ CONFIG_STM32F7_DMA1=y CONFIG_STM32F7_DMA2=y CONFIG_STM32F7_ETHMAC=y CONFIG_STM32F7_I2C4=y -CONFIG_STM32F7_OTGHS=y CONFIG_STM32F7_PHYADDR=0 CONFIG_STM32F7_PHYSR=31 CONFIG_STM32F7_PHYSR_100FD=0x18 diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig index a605f8ce52432..96789c8e47423 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig @@ -22,8 +22,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -52,6 +50,8 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32H7_USART3=y CONFIG_SYSLOG_NONE=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig index d75eb846977ba..08d606e065d4f 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig @@ -22,8 +22,6 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_BOARD_LOOPSPERMSEC=43103 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y -CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_EXPERIMENTAL=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -52,6 +50,8 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32H7_USART1=y CONFIG_SYSLOG_NONE=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig index ed3f48f517a55..71d1214430447 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_DISABLE_DD=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=80 CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32l4/stm32l476vg-disco/kernel" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig index ed080110a951f..2fd5013403931 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig @@ -48,7 +48,6 @@ CONFIG_NSH_ARCHROMFS=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=80 CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig index 50e031e7e4bc7..d70d8086f4200 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig @@ -35,7 +35,6 @@ CONFIG_NETINIT_IPv6NETMASK_8=0xff80 CONFIG_NETINIT_MONITOR=y CONFIG_NETINIT_THREAD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y diff --git a/boards/arm/tiva/eagle100/configs/nsh/defconfig b/boards/arm/tiva/eagle100/configs/nsh/defconfig index b967ff10d5dbd..613d06d858914 100644 --- a/boards/arm/tiva/eagle100/configs/nsh/defconfig +++ b/boards/arm/tiva/eagle100/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NET_BROADCAST=y CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index f7fd6e4a18e70..460532e92b2ca 100644 --- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NET_BROADCAST=y CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y diff --git a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig index 78f67630a6132..02b54fd471c26 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig @@ -37,7 +37,6 @@ CONFIG_NET_ETH_PKTSIZE=650 CONFIG_NET_ICMP=y CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=8 -CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig index 405d0d68fbdfc..b3d0a456b7f3a 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig @@ -49,7 +49,6 @@ CONFIG_TIVA_GPIOC_IRQS=y CONFIG_TIVA_GPIOD_IRQS=y CONFIG_TIVA_GPIOE_IRQS=y CONFIG_TIVA_GPIOF_IRQS=y -CONFIG_TIVA_GPIOP_IRQS=y CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig index 681e1ac0679ac..354670c223fd9 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig @@ -34,7 +34,6 @@ CONFIG_NETINIT_IPv6NETMASK_8=0xff80 CONFIG_NETINIT_MONITOR=y CONFIG_NETINIT_THREAD=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_PKTSIZE=590 CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_SOCKET=y CONFIG_NET_IPv6=y diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig index aebedd9cf778d..c7cbdbf623700 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig +++ b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig @@ -6,8 +6,9 @@ # modifications. # # CONFIG_ARCH_RAMFUNCS is not set -CONFIG_ARCH_BOARD_TMS570LS31X_USB_KIT=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="tms570ls31x-usb-kit" +CONFIG_ARCH_BOARD_TMS570LS31X_USB_KIT=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="tms570" CONFIG_ARCH_CHIP_TMS570=y @@ -16,10 +17,8 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BUILTIN=y CONFIG_ELF=y -CONFIG_SYSTEM_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -51,6 +50,7 @@ CONFIG_SPI=y CONFIG_START_DAY=10 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2014 +CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_TMS570_GIO_IRQ=y CONFIG_TMS570_SCI1=y diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig b/boards/hc/m9s12/demo9s12ne64/Kconfig similarity index 100% rename from boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig rename to boards/hc/m9s12/demo9s12ne64/Kconfig diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/README.txt b/boards/hc/m9s12/demo9s12ne64/README.txt similarity index 100% rename from boards/hc/mcs92s12ne64/demo9s12ne64/README.txt rename to boards/hc/m9s12/demo9s12ne64/README.txt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig similarity index 97% rename from boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig rename to boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig index ca6b7a22cb600..03355c59ad52b 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig +++ b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH="hc" CONFIG_ARCH_BOARD="demo9s12ne64" CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y -CONFIG_ARCH_CHIP="mcs92s12ne64" +CONFIG_ARCH_CHIP="m9s12" CONFIG_ARCH_CHIP_MCS92S12NEC64=y CONFIG_ARCH_HC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h b/boards/hc/m9s12/demo9s12ne64/include/board.h similarity index 97% rename from boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h rename to boards/hc/m9s12/demo9s12ne64/include/board.h index 6eaed5fb1bc3a..e27d57a8ba692 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h +++ b/boards/hc/m9s12/demo9s12ne64/include/board.h @@ -1,6 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h - * include/arch/board/board.h + * boards/hc/m9s12/demo9s12ne64/include/board.h * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs rename to boards/hc/m9s12/demo9s12ne64/scripts/Make.defs index 7d565dfce4e9f..647806c76105a 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs +++ b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs +# boards/hc/m9s12/demo9s12ne64/scripts/Make.defs # # Copyright (C) 2009,2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld rename to boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld index 534cccd3ec9cd..1bc5b01964461 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld +++ b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-banked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/ostest/demo9s12ne64-banked.ld + * boards/hc/m9s12/demo9s12ne64/ostest/demo9s12ne64-banked.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld rename to boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld index 6ec6e5b74bc4f..d7028fb201d75 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld +++ b/boards/hc/m9s12/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/ostest/demo9s12ne64-banked.ld + * boards/hc/m9s12/demo9s12ne64/ostest/demo9s12ne64-banked.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore b/boards/hc/m9s12/demo9s12ne64/src/.gitignore similarity index 100% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore rename to boards/hc/m9s12/demo9s12ne64/src/.gitignore diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile b/boards/hc/m9s12/demo9s12ne64/src/Makefile similarity index 97% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile rename to boards/hc/m9s12/demo9s12ne64/src/Makefile index c9216a2e71920..0f49e55b3d062 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile +++ b/boards/hc/m9s12/demo9s12ne64/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile +# boards/hc/m9s12/demo9s12ne64/src/Makefile # # Copyright (C) 2009 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h rename to boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h index 47b0c40257264..0dc9ab850e66d 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h +++ b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h + * boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c index 204662be22472..fd6407a7a98c3 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c + * boards/hc/m9s12/demo9s12ne64/src/m9s12_appinit.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c index 9004345ea3970..c93010164d0da 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c + * boards/hc/m9s12/demo9s12ne64/src/m9s12_boot.c * * Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c index 8d39e68c0f77a..deb28ebbab64f 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c + * boards/hc/m9s12/demo9s12ne64/src/m9s12_buttons.c * * Copyright (C) 2009, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c index a185a754d790a..c71e09135cdba 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c + * boards/hc/m9s12/demo9s12ne64/src/m9s12_leds.c * * Copyright (C) 2009, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c b/boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c similarity index 98% rename from boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c rename to boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c index 6cc74ac330ce2..bbb4287d38e41 100644 --- a/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c +++ b/boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64demo9s12ne64/src/m9s12_spi.c + * boards/hc/m9s12/demo9s12ne64/src/m9s12_spi.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/drivers/Kconfig b/boards/hc/m9s12/drivers/Kconfig similarity index 100% rename from boards/hc/mcs92s12ne64/drivers/Kconfig rename to boards/hc/m9s12/drivers/Kconfig diff --git a/boards/hc/mcs92s12ne64/ne64badge/Kconfig b/boards/hc/m9s12/ne64badge/Kconfig similarity index 100% rename from boards/hc/mcs92s12ne64/ne64badge/Kconfig rename to boards/hc/m9s12/ne64badge/Kconfig diff --git a/boards/hc/mcs92s12ne64/ne64badge/README.txt b/boards/hc/m9s12/ne64badge/README.txt similarity index 100% rename from boards/hc/mcs92s12ne64/ne64badge/README.txt rename to boards/hc/m9s12/ne64badge/README.txt diff --git a/boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig similarity index 97% rename from boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig rename to boards/hc/m9s12/ne64badge/configs/ostest/defconfig index ac8e237225aa2..7eb70c84bf43a 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig +++ b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig @@ -10,7 +10,7 @@ CONFIG_ARCH="hc" CONFIG_ARCH_BOARD="ne64badge" CONFIG_ARCH_BOARD_NE64BADGE=y -CONFIG_ARCH_CHIP="mcs92s12ne64" +CONFIG_ARCH_CHIP="m9s12" CONFIG_ARCH_CHIP_MCS92S12NEC64=y CONFIG_ARCH_HC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/hc/mcs92s12ne64/ne64badge/include/board.h b/boards/hc/m9s12/ne64badge/include/board.h similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/include/board.h rename to boards/hc/m9s12/ne64badge/include/board.h index a4d80be103f94..d638e44108662 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/include/board.h +++ b/boards/hc/m9s12/ne64badge/include/board.h @@ -1,6 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/include/board.h - * include/arch/board/board.h + * boards/hc/m9s12/ne64badge/include/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs b/boards/hc/m9s12/ne64badge/scripts/Make.defs similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs rename to boards/hc/m9s12/ne64badge/scripts/Make.defs index a6ccdcd84d783..ebf6a193853e0 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs +++ b/boards/hc/m9s12/ne64badge/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs +# boards/hc/m9s12/ne64badge/scripts/Make.defs # # Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld b/boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld rename to boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld index 0b31cfe9eace9..e88b32dac4ed5 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld +++ b/boards/hc/m9s12/ne64badge/scripts/ne64badge-banked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/ostest/ne64badge-banked.ld + * boards/hc/m9s12/ne64badge/ostest/ne64badge-banked.ld * * Copyright (C) 2011m, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld b/boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld rename to boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld index 8215d39af8811..0765c88556af7 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld +++ b/boards/hc/m9s12/ne64badge/scripts/ne64badge-nonbanked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/ostest/ne64badge-nonbanked.ld + * boards/hc/m9s12/ne64badge/ostest/ne64badge-nonbanked.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/.gitignore b/boards/hc/m9s12/ne64badge/src/.gitignore similarity index 100% rename from boards/hc/mcs92s12ne64/ne64badge/src/.gitignore rename to boards/hc/m9s12/ne64badge/src/.gitignore diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/Makefile b/boards/hc/m9s12/ne64badge/src/Makefile similarity index 97% rename from boards/hc/mcs92s12ne64/ne64badge/src/Makefile rename to boards/hc/m9s12/ne64badge/src/Makefile index 05d6bf68c28a1..7e22f5477ffe7 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/Makefile +++ b/boards/hc/m9s12/ne64badge/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/hc/mcs92s12ne64/ne64badge/src/Makefile +# boards/hc/m9s12/ne64badge/src/Makefile # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c b/boards/hc/m9s12/ne64badge/src/m9s12_appinit.c similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c rename to boards/hc/m9s12/ne64badge/src/m9s12_appinit.c index 9cd6f5e00b21e..4091fb61ef409 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/mcs92s12ne64/ne64badge/src/m9s12_appinit.c + * config/m9s12/ne64badge/src/m9s12_appinit.c * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c b/boards/hc/m9s12/ne64badge/src/m9s12_boot.c similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c rename to boards/hc/m9s12/ne64badge/src/m9s12_boot.c index 0f6da5e807aec..f9c2a46a07ba4 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c + * boards/hc/m9s12/ne64badge/src/m9s12_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c rename to boards/hc/m9s12/ne64badge/src/m9s12_buttons.c index 7d712262ac3cb..c3086cd661eec 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c + * boards/hc/m9s12/ne64badge/src/m9s12_buttons.c * * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c b/boards/hc/m9s12/ne64badge/src/m9s12_leds.c similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c rename to boards/hc/m9s12/ne64badge/src/m9s12_leds.c index 66a3299f88782..2112303d57cb3 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c + * boards/hc/m9s12/ne64badge/src/m9s12_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c b/boards/hc/m9s12/ne64badge/src/m9s12_spi.c similarity index 98% rename from boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c rename to boards/hc/m9s12/ne64badge/src/m9s12_spi.c index 2e37d1c124c96..57f9aff4fc4c8 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c +++ b/boards/hc/m9s12/ne64badge/src/m9s12_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c + * boards/hc/m9s12/ne64badge/src/m9s12_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h b/boards/hc/m9s12/ne64badge/src/ne64badge.h similarity index 99% rename from boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h rename to boards/hc/m9s12/ne64badge/src/ne64badge.h index 1060fd0a419b2..110dddc18c15f 100644 --- a/boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h +++ b/boards/hc/m9s12/ne64badge/src/ne64badge.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h + * boards/hc/m9s12/ne64badge/src/ne64badge.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig index 09f095e0ab545..2687cd165933f 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig @@ -44,7 +44,6 @@ 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 diff --git a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig index 191587873030a..ebe1285f23f40 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig @@ -46,7 +46,6 @@ 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 diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig index de3beaadacc0c..4689191aab7b1 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig +++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig @@ -7,36 +7,33 @@ # # CONFIG_ARCH_RAMFUNCS is not set # CONFIG_NX_DISABLE_1BPP is not set -# CONFIG_PIC32MZ_DEBUGGER_ENABLE is not set -# CONFIG_PIC32MZ_TRACE_ENABLE is not set -CONFIG_ARCH_BOARD_FLIPNCLICK_PIC32MZ=y +CONFIG_ARCH="mips" CONFIG_ARCH_BOARD="flipnclick-pic32mz" +CONFIG_ARCH_BOARD_FLIPNCLICK_PIC32MZ=y CONFIG_ARCH_CHIP="pic32mz" -CONFIG_ARCH_CHIP_PIC32MZ=y CONFIG_ARCH_CHIP_PIC32MZ2048EFH=y +CONFIG_ARCH_CHIP_PIC32MZ=y CONFIG_ARCH_CHIP_PIC32MZEF=y CONFIG_ARCH_MIPS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="mips" CONFIG_BOARD_LOOPSPERMSEC=7245 CONFIG_BUILTIN=y -CONFIG_SYSTEM_NSH=y +CONFIG_EXAMPLES_NXLINES=y CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 CONFIG_EXAMPLES_NXLINES_BPP=1 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4 -CONFIG_EXAMPLES_NXLINES=y CONFIG_FLIPNCLICK_PIC32MZ_SSD1306=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_HILETGO=y CONFIG_LCD_MAXCONTRAST=255 -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MIPS_MICROMIPS=y CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y +CONFIG_MIPS_MICROMIPS=y CONFIG_MMCSD=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y @@ -48,10 +45,10 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_TOM_THUMB_4X6=y CONFIG_NXTK_BORDERWIDTH=2 +CONFIG_NX_BLOCKING=y CONFIG_PIC32MZ_ICESEL_CH2=y CONFIG_PIC32MZ_SPI2=y CONFIG_PIC32MZ_UART3=y @@ -65,6 +62,7 @@ CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=10 CONFIG_START_MONTH=2 +CONFIG_SYSTEM_NSH=y CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/misoc/lm32/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig index a7253f12efc92..77cd87f1d88eb 100644 --- a/boards/misoc/lm32/misoc/configs/nsh/defconfig +++ b/boards/misoc/lm32/misoc/configs/nsh/defconfig @@ -11,7 +11,7 @@ CONFIG_ARCH="misoc" CONFIG_ARCH_BOARD="misoc" CONFIG_ARCH_BOARD_MISOC_VERILATOR=y CONFIG_ARCH_CHIP="lm32" -CONFIG_ARCH_CHIP_MINERVA=y +CONFIG_ARCH_CHIP_LM32=y CONFIG_ARCH_MISOC=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y diff --git a/boards/renesas/m32262f8/drivers/Kconfig b/boards/renesas/m16c/drivers/Kconfig similarity index 100% rename from boards/renesas/m32262f8/drivers/Kconfig rename to boards/renesas/m16c/drivers/Kconfig diff --git a/boards/renesas/m32262f8/skp16c26/Kconfig b/boards/renesas/m16c/skp16c26/Kconfig similarity index 100% rename from boards/renesas/m32262f8/skp16c26/Kconfig rename to boards/renesas/m16c/skp16c26/Kconfig diff --git a/boards/renesas/m32262f8/skp16c26/README.txt b/boards/renesas/m16c/skp16c26/README.txt similarity index 98% rename from boards/renesas/m32262f8/skp16c26/README.txt rename to boards/renesas/m16c/skp16c26/README.txt index f0fa8417fe690..56934c54ede59 100644 --- a/boards/renesas/m32262f8/skp16c26/README.txt +++ b/boards/renesas/m16c/skp16c26/README.txt @@ -1,4 +1,4 @@ -boards/renesas/m32262f8/skp16c26/README.txt +boards/renesas/m16c/skp16c26/README.txt ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1. The buildroot package can be used to build an M16C toolchain. The toolchain diff --git a/boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig similarity index 97% rename from boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig rename to boards/renesas/m16c/skp16c26/configs/ostest/defconfig index 8b812bb29a94e..2465ac9dabca3 100644 --- a/boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig +++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="skp16c26" CONFIG_ARCH_BOARD_SKP16C26=y -CONFIG_ARCH_CHIP="m32262f8" +CONFIG_ARCH_CHIP="m16c" CONFIG_ARCH_CHIP_M30262F8=y CONFIG_ARCH_INTERRUPTSTACK=128 CONFIG_ARCH_RENESAS=y diff --git a/boards/renesas/m32262f8/skp16c26/include/board.h b/boards/renesas/m16c/skp16c26/include/board.h similarity index 98% rename from boards/renesas/m32262f8/skp16c26/include/board.h rename to boards/renesas/m16c/skp16c26/include/board.h index 4defdfea56bf2..8f27f92228dc3 100644 --- a/boards/renesas/m32262f8/skp16c26/include/board.h +++ b/boards/renesas/m16c/skp16c26/include/board.h @@ -1,6 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/skp16c26/include/board.h - * arch/board/board.h + * boards/renesas/m16c/skp16c26/include/board.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs b/boards/renesas/m16c/skp16c26/scripts/Make.defs similarity index 98% rename from boards/renesas/m32262f8/skp16c26/scripts/Make.defs rename to boards/renesas/m16c/skp16c26/scripts/Make.defs index f6961dedc43e3..de8e7d7fe766e 100644 --- a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs +++ b/boards/renesas/m16c/skp16c26/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/m32262f8/skp16c26/scripts/Make.defs +# boards/renesas/m16c/skp16c26/scripts/Make.defs # # Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld b/boards/renesas/m16c/skp16c26/scripts/skp16c26.ld similarity index 98% rename from boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld rename to boards/renesas/m16c/skp16c26/scripts/skp16c26.ld index 38618d9b1eb7f..52c4e6b02a242 100644 --- a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld +++ b/boards/renesas/m16c/skp16c26/scripts/skp16c26.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld + * boards/renesas/m16c/skp16c26/scripts/skp16c26.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/.gitignore b/boards/renesas/m16c/skp16c26/src/.gitignore similarity index 100% rename from boards/renesas/m32262f8/skp16c26/src/.gitignore rename to boards/renesas/m16c/skp16c26/src/.gitignore diff --git a/boards/renesas/m32262f8/skp16c26/src/Makefile b/boards/renesas/m16c/skp16c26/src/Makefile similarity index 98% rename from boards/renesas/m32262f8/skp16c26/src/Makefile rename to boards/renesas/m16c/skp16c26/src/Makefile index 26335724cfa18..e448c7ff3e9e3 100644 --- a/boards/renesas/m32262f8/skp16c26/src/Makefile +++ b/boards/renesas/m16c/skp16c26/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/m32262f8/skp16c26/src/Makefile +# boards/renesas/m16c/skp16c26/src/Makefile # # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c similarity index 98% rename from boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c rename to boards/renesas/m16c/skp16c26/src/m16c_buttons.c index 4647decb579a7..871bd06b93eef 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c +++ b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c + * boards/renesas/m16c/skp16c26/src/m16c_buttons.c * * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c similarity index 99% rename from boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c rename to boards/renesas/m16c/skp16c26/src/m16c_lcd.c index 31def78db37db..cbe839ad6e288 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c +++ b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/scp16c26/src/m16c_lcd.c + * boards/renesas/m16c/scp16c26/src/m16c_lcd.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c similarity index 98% rename from boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c rename to boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c index 380b84884a06f..d5fe115071d50 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c +++ b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/scp16c26/src/m16c_lcdconsole.c + * boards/renesas/m16c/scp16c26/src/m16c_lcdconsole.c * * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c b/boards/renesas/m16c/skp16c26/src/m16c_leds.c similarity index 99% rename from boards/renesas/m32262f8/skp16c26/src/m16c_leds.c rename to boards/renesas/m16c/skp16c26/src/m16c_leds.c index 068c0b94a42d9..26624d9423b51 100644 --- a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c +++ b/boards/renesas/m16c/skp16c26/src/m16c_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/scp16c26/src/m16c_leds.c + * boards/renesas/m16c/scp16c26/src/m16c_leds.c * * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h b/boards/renesas/m16c/skp16c26/src/skp16c26.h similarity index 98% rename from boards/renesas/m32262f8/skp16c26/src/skp16c26.h rename to boards/renesas/m16c/skp16c26/src/skp16c26.h index 7410ec0cdbb10..f30c20c5a3b12 100644 --- a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h +++ b/boards/renesas/m16c/skp16c26/src/skp16c26.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/m32262f8/skp16c26/src/scp16c26.h + * boards/renesas/m16c/skp16c26/src/scp16c26.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig index b6435728d5667..b1400ad197285 100644 --- a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig @@ -1,39 +1,51 @@ -CONFIG_ARCH_BOARD_RX65N_GRROSE=y +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="rx65n-grrose" +CONFIG_ARCH_BOARD_RX65N_GRROSE=y +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEHDFP=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -CONFIG_ARCH_CHIP="rx65n" CONFIG_BOARD_LOOPSPERMSEC=15001 -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y -CONFIG_ETH0_PHY_LAN8720A=y +CONFIG_DEBUG_FEATURES=y +CONFIG_EXAMPLES_SERIALBLASTER=y +CONFIG_EXAMPLES_SERIALRX=y +CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y +CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 +CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_STATISTICS=y +CONFIG_NETINIT_DHCPC=y +CONFIG_NETUTILS_DHCPC=y +CONFIG_NETUTILS_DHCPD=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_NSH_BUILTIN_APPS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -43,27 +55,8 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=655360 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y -CONFIG_RX65N_SCI0=y -CONFIG_RX65N_SCI1=y -CONFIG_RX65N_SCI2=y -CONFIG_RX65N_SCI5=y -CONFIG_RX65N_SCI6=y -CONFIG_RX65N_SCI8=y -CONFIG_SCI0_SERIALDRIVER=y -CONFIG_SCI0_BAUD=115200 -CONFIG_SCI1_SERIAL_CONSOLE=y -CONFIG_SCI1_SERIALDRIVER=y -CONFIG_SCI1_BAUD=115200 -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_BAUD=115200 -CONFIG_SCI5_SERIALDRIVER=y -CONFIG_SCI5_BAUD=921600 -CONFIG_SCI6_SERIALDRIVER=y -CONFIG_SCI6_BAUD=115200 -CONFIG_SCI8_SERIALDRIVER=y -CONFIG_SCI8_BAUD=115200 -CONFIG_RX65N_EMAC=y CONFIG_RX65N_EMAC0=y +CONFIG_RX65N_EMAC0_PHYADDR=0 CONFIG_RX65N_EMAC0_PHYSR=30 CONFIG_RX65N_EMAC0_PHYSR_100FD=0x18 CONFIG_RX65N_EMAC0_PHYSR_100HD=0x08 @@ -72,35 +65,16 @@ CONFIG_RX65N_EMAC0_PHYSR_10HD=0x04 CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG=y CONFIG_RX65N_EMAC0_PHYSR_ALTMODE=0x1c CONFIG_RX65N_EMAC0_RMII=y -CONFIG_RX65N_EMAC0_PHYADDR=0 -CONFIG_SCHED_WORKQUEUE=y +CONFIG_RX65N_SCI0=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_LPWORK=y +CONFIG_SCI1_SERIAL_CONSOLE=y +CONFIG_SCI5_BAUD=921600 CONFIG_SDCLONE_DISABLE=y -CONFIG_SYSTEM_PING=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_PRIORITY=50 +CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_IDLETHREAD_STACKSIZE=1024 -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_REGISTER=y -CONFIG_NET_ETH_PKTSIZE = 590 -CONFIG_RX65N_CMTW0=y -CONFIG_RX65N_PERIB=y -CONFIG_NETUTILS_DHCPC=y -CONFIG_NETUTILS_DHCPD=y -CONFIG_NSH_DHCPC=y -CONFIG_NETINIT_DHCPC=y -CONFIG_SYSTEM_NSH_PRIORITY=50 -CONFIG_EXAMPLES_SERIALBLASTER=y -CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE=2048 -CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY=50 -CONFIG_EXAMPLES_SERIALBLASTER_DEVPATH="/dev/ttyS2" -CONFIG_EXAMPLES_SERIALRX=y -CONFIG_EXAMPLES_SERIALRX_STACKSIZE=2048 -CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 -CONFIG_EXAMPLES_SERIALRX_BUFSIZE=11520 -CONFIG_EXAMPLES_SERIALRX_DEVPATH="/dev/ttyS0" -CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y \ No newline at end of file +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig index 1f4548975098a..32883e5f2bbf6 100644 --- a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig @@ -1,21 +1,26 @@ -CONFIG_ARCH_BOARD_RX65N_GRROSE=y +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="rx65n-grrose" +CONFIG_ARCH_BOARD_RX65N_GRROSE=y +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEHDFP=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -CONFIG_ARCH_CHIP="rx65n" CONFIG_BOARD_LOOPSPERMSEC=15001 -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y -CONFIG_NSH_BUILTIN_APPS=y +CONFIG_DEBUG_FEATURES=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -26,29 +31,10 @@ CONFIG_RAM_SIZE=655360 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y CONFIG_RX65N_SCI0=y -CONFIG_RX65N_SCI1=y -CONFIG_RX65N_SCI2=y -CONFIG_RX65N_SCI5=y -CONFIG_RX65N_SCI6=y -CONFIG_RX65N_SCI8=y -CONFIG_SCI0_SERIALDRIVER=y -CONFIG_SCI0_BAUD=115200 CONFIG_SCI1_SERIAL_CONSOLE=y -CONFIG_SCI1_SERIALDRIVER=y -CONFIG_SCI1_BAUD=115200 -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_BAUD=115200 -CONFIG_SCI5_SERIALDRIVER=y -CONFIG_SCI5_BAUD=115200 -CONFIG_SCI6_SERIALDRIVER=y -CONFIG_SCI6_BAUD=115200 -CONFIG_SCI8_SERIALDRIVER=y -CONFIG_SCI8_BAUD=115200 CONFIG_SDCLONE_DISABLE=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_IDLETHREAD_STACKSIZE=1024 - +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig index 3f2b552effa19..49206a585d223 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig @@ -1,50 +1,44 @@ -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_RX65N=y -#CONFIG_ARCH_BOARD_RX65N_RSK1MB=y -CONFIG_ARCH_BOARD="rx65n" +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="renesas" +CONFIG_ARCH_BOARD="rx65n-rsk1mb" +CONFIG_ARCH_BOARD_RX65N_RSK1MB=y +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEDDFC=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -#CONFIG_BOARD_LOOPSPERMSEC=572 -#CONFIG_DISABLE_MOUNTPOINT=y -#CONFIG_DISABLE_MQUEUE=y -#CONFIG_DISABLE_POLL=y -#CONFIG_DISABLE_POSIX_TIMERS=y -#CONFIG_DISABLE_PTHREAD=y -#CONFIG_DISABLE_SIGNALS=y -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y +CONFIG_DEBUG_FEATURES=y CONFIG_ETH0_PHY_KSZ8081=y +CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NET=y -#CONFIG_NETDEV_LATEINIT=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETDEV_PHY_IOCTL=y 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_NSH_BUILTIN_APPS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -#CONFIG_NSH_CONSOLE_LOGIN=y +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_PREALLOC_TIMERS=0 @@ -52,22 +46,8 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=655360 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y - -#CONFIG_SCI0_SERIALDRIVER=y -#CONFIG_SCI0_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI0=y -#CONFIG_SCI1_SERIALDRIVER=y -#CONFIG_SCI1_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI1=y -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_SERIAL_CONSOLE=y -CONFIG_RX65N_SCI2=y -#CONFIG_SCI8_SERIALDRIVER=y -#CONFIG_SCI8_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI8=y - -CONFIG_RX65N_EMAC=y CONFIG_RX65N_EMAC0=y +CONFIG_RX65N_EMAC0_PHYADDR=30 CONFIG_RX65N_EMAC0_PHYSR=30 CONFIG_RX65N_EMAC0_PHYSR_100FD=0x6 CONFIG_RX65N_EMAC0_PHYSR_100HD=0x2 @@ -75,28 +55,14 @@ CONFIG_RX65N_EMAC0_PHYSR_10FD=0x5 CONFIG_RX65N_EMAC0_PHYSR_10HD=0x1 CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG=y CONFIG_RX65N_EMAC0_PHYSR_ALTMODE=0x7 -CONFIG_RX65N_EMAC0_MII=y -CONFIG_RX65N_EMAC0_PHYADDR=30 - -CONFIG_SCHED_WORKQUEUE=y +CONFIG_RX65N_SCI2=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_LPWORK=y - +CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SYSTEM_PING=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 - -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_REGISTER=y -CONFIG_NET_ETH_PKTSIZE = 1518 -CONFIG_RX65N_CMT2=y -CONFIG_RX65N_CMT3=y -CONFIG_RX65N_PERIB=y - -#CONFIG_NET_IPv6=y -#CONFIG_NET_ICMPv6=y -#CONFIG_NET_MCASTGROUP=y +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig index 1ba8ca67bfabb..ed2c631ef83d5 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig @@ -1,30 +1,27 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_RX65N=y -#CONFIG_ARCH_BOARD_RX65N_RSK1MB=y -CONFIG_ARCH_BOARD="rx65n" +CONFIG_ARCH="renesas" +CONFIG_ARCH_BOARD="rx65n-rsk1mb" +CONFIG_ARCH_BOARD_RX65N_RSK1MB=y +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEDDFC=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -#CONFIG_BOARD_LOOPSPERMSEC=572 -#CONFIG_DISABLE_MOUNTPOINT=y -#CONFIG_DISABLE_MQUEUE=y -#CONFIG_DISABLE_POLL=y -#CONFIG_DISABLE_POSIX_TIMERS=y -#CONFIG_DISABLE_PTHREAD=y -#CONFIG_DISABLE_SIGNALS=y -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y -CONFIG_NSH_BUILTIN_APPS=y +CONFIG_DEBUG_FEATURES=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -#CONFIG_NSH_CONSOLE_LOGIN=y +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -34,22 +31,11 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y -#CONFIG_SCI0_SERIALDRIVER=y -#CONFIG_SCI0_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI0=y -#CONFIG_SCI1_SERIALDRIVER=y -#CONFIG_SCI1_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI1=y -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_RX65N_SCI2=y -#CONFIG_SCI8_SERIALDRIVER=y -#CONFIG_SCI8_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI8=y +CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_SDCLONE_DISABLE=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 - +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig index e032890a2602a..80aaa83fd707d 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig @@ -1,39 +1,51 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="renesas" +CONFIG_ARCH_BOARD="rx65n-rsk2mb" CONFIG_ARCH_BOARD_RX65N_RSK2MB=y -CONFIG_ARCH_BOARD="rx65n" +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEHDFC=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -CONFIG_ARCH_CHIP="rx65n" CONFIG_BOARD_LOOPSPERMSEC=15001 -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y -CONFIG_ETH0_PHY_DP83620=y +CONFIG_DEBUG_FEATURES=y +CONFIG_EXAMPLES_SERIALBLASTER=y +CONFIG_EXAMPLES_SERIALRX=y +CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y +CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 +CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETDEV_STATISTICS=y +CONFIG_NETINIT_DHCPC=y +CONFIG_NETUTILS_DHCPC=y +CONFIG_NETUTILS_DHCPD=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_NSH_BUILTIN_APPS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -43,13 +55,8 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=655360 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_RX65N_SCI2=y -CONFIG_SCI8_SERIALDRIVER=y -CONFIG_SCI8_SERIAL_CONSOLE=y -CONFIG_RX65N_SCI8=y -CONFIG_RX65N_EMAC=y CONFIG_RX65N_EMAC0=y +CONFIG_RX65N_EMAC0_PHYADDR=30 CONFIG_RX65N_EMAC0_PHYSR=30 CONFIG_RX65N_EMAC0_PHYSR_100FD=0x4 CONFIG_RX65N_EMAC0_PHYSR_100HD=0x0 @@ -57,35 +64,16 @@ CONFIG_RX65N_EMAC0_PHYSR_10FD=0x6 CONFIG_RX65N_EMAC0_PHYSR_10HD=0x2 CONFIG_RX65N_EMAC0_PHYSR_ALTCONFIG=y CONFIG_RX65N_EMAC0_PHYSR_ALTMODE=0x6 -CONFIG_RX65N_EMAC0_MII=y -CONFIG_RX65N_EMAC0_PHYADDR=30 -CONFIG_SCHED_WORKQUEUE=y +CONFIG_RX65N_SCI2=y +CONFIG_RX65N_SCI8=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_LPWORK=y +CONFIG_SCI8_SERIAL_CONSOLE=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SYSTEM_PING=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_PRIORITY=50 +CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_REGISTER=y -CONFIG_NET_ETH_PKTSIZE = 590 -CONFIG_RX65N_CMTW0=y -CONFIG_RX65N_PERIB=y -CONFIG_NETUTILS_DHCPC=y -CONFIG_NETUTILS_DHCPD=y -CONFIG_NSH_DHCPC=y -CONFIG_NETINIT_DHCPC=y -CONFIG_SYSTEM_NSH_PRIORITY=50 -CONFIG_EXAMPLES_SERIALBLASTER=y -CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE=2048 -CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY=50 -CONFIG_EXAMPLES_SERIALBLASTER_DEVPATH="/dev/ttyS2" -CONFIG_EXAMPLES_SERIALRX=y -CONFIG_EXAMPLES_SERIALRX_STACKSIZE=2048 -CONFIG_EXAMPLES_SERIALRX_PRIORITY=75 -CONFIG_EXAMPLES_SERIALRX_BUFSIZE=11520 -CONFIG_EXAMPLES_SERIALRX_DEVPATH="/dev/ttyS0" -CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y \ No newline at end of file +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig index 0258e8902421d..ba409e5a03640 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig @@ -1,29 +1,27 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +CONFIG_ARCH="renesas" +CONFIG_ARCH_BOARD="rx65n-rsk2mb" CONFIG_ARCH_BOARD_RX65N_RSK2MB=y -CONFIG_ARCH_BOARD="rx65n" +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEHDFC=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -#CONFIG_BOARD_LOOPSPERMSEC=572 -#CONFIG_DISABLE_MOUNTPOINT=y -#CONFIG_DISABLE_MQUEUE=y -#CONFIG_DISABLE_POLL=y -#CONFIG_DISABLE_POSIX_TIMERS=y -#CONFIG_DISABLE_PTHREAD=y -#CONFIG_DISABLE_SIGNALS=y -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 -CONFIG_DEBUG_FEATURES=y -CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_BUILTIN=y -CONFIG_NSH_BUILTIN_APPS=y +CONFIG_DEBUG_FEATURES=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -#CONFIG_NSH_CONSOLE_LOGIN=y +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -33,22 +31,12 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=655360 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y -#CONFIG_SCI0_SERIALDRIVER=y -#CONFIG_SCI0_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI0=y -#CONFIG_SCI1_SERIALDRIVER=y -#CONFIG_SCI1_SERIAL_CONSOLE=y -#CONFIG_RX65N_SCI1=y -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_RX65N_SCI2=y -CONFIG_SCI8_SERIALDRIVER=y -#CONFIG_SCI8_SERIAL_CONSOLE=y CONFIG_RX65N_SCI8=y +CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_SDCLONE_DISABLE=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 - +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig index 78f269d53814f..7a33b3ad05d30 100644 --- a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig +++ b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig @@ -1,20 +1,26 @@ -CONFIG_ARCH_BOARD_RX65N=y +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="rx65n" +CONFIG_ARCH_BOARD_RX65N=y +CONFIG_ARCH_CHIP="rx65n" CONFIG_ARCH_CHIP_R5F565NEDDFC=y +CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" -CONFIG_MOTOROLA_SREC=y -CONFIG_ENDIAN_LITTLE=y -CONFIG_SYSTEM_NSH=y -CONFIG_MAX_TASKS=8 +CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_SYMBOLS=y -CONFIG_ARCH_INTERRUPTSTACK=1024 -CONFIG_BUILTIN=y -CONFIG_NSH_BUILTIN_APPS=y +CONFIG_MAX_TASKS=8 +CONFIG_MOTOROLA_SREC=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -24,13 +30,11 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x00000000 CONFIG_RAW_BINARY=y -CONFIG_SCI2_SERIALDRIVER=y -CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_RX65N_SCI2=y +CONFIG_SCI2_SERIAL_CONSOLE=y CONFIG_SDCLONE_DISABLE=y -CONFIG_ICU=y CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 - +CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/renesas/sh7032/drivers/Kconfig b/boards/renesas/sh1/drivers/Kconfig similarity index 100% rename from boards/renesas/sh7032/drivers/Kconfig rename to boards/renesas/sh1/drivers/Kconfig diff --git a/boards/renesas/sh7032/us7032evb1/Kconfig b/boards/renesas/sh1/us7032evb1/Kconfig similarity index 100% rename from boards/renesas/sh7032/us7032evb1/Kconfig rename to boards/renesas/sh1/us7032evb1/Kconfig diff --git a/boards/renesas/sh7032/us7032evb1/README.txt b/boards/renesas/sh1/us7032evb1/README.txt similarity index 98% rename from boards/renesas/sh7032/us7032evb1/README.txt rename to boards/renesas/sh1/us7032evb1/README.txt index a424459ba2214..06346128820ac 100644 --- a/boards/renesas/sh7032/us7032evb1/README.txt +++ b/boards/renesas/sh1/us7032evb1/README.txt @@ -114,7 +114,7 @@ Architecture selection implemented in. CONFIG_ARCH_BOARD - identifies the boards/ subdirectory and, hence, the board that supports the particular chip or SoC. This - should be us7032evb1 for (boards/renesas/sh7032/us7032evb1). + should be us7032evb1 for (boards/renesas/sh1/us7032evb1). CONFIG_ARCH_BOARD_US7032EVB1 - for use in C code CONFIG_ENDIAN_BIG - the SH-1 usually runs big-endian CONFIG_ARCH_NOINTC - define if the architecture does not diff --git a/boards/renesas/sh7032/us7032evb1/bin/.gitignore b/boards/renesas/sh1/us7032evb1/bin/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/bin/.gitignore rename to boards/renesas/sh1/us7032evb1/bin/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig similarity index 98% rename from boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig rename to boards/renesas/sh1/us7032evb1/configs/nsh/defconfig index b177ce2cdc3cd..12f894d235b12 100644 --- a/boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig @@ -7,21 +7,20 @@ # # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_US7032EVB1=y +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="us7032evb1" +CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ARCH_BUTTONS=y -iCONFIG_ARCH_CHIP="sh7032" +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" CONFIG_BOARD_LOOPSPERMSEC=572 CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_ENDIAN_BIG=y -CONFIG_SYSTEM_NSH=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y @@ -45,7 +44,8 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig similarity index 98% rename from boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig rename to boards/renesas/sh1/us7032evb1/configs/ostest/defconfig index 226b23ab924c4..0e934c46dd1a5 100644 --- a/boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="us7032evb1" CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP="sh7032" +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script b/boards/renesas/sh1/us7032evb1/configs/ostest/ld.script similarity index 100% rename from boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script rename to boards/renesas/sh1/us7032evb1/configs/ostest/ld.script diff --git a/boards/renesas/sh7032/us7032evb1/include/board.h b/boards/renesas/sh1/us7032evb1/include/board.h similarity index 98% rename from boards/renesas/sh7032/us7032evb1/include/board.h rename to boards/renesas/sh1/us7032evb1/include/board.h index b5bd5aabadb2f..bc7b686bc79e6 100644 --- a/boards/renesas/sh7032/us7032evb1/include/board.h +++ b/boards/renesas/sh1/us7032evb1/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/include/board.h + * boards/renesas/sh1/us7032evb1/include/board.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs b/boards/renesas/sh1/us7032evb1/scripts/Make.defs similarity index 98% rename from boards/renesas/sh7032/us7032evb1/scripts/Make.defs rename to boards/renesas/sh1/us7032evb1/scripts/Make.defs index 0b46705f43c6e..3843aa080ee75 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs +++ b/boards/renesas/sh1/us7032evb1/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################## -# boards/renesas/sh7032/us7032evb1/scripts/Make.defs +# boards/renesas/sh1/us7032evb1/scripts/Make.defs # # Copyright (C) 2008, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld b/boards/renesas/sh1/us7032evb1/scripts/sram.ld similarity index 98% rename from boards/renesas/sh7032/us7032evb1/scripts/sram.ld rename to boards/renesas/sh1/us7032evb1/scripts/sram.ld index b6b16c6746ddc..0eaaf76180694 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld +++ b/boards/renesas/sh1/us7032evb1/scripts/sram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/nsh/ld.script + * boards/renesas/sh1/us7032evb1/nsh/ld.script * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/.gitignore b/boards/renesas/sh1/us7032evb1/shterm/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/shterm/.gitignore rename to boards/renesas/sh1/us7032evb1/shterm/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/shterm/Makefile b/boards/renesas/sh1/us7032evb1/shterm/Makefile similarity index 97% rename from boards/renesas/sh7032/us7032evb1/shterm/Makefile rename to boards/renesas/sh1/us7032evb1/shterm/Makefile index 77607641092fc..2ac73f9e5bcbf 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/Makefile +++ b/boards/renesas/sh1/us7032evb1/shterm/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/sh7032/us7032evb1/shterm/Makefile +# boards/renesas/sh1/us7032evb1/shterm/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c b/boards/renesas/sh1/us7032evb1/shterm/shterm.c similarity index 99% rename from boards/renesas/sh7032/us7032evb1/shterm/shterm.c rename to boards/renesas/sh1/us7032evb1/shterm/shterm.c index ed47edfcf9009..2ecfcd4761d32 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c +++ b/boards/renesas/sh1/us7032evb1/shterm/shterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/shterm/shterm.c + * boards/renesas/sh1/us7032evb1/shterm/shterm.c * * Copyright(C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/.gitignore b/boards/renesas/sh1/us7032evb1/src/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/src/.gitignore rename to boards/renesas/sh1/us7032evb1/src/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/src/Makefile b/boards/renesas/sh1/us7032evb1/src/Makefile similarity index 98% rename from boards/renesas/sh7032/us7032evb1/src/Makefile rename to boards/renesas/sh1/us7032evb1/src/Makefile index 94c9585932c38..fa201c031af1a 100644 --- a/boards/renesas/sh7032/us7032evb1/src/Makefile +++ b/boards/renesas/sh1/us7032evb1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/sh7032/us7032evb1/src/Makefile +# boards/renesas/sh1/us7032evb1/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c similarity index 98% rename from boards/renesas/sh7032/us7032evb1/src/sh1_leds.c rename to boards/renesas/sh1/us7032evb1/src/sh1_leds.c index 7ac844dca3586..7f11eb366d9f5 100644 --- a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c +++ b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/src/sh1_leds.c + * boards/renesas/sh1/us7032evb1/src/sh1_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/risc-v/k210/maix-bit/configs/smp/defconfig b/boards/risc-v/k210/maix-bit/configs/smp/defconfig index c275c499277e7..ea3ecde537d4a 100644 --- a/boards/risc-v/k210/maix-bit/configs/smp/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/smp/defconfig @@ -60,7 +60,6 @@ CONFIG_SMP_NCPUS=2 CONFIG_SPINLOCK_IRQ=y CONFIG_STACK_COLORATION=y CONFIG_START_DAY=8 -CONFIG_START_MONTH=1 CONFIG_START_YEAR=2020 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TASKSET=y diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig index 2c080c0bd869c..56f39bf0dcd4d 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig @@ -9,21 +9,19 @@ # CONFIG_NSH_DISABLE_LOSMART is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_STANDARD_SERIAL is not set -CONFIG_ARCH_BOARD_NR5M100_NEXYS4=y +CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD="nr5m100-nexys4" +CONFIG_ARCH_BOARD_NR5M100_NEXYS4=y CONFIG_ARCH_CHIP="nr5m100" CONFIG_ARCH_CHIP_NR5=y CONFIG_ARCH_CHIP_NR5M100=y CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="risc-v" CONFIG_BOARD_LOOPSPERMSEC=15000 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y -CONFIG_SYSTEM_NSH_CXXINITIALIZE=y -CONFIG_SYSTEM_NSH=y CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -56,6 +54,8 @@ CONFIG_RV32IM_SYSTEM_CSRRS_SUPPORT=y CONFIG_START_DAY=27 CONFIG_START_YEAR=2013 CONFIG_SYSLOG_NONE=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NSH_CXXINITIALIZE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/sim/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig index de6a6dd690353..0e5f12cfad450 100644 --- a/boards/sim/sim/sim/configs/userfs/defconfig +++ b/boards/sim/sim/sim/configs/userfs/defconfig @@ -54,7 +54,6 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PTHREAD_STACK_DEFAULT=8192 CONFIG_READLINE_TABCOMPLETION=y CONFIG_SCHED_HAVE_PARENT=y -CONFIG_SCHED_LPWORK=y CONFIG_SCHED_ONEXIT=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y diff --git a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig index 3273c7d26b14f..98d8b24a7233a 100644 --- a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig +++ b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig @@ -9,23 +9,22 @@ # CONFIG_NSH_DISABLE_PS is not set CONFIG_16550_ADDRWIDTH=16 CONFIG_16550_SUPRESS_CONFIG=y -CONFIG_16550_UART=y +CONFIG_16550_UART0=y CONFIG_16550_UART0_BASE=0x3f8 CONFIG_16550_UART0_BAUD=57600 CONFIG_16550_UART0_CLOCK=16000000 CONFIG_16550_UART0_IRQ=4 CONFIG_16550_UART0_SERIAL_CONSOLE=y -CONFIG_16550_UART0=y -CONFIG_ARCH_BOARD_QEMU_I486=y +CONFIG_16550_UART=y +CONFIG_ARCH="x86" CONFIG_ARCH_BOARD="qemu-i486" +CONFIG_ARCH_BOARD_QEMU_I486=y CONFIG_ARCH_CHIP="qemu" CONFIG_ARCH_CHIP_QEMU=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_X86=y -CONFIG_ARCH="x86" CONFIG_BOARD_LOOPSPERMSEC=999 CONFIG_BOOT_RUNFROMEXTSRAM=y -CONFIG_SYSTEM_NSH=y CONFIG_FS_FAT=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 @@ -41,4 +40,5 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 +CONFIG_SYSTEM_NSH=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/z16/z16f2811/drivers/Kconfig b/boards/z16/z16f/drivers/Kconfig similarity index 100% rename from boards/z16/z16f2811/drivers/Kconfig rename to boards/z16/z16f/drivers/Kconfig diff --git a/boards/z16/z16f2811/z16f2800100zcog/Kconfig b/boards/z16/z16f/z16f2800100zcog/Kconfig similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/Kconfig rename to boards/z16/z16f/z16f2800100zcog/Kconfig diff --git a/boards/z16/z16f2811/z16f2800100zcog/README.txt b/boards/z16/z16f/z16f2800100zcog/README.txt similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/README.txt rename to boards/z16/z16f/z16f2800100zcog/README.txt index 67d667aff0b6c..cbe9a362dacd3 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/README.txt +++ b/boards/z16/z16f/z16f2800100zcog/README.txt @@ -105,7 +105,7 @@ Other Versions If you use any version of ZDS-II or if you install ZDS-II at any location other than the default location, you will have to modify arch/z16/src/z16f/Kconfig and - boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs. + boards/z16/z16f/z16f2800100zcog/scripts/Make.defs. Simply edit that file, changing 5.0.1 to whatever. Patches @@ -128,7 +128,7 @@ attempt to recover the parameters from the stack and a failure then follows. This bug prevents the use of NSH with the ZNEO. However, a patch has been developed that works around the problem. That patch can be found at -boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch. +boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch. In that directory is also a bash script that will apply that patch for you. The patch would be applied when NuttX is configured as follows: diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore b/boards/z16/z16f/z16f2800100zcog/configs/nsh/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt b/boards/z16/z16f/z16f2800100zcog/configs/nsh/README.txt similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/README.txt diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig similarity index 93% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig index 4d8fb29fa927a..d49a38a1f53af 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig @@ -6,23 +6,20 @@ # modifications. # # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y +CONFIG_ARCH="z16" CONFIG_ARCH_BOARD="z16f2800100zcog" -CONFIG_ARCH_CHIP="z16f2811" -CONFIG_ARCH_CHIP_Z16F=y +CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y +CONFIG_ARCH_CHIP="z16f" CONFIG_ARCH_CHIP_Z16F2811=y +CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_Z16=y -CONFIG_ARCH="z16" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_BUILTIN=y CONFIG_ENDIAN_BIG=y -CONFIG_SYSTEM_NSH=y -CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 @@ -39,6 +36,7 @@ CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_YEAR=2014 +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_UART0_BAUD=57600 diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj b/boards/z16/z16f/z16f2800100zcog/configs/nsh/nsh.zfpproj similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/nsh.zfpproj diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore b/boards/z16/z16f/z16f2800100zcog/configs/ostest/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt b/boards/z16/z16f/z16f2800100zcog/configs/ostest/README.txt similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/README.txt diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig index a821996536bab..cc25cf3a721c0 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig @@ -5,13 +5,13 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y +CONFIG_ARCH="z16" CONFIG_ARCH_BOARD="z16f2800100zcog" -CONFIG_ARCH_CHIP="z16f2811" -CONFIG_ARCH_CHIP_Z16F=y +CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y +CONFIG_ARCH_CHIP="z16f" CONFIG_ARCH_CHIP_Z16F2811=y +CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_Z16=y -CONFIG_ARCH="z16" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_ENDIAN_BIG=y @@ -36,6 +36,6 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj b/boards/z16/z16f/z16f2800100zcog/configs/ostest/ostest.zfpproj similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/ostest.zfpproj diff --git a/boards/z16/z16f2811/z16f2800100zcog/include/board.h b/boards/z16/z16f/z16f2800100zcog/include/board.h similarity index 99% rename from boards/z16/z16f2811/z16f2800100zcog/include/board.h rename to boards/z16/z16f/z16f2800100zcog/include/board.h index 6a23819cd6b13..5b02fde74e0d4 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/include/board.h +++ b/boards/z16/z16f/z16f2800100zcog/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16/z16f2811/z16f2800100zcog/board.h + * boards/z16/z16f/z16f2800100zcog/board.h * * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs similarity index 99% rename from boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs rename to boards/z16/z16f/z16f2800100zcog/scripts/Make.defs index 2c4895a52edd0..daae12b654a45 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs +++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs +# boards/z16/z16f/z16f2800100zcog/scripts/Make.defs # # Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd rename to boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd index 72a6036d9ad93..edb9533f04746 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd +++ b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ +/* boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ /* */ /* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/.gitignore b/boards/z16/z16f/z16f2800100zcog/src/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/src/.gitignore rename to boards/z16/z16f/z16f2800100zcog/src/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile b/boards/z16/z16f/z16f2800100zcog/src/Makefile similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/src/Makefile rename to boards/z16/z16f/z16f2800100zcog/src/Makefile index 26733d1f6d027..f877d62d1a6be 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile +++ b/boards/z16/z16f/z16f2800100zcog/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z16/z16f2811/z16f2800100zcog/Makefile +# boards/z16/z16f/z16f2800100zcog/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c rename to boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c index 4b079c217c6ba..3024ad13b94c8 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c +++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c + * boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c * * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c rename to boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c index f7d32fafdfc3b..255a1320c2b12 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c +++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16/z16f2811/z16f2800100zcog/z16f_leds.c + * boards/z16/z16f/z16f2800100zcog/z16f_leds.c * * Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh rename to boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh index 78e5bddfe13cf..e7ad5a10d4912 100755 --- a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh +++ b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash ############################################################################ -# boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh +# boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch rename to boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch diff --git a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig index 5ed7e77f68084..ea048617147fe 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig @@ -6,14 +6,14 @@ # modifications. # # CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set -CONFIG_ARCH_BOARD_EZ80F910200ZCO=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="ez80f910200zco" +CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_TIMERHOOK=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y @@ -21,23 +21,23 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_AM79C874=y +CONFIG_EXAMPLES_DHCPD=y CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001 CONFIG_EXAMPLES_DHCPD_NOMAC=y -CONFIG_EXAMPLES_DHCPD=y CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_RAMADDR=0xf7c000 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 +CONFIG_NET=y +CONFIG_NETUTILS_DHCPD=y +CONFIG_NETUTILS_NETLIB=y CONFIG_NET_BROADCAST=y CONFIG_NET_ICMP=y CONFIG_NET_SOCKOPTS=y -CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETUTILS_DHCPD=y -CONFIG_NETUTILS_NETLIB=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 @@ -57,6 +57,6 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="dhcpd_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="dhcpd_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index 018f0d614ce80..076bdbd25075c 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -5,14 +5,14 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ARCH_BOARD_EZ80F910200ZCO=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="ez80f910200zco" +CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_TIMERHOOK=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y @@ -26,16 +26,16 @@ CONFIG_EZ80_RAMADDR=0xf7c000 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 +CONFIG_NET=y +CONFIG_NETUTILS_NETLIB=y +CONFIG_NETUTILS_WEBSERVER=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=16 CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y -CONFIG_NET=y -CONFIG_NETUTILS_NETLIB=y -CONFIG_NETUTILS_WEBSERVER=y +CONFIG_NET_TCP_CONNS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NPTHREAD_KEYS=0 @@ -56,6 +56,6 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="webserver_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="webserver_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig index cf09963f0d526..fedd8f819b40b 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig @@ -5,14 +5,14 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ARCH_BOARD_EZ80F910200ZCO=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="ez80f910200zco" +CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_TIMERHOOK=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y @@ -20,20 +20,20 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_AM79C874=y -CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_NETTEST=y +CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_RAMADDR=0xf7c000 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 +CONFIG_NET=y +CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y -CONFIG_NET=y -CONFIG_NETUTILS_NETLIB=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 @@ -53,6 +53,6 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="nettest_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nettest_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig index 2488a3f049e9b..dae7dbf52daa8 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig @@ -5,35 +5,35 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -CONFIG_ARCH_BOARD_EZ80F910200ZCO=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="ez80f910200zco" +CONFIG_ARCH_BOARD_EZ80F910200ZCO=y CONFIG_ARCH_CHIP="ez80" CONFIG_ARCH_CHIP_EZ80=y CONFIG_ARCH_CHIP_EZ80F91=y CONFIG_ARCH_TIMERHOOK=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_ETH0_PHY_AM79C874=y -CONFIG_EXAMPLES_POLL_NOMAC=y CONFIG_EXAMPLES_POLL=y +CONFIG_EXAMPLES_POLL_NOMAC=y CONFIG_EZ80_EMAC=y CONFIG_EZ80_PHYCONFIG=1 CONFIG_EZ80_RAMADDR=0xf7c000 CONFIG_EZ80_UART0=y CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=8 +CONFIG_NET=y +CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=8 CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y -CONFIG_NET=y -CONFIG_NETUTILS_NETLIB=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NPTHREAD_KEYS=0 @@ -55,6 +55,6 @@ CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="poll_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="poll_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/z180/p112/configs/ostest/defconfig b/boards/z80/z180/p112/configs/ostest/defconfig index a94f971a84b67..f6fc4dc2b254e 100644 --- a/boards/z80/z180/p112/configs/ostest/defconfig +++ b/boards/z80/z180/p112/configs/ostest/defconfig @@ -6,14 +6,14 @@ # modifications. # # CONFIG_DEV_CONSOLE is not set -CONFIG_ARCH_BOARD_P112=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="p112" +CONFIG_ARCH_BOARD_P112=y CONFIG_ARCH_CHIP="z180" CONFIG_ARCH_CHIP_Z180=y -CONFIG_ARCH_CHIP_Z80182=y CONFIG_ARCH_CHIP_Z8018216FSG=y +CONFIG_ARCH_CHIP_Z80182=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y @@ -37,11 +37,11 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=4 CONFIG_TESTING_OSTEST_STACKSIZE=1024 -CONFIG_TESTING_OSTEST=y -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 CONFIG_WINDOWS_NATIVE=y CONFIG_Z180_ESCCA=y diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig index 3a647c4bb28b2..44f3cd2abd8d8 100644 --- a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig +++ b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig @@ -6,14 +6,14 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -CONFIG_ARCH_BOARD_Z8ENCORE000ZCO=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="z8encore000zco" +CONFIG_ARCH_BOARD_Z8ENCORE000ZCO=y CONFIG_ARCH_CHIP="z8" CONFIG_ARCH_CHIP_Z8=y CONFIG_ARCH_CHIP_Z8F6403=y CONFIG_ARCH_CHIP_Z8F640X=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEFAULT_SMALL=y CONFIG_DEV_LOWCONSOLE=y @@ -38,8 +38,8 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2012 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TESTING_OSTEST_STACKSIZE=256 CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_STACKSIZE=256 CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y @@ -47,7 +47,7 @@ CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART1_BAUD=57600 CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=256 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig index f5a9fb3d25163..138f081c35407 100644 --- a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig +++ b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig @@ -6,14 +6,14 @@ # modifications. # # CONFIG_ARCH_LEDS is not set -CONFIG_ARCH_BOARD_Z8F64200100KIT=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="z8f64200100kit" +CONFIG_ARCH_BOARD_Z8F64200100KIT=y CONFIG_ARCH_CHIP="z8" CONFIG_ARCH_CHIP_Z8=y CONFIG_ARCH_CHIP_Z8F6423=y CONFIG_ARCH_CHIP_Z8F642X=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y @@ -37,8 +37,8 @@ CONFIG_START_MONTH=2 CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_TESTING_OSTEST_STACKSIZE=256 CONFIG_TESTING_OSTEST=y +CONFIG_TESTING_OSTEST_STACKSIZE=256 CONFIG_UART0_BAUD=57600 CONFIG_UART0_RXBUFSIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y @@ -46,7 +46,7 @@ CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART1_BAUD=57600 CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 -CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_USERMAIN_STACKSIZE=256 +CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WDOG_INTRESERVE=0 CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z80/z80sim/configs/nsh/defconfig b/boards/z80/z80/z80sim/configs/nsh/defconfig index 6640df86d4164..e73d74031a672 100644 --- a/boards/z80/z80/z80sim/configs/nsh/defconfig +++ b/boards/z80/z80/z80sim/configs/nsh/defconfig @@ -5,6 +5,8 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -17,20 +19,17 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_Z80SIM=y +CONFIG_ARCH="z80" CONFIG_ARCH_BOARD="z80sim" +CONFIG_ARCH_BOARD_Z80SIM=y CONFIG_ARCH_CHIP="z80" CONFIG_ARCH_CHIP_Z80=y CONFIG_ARCH_Z80=y -CONFIG_ARCH="z80" CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y -CONFIG_SYSTEM_NSH=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=6 @@ -48,9 +47,10 @@ CONFIG_START_DAY=7 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2012 CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/drivers/lcd/README.txt b/drivers/lcd/README.txt index 28f8658fdfd76..021904ca83b2c 100644 --- a/drivers/lcd/README.txt +++ b/drivers/lcd/README.txt @@ -233,7 +233,7 @@ interface) that makes then less re-usable: Alphnumeric/segment LCD Displays: - boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c. Untested alphanumeric + boards/renesas/m16c/skp16c26/src/m16c_lcd.c. Untested alphanumeric LCD driver. boards/mips/pic32mx/sure-pic32mx/src/pic32_lcd1602.c. An LCD1602 segment LCD. This is a bit-bang version of the driver and appears to diff --git a/tools/refresh.sh b/tools/refresh.sh index 6f1f495c9b8de..e08e96326f607 100755 --- a/tools/refresh.sh +++ b/tools/refresh.sh @@ -37,7 +37,7 @@ WD=`test -d ${0%/*} && cd ${0%/*}; pwd` USAGE="USAGE: $0 [options] :" ADVICE="Try '$0 --help' for more information" -unset CONFIG +unset CONFIGS silent=n defaults=n prompt=y @@ -80,40 +80,17 @@ while [ ! -z "$1" ]; do echo " The board directory under nuttx/boards" echo " " echo " The board configuration directory under nuttx/boards//configs" + echo " Note: all configuration is refreshed if : equals all." exit 0 ;; * ) - CONFIG=$1 + CONFIGS=$1 break ;; esac shift done -# Get the board configuration - -if [ -z "${CONFIG}" ]; then - echo "ERROR: No configuration provided" - echo $USAGE - echo $ADVICE - exit 1 -fi - -CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d':' -f2` -if [ -z "${CONFIGSUBDIR}" ]; then - CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d'/' -f2` - if [ -z "${CONFIGSUBDIR}" ]; then - echo "ERROR: Malformed configuration: ${CONFIG}" - echo $USAGE - echo $ADVICE - exit 1 - else - BOARDSUBDIR=`echo ${CONFIG} | cut -d'/' -f1` - fi -else - BOARDSUBDIR=`echo ${CONFIG} | cut -d':' -f1` -fi - # Where are we MYNAME=`basename $0` @@ -127,15 +104,7 @@ if [ ! -x tools/${MYNAME} ] ; then exit 1 fi -# Set up the environment - -BOARDDIR=boards/*/*/$BOARDSUBDIR -SCRIPTSDIR=$BOARDDIR/scripts -MAKEDEFS1=$SCRIPTSDIR/Make.defs - -CONFIGDIR=$BOARDDIR/configs/$CONFIGSUBDIR -DEFCONFIG=$CONFIGDIR/defconfig -MAKEDEFS2=$CONFIGDIR/Make.defs +# If the cmpconfig executable does not exist, then build it CMPCONFIG_TARGET=cmpconfig CMPCONFIG1=tools/cmpconfig @@ -143,36 +112,6 @@ CMPCONFIG2=tools/cmpconfig.exe CMPCONFIGMAKEFILE=Makefile.host CMPCONFIGMAKEDIR=tools -# Check the board configuration directory - -if [ ! -d $BOARDDIR ]; then - echo "No board directory found at $BOARDDIR" - exit 1 -fi - -if [ ! -d $CONFIGDIR ]; then - echo "No configuration directory found at $CONFIGDIR" - exit 1 -fi - -if [ ! -r $DEFCONFIG ]; then - echo "No readable defconfig file at $DEFCONFIG" - exit 1 -fi - -if [ -r $MAKEDEFS1 ]; then - MAKEDEFS=$MAKEDEFS1 -else - if [ -r $MAKEDEFS2 ]; then - MAKEDEFS=$MAKEDEFS2 - else - echo "No readable Make.defs file at $MAKEDEFS1 or $MAKEDEFS2" - exit 1 - fi -fi - -# If the cmpconfig executable does not exist, then build it - if [ -x ${CMPCONFIG1} ]; then CMPCONFIG=${CMPCONFIG1} else @@ -195,70 +134,140 @@ else fi fi -# Copy the .config and Make.defs to the toplevel directory +# Get the board configuration + +if [ -z "${CONFIGS}" ]; then + echo "ERROR: No configuration provided" + echo $USAGE + echo $ADVICE + exit 1 +fi -rm -f SAVEconfig -if [ -e .config ]; then - mv .config SAVEconfig || \ - { echo "ERROR: Failed to move .config to SAVEconfig"; exit 1; } +if [ "X${CONFIGS}" == "Xall" ]; then + CONFIGS=`find boards -name defconfig | cut -d'/' -f4,6` fi -cp -a $DEFCONFIG .config || \ - { echo "ERROR: Failed to copy $DEFCONFIG to .config"; exit 1; } +for CONFIG in ${CONFIGS}; do + echo "Refresh ${CONFIG}" -rm -f SAVEMake.defs -if [ -e Make.defs ]; then - mv Make.defs SAVEMake.defs || \ - { echo "ERROR: Failed to move Make.defs to SAVEMake.defs"; exit 1; } -fi + # Set up the environment -cp -a $MAKEDEFS Make.defs || \ - { echo "ERROR: Failed to copy $MAKEDEFS to Make.defs"; exit 1; } + CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d':' -f2` + if [ -z "${CONFIGSUBDIR}" ]; then + CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d'/' -f2` + if [ -z "${CONFIGSUBDIR}" ]; then + echo "ERROR: Malformed configuration: ${CONFIG}" + echo $USAGE + echo $ADVICE + exit 1 + else + BOARDSUBDIR=`echo ${CONFIG} | cut -d'/' -f1` + fi + else + BOARDSUBDIR=`echo ${CONFIG} | cut -d':' -f1` + fi -# Then run oldconfig or oldefconfig + BOARDDIR=boards/*/*/$BOARDSUBDIR + SCRIPTSDIR=$BOARDDIR/scripts + MAKEDEFS1=$SCRIPTSDIR/Make.defs -if [ "X${defaults}" == "Xy" ]; then - make olddefconfig -else - make oldconfig -fi + CONFIGDIR=$BOARDDIR/configs/$CONFIGSUBDIR + DEFCONFIG=$CONFIGDIR/defconfig + MAKEDEFS2=$CONFIGDIR/Make.defs -# Run savedefconfig to create the new defconfig file + # Check the board configuration directory -make savedefconfig + if [ ! -d $BOARDDIR ]; then + echo "No board directory found at $BOARDDIR" + exit 1 + fi -# Show differences + if [ ! -d $CONFIGDIR ]; then + echo "No configuration directory found at $CONFIGDIR" + exit 1 + fi + + if [ ! -r $DEFCONFIG ]; then + echo "No readable defconfig file at $DEFCONFIG" + exit 1 + fi -# sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" defconfig -$CMPCONFIG $DEFCONFIG defconfig + if [ -r $MAKEDEFS1 ]; then + MAKEDEFS=$MAKEDEFS1 + else + if [ -r $MAKEDEFS2 ]; then + MAKEDEFS=$MAKEDEFS2 + else + echo "No readable Make.defs file at $MAKEDEFS1 or $MAKEDEFS2" + exit 1 + fi + fi + + # Copy the .config and Make.defs to the toplevel directory + + rm -f SAVEconfig + if [ -e .config ]; then + mv .config SAVEconfig || \ + { echo "ERROR: Failed to move .config to SAVEconfig"; exit 1; } + fi -# Save the refreshed configuration + cp -a $DEFCONFIG .config || \ + { echo "ERROR: Failed to copy $DEFCONFIG to .config"; exit 1; } -if [ "X${prompt}" == "Xy" ]; then - read -p "Save the new configuration (y/n)?" -n 1 -r - echo - if [[ $REPLY =~ ^[Yy]$ ]] - then + rm -f SAVEMake.defs + if [ -e Make.defs ]; then + mv Make.defs SAVEMake.defs || \ + { echo "ERROR: Failed to move Make.defs to SAVEMake.defs"; exit 1; } + fi + + cp -a $MAKEDEFS Make.defs || \ + { echo "ERROR: Failed to copy $MAKEDEFS to Make.defs"; exit 1; } + + # Then run oldconfig or oldefconfig + + if [ "X${defaults}" == "Xy" ]; then + make olddefconfig + else + make oldconfig + fi + + # Run savedefconfig to create the new defconfig file + + make savedefconfig + + # Show differences + + # sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" defconfig + $CMPCONFIG $DEFCONFIG defconfig + + # Save the refreshed configuration + + if [ "X${prompt}" == "Xy" ]; then + read -p "Save the new configuration (y/n)?" -n 1 -r + echo + if [[ $REPLY =~ ^[Yy]$ ]] + then + echo "Saving the new configuration file" + mv defconfig $DEFCONFIG || \ + { echo "ERROR: Failed to move defconfig to $DEFCONFIG"; exit 1; } + chmod 644 $DEFCONFIG + fi + else echo "Saving the new configuration file" mv defconfig $DEFCONFIG || \ { echo "ERROR: Failed to move defconfig to $DEFCONFIG"; exit 1; } chmod 644 $DEFCONFIG fi -else - echo "Saving the new configuration file" - mv defconfig $DEFCONFIG || \ - { echo "ERROR: Failed to move defconfig to $DEFCONFIG"; exit 1; } - chmod 644 $DEFCONFIG -fi -# Restore any previous .config and Make.defs files + # Restore any previous .config and Make.defs files -if [ -e SAVEconfig ]; then - mv SAVEconfig .config || \ - { echo "ERROR: Failed to move SAVEconfig to .config"; exit 1; } -fi + if [ -e SAVEconfig ]; then + mv SAVEconfig .config || \ + { echo "ERROR: Failed to move SAVEconfig to .config"; exit 1; } + fi -if [ -e SAVEMake.defs ]; then - mv SAVEMake.defs Make.defs || \ - { echo "ERROR: Failed to move SAVEMake.defs to Make.defs"; exit 1; } -fi + if [ -e SAVEMake.defs ]; then + mv SAVEMake.defs Make.defs || \ + { echo "ERROR: Failed to move SAVEMake.defs to Make.defs"; exit 1; } + fi +done