[nuttx] branch master updated (045b9ffd54 -> 4650c9f756)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 045b9ffd54 mempool:fix bug read out of bounds when realloc add da4c7703db Documentation: move boards/nrf53 readmes to Documentation add 4650c9f756 Documentation: move boards/nrf52 readmes to Documentation No new revisions were added by this update. Summary of changes: .../arm/nrf52/boards/nrf52-feather/intex.rst | 74 ++ .../arm/nrf52/boards/nrf52832-dk/index.rst | 106 + .../arm/nrf52/boards/nrf52832-sparkfun/index.rst | 4 +- .../arm/nrf52/boards/nrf52840-dk/index.rst | 140 ++ .../arm/nrf52/boards/nrf52840-dongle/index.rst | 63 .../platforms/arm/nrf52/boards/thingy52/index.rst | 57 +++ Documentation/platforms/arm/nrf52/index.rst| 39 - .../arm/nrf53/boards/nrf5340-audio-dk/index.rst| 101 + .../arm/nrf53/boards/nrf5340-dk/index.rst | 164 + .../platforms/arm/nrf53/boards/thingy53/index.rst | 82 +++ .../platforms/arm/{nrf52 => nrf53}/index.rst | 135 + boards/arm/nrf52/nrf52-feather/README.txt | 96 boards/arm/nrf52/nrf52832-dk/README.txt| 107 -- boards/arm/nrf52/nrf52832-sparkfun/README.txt | 5 - boards/arm/nrf52/nrf52840-dk/README.txt| 8 - boards/arm/nrf52/nrf52840-dongle/README.txt| 8 - boards/arm/nrf53/nrf5340-audio-dk/README.txt | 23 --- boards/arm/nrf53/nrf5340-dk/README.txt | 42 -- 18 files changed, 896 insertions(+), 358 deletions(-) create mode 100644 Documentation/platforms/arm/nrf52/boards/nrf52-feather/intex.rst create mode 100644 Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst create mode 100644 Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst create mode 100644 Documentation/platforms/arm/nrf52/boards/nrf52840-dongle/index.rst create mode 100644 Documentation/platforms/arm/nrf52/boards/thingy52/index.rst create mode 100644 Documentation/platforms/arm/nrf53/boards/nrf5340-audio-dk/index.rst create mode 100644 Documentation/platforms/arm/nrf53/boards/nrf5340-dk/index.rst create mode 100644 Documentation/platforms/arm/nrf53/boards/thingy53/index.rst copy Documentation/platforms/arm/{nrf52 => nrf53}/index.rst (50%) delete mode 100644 boards/arm/nrf52/nrf52-feather/README.txt delete mode 100644 boards/arm/nrf52/nrf52832-dk/README.txt delete mode 100644 boards/arm/nrf52/nrf52832-sparkfun/README.txt delete mode 100644 boards/arm/nrf52/nrf52840-dk/README.txt delete mode 100644 boards/arm/nrf52/nrf52840-dongle/README.txt delete mode 100644 boards/arm/nrf53/nrf5340-audio-dk/README.txt delete mode 100644 boards/arm/nrf53/nrf5340-dk/README.txt
[nuttx] branch master updated: arch/nrf53: add SPI support
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 1de1b8adb7 arch/nrf53: add SPI support 1de1b8adb7 is described below commit 1de1b8adb78701a20cdd0bb29b77d3cb4ee07c4a Author: raiden00pl AuthorDate: Mon Mar 13 13:04:09 2023 +0100 arch/nrf53: add SPI support --- arch/arm/src/nrf53/Kconfig | 46 ++ arch/arm/src/nrf53/Make.defs |4 + arch/arm/src/nrf53/nrf53_spi.c | 1500 arch/arm/src/nrf53/nrf53_spi.h | 165 + 4 files changed, 1715 insertions(+) diff --git a/arch/arm/src/nrf53/Kconfig b/arch/arm/src/nrf53/Kconfig index b453a776dc..b720166f91 100644 --- a/arch/arm/src/nrf53/Kconfig +++ b/arch/arm/src/nrf53/Kconfig @@ -27,6 +27,7 @@ config NRF53_APPCORE select NRF53_HAVE_SAADC select NRF53_HAVE_UART1 select NRF53_HAVE_I2C123 + select NRF53_HAVE_SPI1234 config NRF53_NETCORE bool @@ -93,12 +94,20 @@ config NRF53_HAVE_I2C123 bool default n +config NRF53_HAVE_SPI1234 + bool + default n + # Peripheral Selection config NRF53_I2C_MASTER bool default n +config NRF53_SPI_MASTER + bool + default n + config NRF53_IPC bool default y if RPTUN @@ -148,6 +157,43 @@ config NRF53_I2C2_MASTER depends on NRF53_HAVE_I2C123 select NRF53_I2C_MASTER +config NRF53_SPI0_MASTER + bool "SPI0 Master" + default n + select NRF53_SPI_MASTER + +if NRF53_HAVE_SPI1234 + +config NRF53_SPI1_MASTER + bool "SPI1 Master" + default n + select NRF53_SPI_MASTER + +config NRF53_SPI2_MASTER + bool "SPI2 Master" + default n + select NRF53_SPI_MASTER + +config NRF53_SPI3_MASTER + bool "SPI3 Master" + default n + select NRF53_SPI_MASTER + +config NRF53_SPI4_MASTER + bool "SPI4 Master" + default n + select NRF53_SPI_MASTER + +endif # NRF53_HAVE_SPI1234 + +if NRF53_SPI_MASTER + +config NRF53_SPI_MASTER_INTERRUPTS + bool "SPI Master interrupts support" + default n + +endif + config NRF53_UART0 bool "UART0" default n diff --git a/arch/arm/src/nrf53/Make.defs b/arch/arm/src/nrf53/Make.defs index b3f43c16a7..0227178801 100644 --- a/arch/arm/src/nrf53/Make.defs +++ b/arch/arm/src/nrf53/Make.defs @@ -79,6 +79,10 @@ ifeq ($(CONFIG_NRF53_RTC),y) CHIP_CSRCS += nrf53_rtc.c endif +ifeq ($(CONFIG_NRF53_SPI_MASTER),y) +CHIP_CSRCS += nrf53_spi.c +endif + ifeq ($(CONFIG_PM),y) CHIP_CSRCS += nrf53_pminitialize.c endif diff --git a/arch/arm/src/nrf53/nrf53_spi.c b/arch/arm/src/nrf53/nrf53_spi.c new file mode 100644 index 00..1759835e71 --- /dev/null +++ b/arch/arm/src/nrf53/nrf53_spi.c @@ -0,0 +1,1500 @@ +/ + * arch/arm/src/nrf53/nrf53_spi.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + / + +/ + * Included Files + / + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "arm_internal.h" +#include "barriers.h" + +#include "nrf53_gpio.h" +#include "nrf53_spi.h" + +#include "hardware/nrf53_spi.h" + +/ + * Private Types + / + +struct nrf53_spidev_s +{ + struct spi_dev_s spidev; /* Externally visible part of the SPI interface */ + uint32_t base; /* Base address of SPI register */ +#ifdef CONFIG_NRF53_SPI_MASTER_INTERRUPTS + uint32_t irq;/* SPI IRQ number */ +#endif + nrf53_pinset_t sck_pin;
[nuttx] branch master updated (3493ea399f -> 2049ca69b0)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 3493ea399f arch/nrf53: add I2C support add 36acd4fce5 arch/arm64: .bss initialization using assembly language add 2049ca69b0 arch/arm64: Modify ld to ensure that the bss section is aligned to 8 bytes No new revisions were added by this update. Summary of changes: arch/arm64/src/common/arm64_boot.c | 16 -- arch/arm64/src/common/arm64_head.S | 37 ++ boards/arm64/a64/pinephone/scripts/dramboot.ld | 3 +- .../arm64/fvp-v8r/fvp-armv8r/scripts/dramboot.ld | 3 +- boards/arm64/qemu/qemu-armv8a/scripts/dramboot.ld | 3 +- 5 files changed, 43 insertions(+), 19 deletions(-)
[nuttx] 02/02: arch/nrf53: add I2C support
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 3493ea399f950bd34c281643aeb1d8c3bc29d2d1 Author: raiden00pl AuthorDate: Mon Mar 13 13:10:34 2023 +0100 arch/nrf53: add I2C support --- arch/arm/src/nrf53/Kconfig | 59 ++ arch/arm/src/nrf53/Make.defs | 4 + .../src/nrf53/hardware/nrf53_memorymap_cpuapp.h| 12 +- arch/arm/src/nrf53/nrf53_i2c.c | 895 + arch/arm/src/nrf53/nrf53_i2c.h | 73 ++ 5 files changed, 1042 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/nrf53/Kconfig b/arch/arm/src/nrf53/Kconfig index 4cf7b88105..b453a776dc 100644 --- a/arch/arm/src/nrf53/Kconfig +++ b/arch/arm/src/nrf53/Kconfig @@ -26,6 +26,7 @@ config NRF53_APPCORE select NRF52_HAVE_GPIOTE1 select NRF53_HAVE_SAADC select NRF53_HAVE_UART1 + select NRF53_HAVE_I2C123 config NRF53_NETCORE bool @@ -88,8 +89,16 @@ config NRF53_HAVE_SAADC bool default n +config NRF53_HAVE_I2C123 + bool + default n + # Peripheral Selection +config NRF53_I2C_MASTER + bool + default n + config NRF53_IPC bool default y if RPTUN @@ -116,6 +125,29 @@ config NRF53_GPIOTE bool "GPIOTE (GPIO interrupts)" default n +config NRF53_I2C0_MASTER + bool "I2C0 Master" + default n + select NRF53_I2C_MASTER + +config NRF53_I2C1_MASTER + bool "I2C1 Master" + default n + depends on NRF53_HAVE_I2C123 + select NRF53_I2C_MASTER + +config NRF53_I2C2_MASTER + bool "I2C2 Master" + default n + depends on NRF53_HAVE_I2C123 + select NRF53_I2C_MASTER + +config NRF53_I2C2_MASTER + bool "I2C3 Master" + default n + depends on NRF53_HAVE_I2C123 + select NRF53_I2C_MASTER + config NRF53_UART0 bool "UART0" default n @@ -470,6 +502,33 @@ config NRF53_PER_PIN_INTERRUPTS endmenu # GPIO Interrupt Configuration +menu "I2C Master Configuration" + +config NRF53_I2C_MASTER_DISABLE_NOSTART + bool "Disable the I2C Master NOSTART flag support" + default n + ---help--- + To combine two i2c messages that are part of a + single transaction (NO_STOP-NO_START) the nrf53 + hardware requires these be joined into a single + transfer. This can be expensive and some devices + can get away with multi-part transfers as separate + transfers. Enable this at your own risk! + +config NRF53_I2C_MASTER_COPY_BUF_SIZE + int "Static buffer size for NOSTART flag support" + depends on !NRF53_I2C_MASTER_DISABLE_NOSTART + default 4 + ---help--- + To combine two i2c messages that are part of a + single transaction (NO_STOP-NO_START) the nrf53 + hardware requires these be joined into a single + transfer. This static buffer will be used if the + transaction will fit otherwise it will fall back + on malloc. + +endmenu + menuconfig NRF53_SOFTDEVICE_CONTROLLER bool "SoftDevice Controller" depends on ALLOW_BSDNORDIC_COMPONENTS diff --git a/arch/arm/src/nrf53/Make.defs b/arch/arm/src/nrf53/Make.defs index 77b2916452..b3f43c16a7 100644 --- a/arch/arm/src/nrf53/Make.defs +++ b/arch/arm/src/nrf53/Make.defs @@ -83,6 +83,10 @@ ifeq ($(CONFIG_PM),y) CHIP_CSRCS += nrf53_pminitialize.c endif +ifeq ($(CONFIG_NRF53_I2C_MASTER),y) +CHIP_CSRCS += nrf53_i2c.c +endif + ifeq ($(CONFIG_NRF53_SOFTDEVICE_CONTROLLER),y) NRFXLIB_UNPACK := sdk-nrfxlib diff --git a/arch/arm/src/nrf53/hardware/nrf53_memorymap_cpuapp.h b/arch/arm/src/nrf53/hardware/nrf53_memorymap_cpuapp.h index 9618d1bf62..5ffa4f94a5 100644 --- a/arch/arm/src/nrf53/hardware/nrf53_memorymap_cpuapp.h +++ b/arch/arm/src/nrf53/hardware/nrf53_memorymap_cpuapp.h @@ -60,7 +60,17 @@ #define NRF53_TWIM1_BASE0x50009000 #define NRF53_TWIS1_BASE0x50009000 #define NRF53_UART1_BASE0x50009000 -#define NRF53_SPIM2_BASE0x5000A000 +#define NRF53_SPIM4_BASE0x5000A000 +#define NRF53_SPIM2_BASE0x5000B000 +#define NRF53_SPIS2_BASE0x5000B000 +#define NRF53_TWIM2_BASE0x5000B000 +#define NRF53_TWIS2_BASE0x5000B000 +#define NRF53_UART2_BASE0x5000B000 +#define NRF53_SPIM3_BASE0x5000C000 +#define NRF53_SPIS3_BASE0x5000C000 +#define NRF53_TWIM3_BASE0x5000C000 +#define NRF53_TWIS3_BASE0x5000C000 +#define NRF53_UART3_BASE0x5000C000 #define NRF53_GPIOTE0_BASE 0x5000D000 #define NRF53_SAADC_BASE0x5000E000 #define NRF53_TIMER0_BASE 0x5000F000 diff --git a/arch/arm/src/
[nuttx] branch master updated (e299af410a -> 3493ea399f)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from e299af410a Documentation: Import Nested Interrupts page from CWIKI new 22d4a492e4 arch/nrf53: UART0-3, SPI0-3 and TWI0-3 instances share the same interrupt vectors new 3493ea399f arch/nrf53: add I2C support The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: arch/arm/include/nrf53/nrf5340_irq_cpuapp.h| 8 +- arch/arm/include/nrf53/nrf5340_irq_cpunet.h| 2 +- arch/arm/src/nrf53/Kconfig | 59 arch/arm/src/nrf53/Make.defs | 4 + .../src/nrf53/hardware/nrf53_memorymap_cpuapp.h| 12 +- .../src/{nrf52/nrf52_i2c.c => nrf53/nrf53_i2c.c} | 296 + .../src/{nrf52/nrf52_i2c.h => nrf53/nrf53_i2c.h} | 18 +- arch/arm/src/nrf53/nrf53_serial.c | 4 +- 8 files changed, 271 insertions(+), 132 deletions(-) copy arch/arm/src/{nrf52/nrf52_i2c.c => nrf53/nrf53_i2c.c} (69%) copy arch/arm/src/{nrf52/nrf52_i2c.h => nrf53/nrf53_i2c.h} (85%)
[nuttx] 01/02: arch/nrf53: UART0-3, SPI0-3 and TWI0-3 instances share the same interrupt vectors
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 22d4a492e451ee43ade6e1ebbec7d4a057acef57 Author: raiden00pl AuthorDate: Fri May 19 18:10:55 2023 +0200 arch/nrf53: UART0-3, SPI0-3 and TWI0-3 instances share the same interrupt vectors --- arch/arm/include/nrf53/nrf5340_irq_cpuapp.h | 8 arch/arm/include/nrf53/nrf5340_irq_cpunet.h | 2 +- arch/arm/src/nrf53/nrf53_serial.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h b/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h index 5b0c7820b6..c9466837be 100644 --- a/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h +++ b/arch/arm/include/nrf53/nrf5340_irq_cpuapp.h @@ -33,11 +33,11 @@ #define NRF53_IRQ_CACHE (NRF53_IRQ_EXTINT+1) /* CACHE interrupt */ #define NRF53_IRQ_SPU (NRF53_IRQ_EXTINT+3) /* SPU interrupt */ #define NRF53_IRQ_POWER_CLOCK (NRF53_IRQ_EXTINT+5) /* Power, Clock, Bprot */ -#define NRF53_IRQ_UART0 (NRF53_IRQ_EXTINT+8) /* UART/UARTE 0 */ -#define NRF53_IRQ_UART1 (NRF53_IRQ_EXTINT+9) /* UART/UARTE 1 */ +#define NRF53_IRQ_SERIAL0 (NRF53_IRQ_EXTINT+8) /* UART/SPI/TWI 0 */ +#define NRF53_IRQ_SERIAL1 (NRF53_IRQ_EXTINT+9) /* UART/SPI/TWI 1 */ #define NRF53_IRQ_SPIM4 (NRF53_IRQ_EXTINT+10) /* SPIM4 */ -#define NRF53_IRQ_UART2 (NRF53_IRQ_EXTINT+11) /* UART/UARTE 2 */ -#define NRF53_IRQ_UART3 (NRF53_IRQ_EXTINT+12) /* UART/UARTE 3 */ +#define NRF53_IRQ_SERIAL2 (NRF53_IRQ_EXTINT+11) /* UART/SPI/TWI 2 */ +#define NRF53_IRQ_SERIAL3 (NRF53_IRQ_EXTINT+12) /* UART/SPI/TWI 3 */ #define NRF53_IRQ_GPIOTE0 (NRF53_IRQ_EXTINT+13) /* GPIO Task & Event 0 */ #define NRF53_IRQ_SAADC (NRF53_IRQ_EXTINT+14) /* Analog to Digital Converter */ #define NRF53_IRQ_TIMER0(NRF53_IRQ_EXTINT+15) /* Timer 0 */ diff --git a/arch/arm/include/nrf53/nrf5340_irq_cpunet.h b/arch/arm/include/nrf53/nrf5340_irq_cpunet.h index 010b114c76..b2997d74b4 100644 --- a/arch/arm/include/nrf53/nrf5340_irq_cpunet.h +++ b/arch/arm/include/nrf53/nrf5340_irq_cpunet.h @@ -40,7 +40,7 @@ #define NRF53_IRQ_TEMP (NRF53_IRQ_EXTINT+16) /* Temperature Sensor */ #define NRF53_IRQ_RTC0 (NRF53_IRQ_EXTINT+17) /* Real-time counter 0 */ #define NRF53_IRQ_IPC (NRF53_IRQ_EXTINT+18) /* IPC */ -#define NRF53_IRQ_UART0 (NRF53_IRQ_EXTINT+19) /* UART/UARTE 0 */ +#define NRF53_IRQ_SERIAL0 (NRF53_IRQ_EXTINT+19) /* UART/SPI/TWI 0 */ #define NRF53_IRQ_EGU0 (NRF53_IRQ_EXTINT+20) /* Event Gen. Unit 0 */ #define NRF53_IRQ_RTC1 (NRF53_IRQ_EXTINT+22) /* Real-time counter 1 */ #define NRF53_IRQ_TIMER1(NRF53_IRQ_EXTINT+24) /* Timer 1 */ diff --git a/arch/arm/src/nrf53/nrf53_serial.c b/arch/arm/src/nrf53/nrf53_serial.c index 1d65981e73..efd8843ca1 100644 --- a/arch/arm/src/nrf53/nrf53_serial.c +++ b/arch/arm/src/nrf53/nrf53_serial.c @@ -166,7 +166,7 @@ static char g_uart1txbuffer[CONFIG_UART1_TXBUFSIZE]; static struct nrf53_dev_s g_uart0priv = { .uartbase = NRF53_UART0_BASE, - .irq= NRF53_IRQ_UART0, + .irq= NRF53_IRQ_SERIAL0, .rx_available = false, .config = { @@ -208,7 +208,7 @@ static uart_dev_t g_uart0port = static struct nrf53_dev_s g_uart1priv = { .uartbase = NRF53_UART1_BASE, - .irq= NRF53_IRQ_UART1, + .irq= NRF53_IRQ_SERIAL1, .rx_available = false, .config = {
[nuttx-apps] branch master updated: nshlib: fix memory leak found out by -fanalyzer
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new 28973a37b nshlib: fix memory leak found out by -fanalyzer 28973a37b is described below commit 28973a37b356d1a688fd603b2cfcfb07ce409c57 Author: chao an AuthorDate: Tue May 16 17:39:35 2023 +0800 nshlib: fix memory leak found out by -fanalyzer Signed-off-by: chao an --- nshlib/nsh_ddcmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nshlib/nsh_ddcmd.c b/nshlib/nsh_ddcmd.c index dea661408..1d25b2ad7 100644 --- a/nshlib/nsh_ddcmd.c +++ b/nshlib/nsh_ddcmd.c @@ -391,7 +391,7 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) ret = dd_infopen(infile, ); if (ret < 0) { - goto errout_with_paths; + goto errout_with_alloc; } /* Open the output file */ @@ -475,6 +475,8 @@ errout_with_outf: errout_with_inf: close(dd.infd); + +errout_with_alloc: free(dd.buffer); errout_with_paths:
[nuttx-apps] branch master updated: add fdsan unit test
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new aea9b50dc add fdsan unit test aea9b50dc is described below commit aea9b50dc8efc8f1b3d206eeb53ff36073d1364d Author: hujun5 AuthorDate: Mon May 8 20:40:39 2023 +0800 add fdsan unit test Due to the current Nuttx not supporting death test, we removed death test from the original test cases of Android Signed-off-by: hujun5 --- testing/fdsantest/Kconfig| 27 +++ testing/fdsantest/Make.defs | 23 ++ testing/fdsantest/Makefile | 32 + testing/fdsantest/fdsantest_simple.c | 134 +++ 4 files changed, 216 insertions(+) diff --git a/testing/fdsantest/Kconfig b/testing/fdsantest/Kconfig new file mode 100644 index 0..97d82510c --- /dev/null +++ b/testing/fdsantest/Kconfig @@ -0,0 +1,27 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config TESTING_FDSAN_TEST + tristate "vela cmocka fdsan test" + default n + depends on TESTING_CMOCKA + ---help--- + Enable the cmocka fdsan test + +if TESTING_FDSAN_TEST + +config TESTING_FDSAN_TEST_PRIORITY + int "Task priority" + default 100 + +config TESTING_FDSAN_TEST_STACKSIZE + int "Stack size" + default DEFAULT_TASK_STACKSIZE + +config TESTING_FDSAN_TEST_SIMPLE + bool "Enable cmocka fdsan simple test" + default y + +endif diff --git a/testing/fdsantest/Make.defs b/testing/fdsantest/Make.defs new file mode 100644 index 0..3cab033df --- /dev/null +++ b/testing/fdsantest/Make.defs @@ -0,0 +1,23 @@ + +# apps/testing/fdsantest/Make.defs +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + + +ifneq ($(CONFIG_TESTING_FDSAN_TEST),) +CONFIGURED_APPS += $(APPDIR)/testing/fdsantest +endif diff --git a/testing/fdsantest/Makefile b/testing/fdsantest/Makefile new file mode 100644 index 0..3dc7f4a12 --- /dev/null +++ b/testing/fdsantest/Makefile @@ -0,0 +1,32 @@ + +# apps/testing/fdsantest/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + + +include $(APPDIR)/Make.defs + +PRIORITY = $(CONFIG_TESTING_FDSAN_TEST_PRIORITY) +STACKSIZE = $(CONFIG_TESTING_FDSAN_TEST_STACKSIZE) +MODULE= $(CONFIG_TESTING_FDSAN_TEST) + +ifneq ($(CONFIG_TESTING_FDSAN_TEST_SIMPLE),) +MAINSRC += fdsantest_simple.c +PROGNAME += cmocka_fdsan_simple +endif + +include $(APPDIR)/Application.mk diff --git a/testing/fdsantest/fdsantest_simple.c b/testing/fdsantest/fdsantest_simple.c new file mode 100644 index 0..4f8c802e6 --- /dev/null +++ b/testing/fdsantest/fdsantest_simple.c @@ -0,0 +1,134 @@ +/ + * apps/testing/fdsantest/fdsantest_simple.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * con
[nuttx-website] branch master updated: Contributors list update after graduation PPMC->PMC, retain IPMC status.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new af7e8d88 Contributors list update after graduation PPMC->PMC, retain IPMC status. af7e8d88 is described below commit af7e8d88533d0690888e9cb923d55955062a8aa4 Author: Tomasz 'CeDeROM' CEDRO AuthorDate: Sun May 14 21:12:59 2023 +0200 Contributors list update after graduation PPMC->PMC, retain IPMC status. Signed-off-by: Tomasz 'CeDeROM' CEDRO --- _data/contributors.yml | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/_data/contributors.yml b/_data/contributors.yml index 87819167..4e7c894d 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -21,7 +21,7 @@ - name: Abdelatif Guettouche apacheId: aguettouche githubId: Ouss4 - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Adam Feuer @@ -33,25 +33,25 @@ - name: Alan Carvalho de Assis apacheId: acassis githubId: acassis - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Alin Jerpelea apacheId: jerpelea githubId: jerpelea - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Anthony Merlino apacheId: antmerlino githubId: antmerlino - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Brennan Ashton apacheId: btashton githubId: btashton - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Chao An @@ -63,25 +63,25 @@ - name: David Sidrane apacheId: davids5 githubId: davids5 - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Duo Zhang apacheId: zhangduo githubId: Apache9 - role: Mentor, PMC, IPMC, PPMC, Committer + role: Mentor, PMC, IPMC, Committer org: - name:Flavio Paiva Junqueira apacheId: fpj githubId: fpj - role: Mentor, PMC, IPMC, PPMC, Committer + role: Mentor, PMC, IPMC, Committer org: - name: Gregory Nutt apacheId: gnutt githubId: patacongo - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Gustavo Henrique Nihei @@ -104,19 +104,19 @@ - name: Justin Mclean apacheId: jmclean githubId: justinmclean - role: Mentor, PMC, IPMC, PPMC, Committer + role: Mentor, PMC, IPMC, Committer org: - name: Junping Du apacheId: junping_du githubId: JunpingDu - role: Champion, Mentor, PMC, IPMC, PPMC, Committer + role: Champion, Mentor, PMC, IPMC, Committer org: - name: Masayuki Ishikawa apacheId: masayuki githubId: masayuki2009 - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Mateusz Szafoni @@ -134,13 +134,13 @@ - name: Mohammad Asif Siddiqui apacheId: asifdxtreme githubId: asifdxtreme - role: Mentor, PMC, IPMC, PPMC, Committer + role: Mentor, PMC, IPMC, Committer org: - name: Nathan Hartman apacheId: hartmannathan githubId: hartmannathan - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Petro Karashchenko @@ -152,7 +152,7 @@ - name: Sara da Cunha Monteiro de Souza apacheId: sara githubId: saramonteiro - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Sebastian Ene @@ -170,7 +170,7 @@ - name: Xiang Xiao apacheId: xiaoxiang githubId: xiaoxiang781216 - role: PMC, PPMC, Committer + role: PMC, Committer org: - name: Yamamoto Takashi
[nuttx-website] branch master updated: Added Tomek CEDRO to contributors.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new bcca8395 Added Tomek CEDRO to contributors. bcca8395 is described below commit bcca83955d8ce1ea3a6746c9d2a164b7f987e8cf Author: Tomasz 'CeDeROM' CEDRO AuthorDate: Sun May 14 20:18:35 2023 +0200 Added Tomek CEDRO to contributors. Signed-off-by: Tomasz 'CeDeROM' CEDRO --- _data/contributors.yml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/_data/contributors.yml b/_data/contributors.yml index 7837e966..03907e45 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -161,6 +161,12 @@ role: Committer org: +- name: Tomek CEDRO + apacheId: cederom + githubId: cederom + role: PMC, Committer + org: CeDeROM + - name: Xiang Xiao apacheId: xiaoxiang githubId: xiaoxiang781216
[nuttx-website] branch master updated: Community page updates.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 24d6d933 Community page updates. 24d6d933 is described below commit 24d6d93373093f1095cdd3a2242bc12fb1df25c2 Author: Tomasz 'CeDeROM' CEDRO AuthorDate: Sun May 14 20:10:04 2023 +0200 Community page updates. * Information that mailing list is our main communication channel. * Information that all important changes must be discussed on mailing list. * Added social media section. Signed-off-by: Tomasz 'CeDeROM' CEDRO --- community.md | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/community.md b/community.md index 1b768331..225c25a2 100644 --- a/community.md +++ b/community.md @@ -40,9 +40,10 @@ You can: Visit the [Contributing] page for more information. + ### Mailing list -Get help using {{ site.data.project.short_name }} or contribute to the project on our mailing lists: +Get help using {{ site.data.project.short_name }} or contribute to the project on our mailing lists. This is our preferred communication channel and all important discussions take place here. {% if site.data.project.user_list %} * [site.data.project.user_list](mailto:{{ site.data.project.user_list }}) is for usage questions, help, and announcements. [subscribe](mailto:{{ site.data.project.user_list_subscribe }}?subject=send this email to subscribe), [unsubscribe](mailto:{{ site.data.project.dev_list_unsubscribe }}?subject=send this email to unsubscribe), [archives]({{ site.data.project.user_list_archive_mailarchive }}) @@ -51,9 +52,16 @@ Get help using {{ site.data.project.short_name }} or contribute to the project o * [{{ site.data.project.commits_list }}](mailto:{{ site.data.project.commits_list }}) is for commit messages and patches to {{ site.data.project.short_name }}. [subscribe](mailto:{{ site.data.project.commits_list_subscribe }}?subject=send this email to subscribe), [unsubscribe](mailto:{{ site.data.project.commits_list_unsubscribe }}?subject=send this email to unsubscribe), [archives]({{ site.data.project.commits_list_archive_mailarchive }}) -### Issue tracker +### Social Media + +The mailing list and project website is our central hub of information, but there are several social media channels where you can find interesting videos, updates, DIY projects that may help you work with NuttX RTOS. + +* YouTube: https://www.youtube.com/@nuttxchannel. +* Hackster: https://www.hackster.io/nuttx. +* LinkedIn: https://www.linkedin.com/company/nuttx , https://www.linkedin.com/groups/12002792. +### Issue tracker Bug Reports @@ -65,12 +73,12 @@ Before submitting an issue, please: * Search the mailing list [archives]({{ site.data.project.dev_list_archive_mailarchive }}) to verify there is no existing issue reporting the bug you've found. * Consider tracking down the bug yourself in the NuttX's source and submitting a patch along with your bug report. This is a great time saver for the NuttX developers and helps ensure the bug will be fixed quickly. - - Feature Requests Enhancement requests for new features are also welcome. The more concrete and rational the request is, the greater the chance it will be incorporated into future releases. +Please note that all important changes must be first discussed on our mailing list! + ### Source Code
[nuttx-website] branch master updated: Bump nokogiri from 1.13.10 to 1.14.3
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 6b97f0b7 Bump nokogiri from 1.13.10 to 1.14.3 6b97f0b7 is described below commit 6b97f0b7d9c9541ec77f08b188cf82e4a808a573 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Apr 12 05:52:08 2023 + Bump nokogiri from 1.13.10 to 1.14.3 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.10 to 1.14.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.10...v1.14.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3371885a..10397f51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.17.0) -nokogiri (1.13.10-x86_64-linux) +nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -219,7 +219,7 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.7) -racc (1.6.1) +racc (1.6.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0)
[nuttx] 05/05: arch/xtensa/esp32: fix wrong enabled BLE interrupts
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 3e3670af77139167be27c2cebaf0e00a2c1fdd0e Author: Petro Karashchenko AuthorDate: Mon Apr 24 14:52:20 2023 +0300 arch/xtensa/esp32: fix wrong enabled BLE interrupts Signed-off-by: Petro Karashchenko --- arch/xtensa/src/esp32/esp32_ble_adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c b/arch/xtensa/src/esp32/esp32_ble_adapter.c index 6ddb4952dd..902cf7bfe5 100644 --- a/arch/xtensa/src/esp32/esp32_ble_adapter.c +++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c @@ -884,8 +884,9 @@ static void esp32_ints_on(uint32_t mask) bit = 1 << i; if (bit & mask) { -wlinfo("Enabled bit %d\n", i); -up_enable_irq(i); +int irq = i + XTENSA_IRQ_FIRSTPERIPH; +wlinfo("Enabled bit %d\n", irq); +up_enable_irq(irq); } } } @@ -2879,4 +2880,3 @@ void coex_bb_reset_unlock_wrapper(uint32_t restore) coex_bb_reset_unlock(restore); #endif } -
[nuttx] branch master updated (b8780fe906 -> 3e3670af77)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from b8780fe906 arch/arm: relax compiler check for workaround with "GCC 12.2" new d50ec662be arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t * new 756e244b18 wireless/bluetooth: fix double buffer free new 0a28b2a26e net/bluetooth: fix parameter indentation new 0c28094059 arch/xtensa/esp32: fix crash in BLE startup new 3e3670af77 arch/xtensa/esp32: fix wrong enabled BLE interrupts The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c | 36 +-- arch/xtensa/src/esp32/esp32_ble_adapter.c | 14 +-- net/bluetooth/bluetooth_poll.c| 2 +- wireless/bluetooth/bt_hcicore.c | 6 - 4 files changed, 26 insertions(+), 32 deletions(-)
[nuttx] 02/05: wireless/bluetooth: fix double buffer free
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 756e244b182e16fe12000e09f9e9810ddf60aa56 Author: Petro Karashchenko AuthorDate: Mon Apr 24 14:46:04 2023 +0300 wireless/bluetooth: fix double buffer free Signed-off-by: Petro Karashchenko --- wireless/bluetooth/bt_hcicore.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c index 24b2fffbdd..1f1b5f1d98 100644 --- a/wireless/bluetooth/bt_hcicore.c +++ b/wireless/bluetooth/bt_hcicore.c @@ -252,7 +252,6 @@ static void hci_acl(FAR struct bt_buf_s *buf) { wlerr("ERROR: ACL data length mismatch (%u != %u)\n", buf->len, len); - bt_buf_release(buf); return; } @@ -261,12 +260,10 @@ static void hci_acl(FAR struct bt_buf_s *buf) { wlerr("ERROR: Unable to find conn for handle %u\n", buf->u.acl.handle); - bt_buf_release(buf); return; } bt_conn_receive(conn, buf, flags); - bt_conn_release(conn); } /* HCI event processing */ @@ -964,8 +961,6 @@ static void hci_event(FAR struct bt_buf_s *buf) wlwarn("WARNING: Unhandled event 0x%02x\n", hdr->evt); break; } - - bt_buf_release(buf); } #endif @@ -1075,7 +1070,6 @@ static void hci_rx_work(FAR void *arg) default: wlerr("ERROR: Unknown buf type %u\n", buf->type); -bt_buf_release(buf); break; } #else
[nuttx] 03/05: net/bluetooth: fix parameter indentation
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 0a28b2a26e003b50904f8c875592fd373879bd34 Author: Petro Karashchenko AuthorDate: Mon Apr 24 14:46:35 2023 +0300 net/bluetooth: fix parameter indentation Signed-off-by: Petro Karashchenko --- net/bluetooth/bluetooth_poll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bluetooth/bluetooth_poll.c b/net/bluetooth/bluetooth_poll.c index ab61f2bfd2..3edd9fe395 100644 --- a/net/bluetooth/bluetooth_poll.c +++ b/net/bluetooth/bluetooth_poll.c @@ -63,7 +63,7 @@ / void bluetooth_poll(FAR struct net_driver_s *dev, - FAR struct bluetooth_conn_s *conn) +FAR struct bluetooth_conn_s *conn) { FAR struct radio_driver_s *radio;
[nuttx] 01/05: arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t *
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit d50ec662be943ffdaa6c05d1d5300347465bc1db Author: Petro Karashchenko AuthorDate: Mon Apr 24 14:43:56 2023 +0300 arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t * Signed-off-by: Petro Karashchenko --- arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c | 36 +-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c index fe11ebde8f..a404f25e7c 100644 --- a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c +++ b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c @@ -360,24 +360,24 @@ extern void btdm_deep_sleep_mem_deinit(void); extern void btdm_ble_power_down_dma_copy(bool copy); extern uint8_t btdm_sleep_clock_sync(void); -extern char _bss_start_btdm; -extern char _bss_end_btdm; -extern char _data_start_btdm; -extern char _data_end_btdm; -extern uint32_t _data_start_btdm_rom; -extern uint32_t _data_end_btdm_rom; - -extern uint32_t _bt_bss_start; -extern uint32_t _bt_bss_end; -extern uint32_t _btdm_bss_start; -extern uint32_t _btdm_bss_end; -extern uint32_t _bt_data_start; -extern uint32_t _bt_data_end; -extern uint32_t _btdm_data_start; -extern uint32_t _btdm_data_end; - -extern char _bt_tmp_bss_start; -extern char _bt_tmp_bss_end; +extern uint8_t _bss_start_btdm[]; +extern uint8_t _bss_end_btdm[]; +extern uint8_t _data_start_btdm[]; +extern uint8_t _data_end_btdm[]; +extern const uint32_t _data_start_btdm_rom; +extern const uint32_t _data_end_btdm_rom; + +extern uint8_t _bt_bss_start[]; +extern uint8_t _bt_bss_end[]; +extern uint8_t _btdm_bss_start[]; +extern uint8_t _btdm_bss_end[]; +extern uint8_t _bt_data_start[]; +extern uint8_t _bt_data_end[]; +extern uint8_t _btdm_data_start[]; +extern uint8_t _btdm_data_end[]; + +extern uint8_t _bt_tmp_bss_start[]; +extern uint8_t _bt_tmp_bss_end[]; / * Private Data
[nuttx] 04/05: arch/xtensa/esp32: fix crash in BLE startup
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 0c28094059a7a21ba1d7c3b25bd6a595d142ad08 Author: Petro Karashchenko AuthorDate: Mon Apr 24 14:47:49 2023 +0300 arch/xtensa/esp32: fix crash in BLE startup ROM symbols provided by linker are placeholders for addresses and not a pure addresses, so we need to read data pointed by ROM symbols instead of using those as pure addresses. Signed-off-by: Petro Karashchenko --- arch/xtensa/src/esp32/esp32_ble_adapter.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c b/arch/xtensa/src/esp32/esp32_ble_adapter.c index e7afd20ff1..6ddb4952dd 100644 --- a/arch/xtensa/src/esp32/esp32_ble_adapter.c +++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c @@ -451,8 +451,8 @@ extern uint8_t _bss_start_btdm[]; extern uint8_t _bss_end_btdm[]; extern uint8_t _data_start_btdm[]; extern uint8_t _data_end_btdm[]; -extern const uint8_t _data_start_btdm_rom[]; -extern const uint8_t _data_end_btdm_rom[]; +extern const uint32_t _data_start_btdm_rom; +extern const uint32_t _data_end_btdm_rom; extern uint8_t _bt_bss_start[]; extern uint8_t _bt_bss_end[]; @@ -2027,11 +2027,11 @@ static void btdm_controller_mem_init(void) /* initialise .data section */ - memcpy(_data_start_btdm, _data_start_btdm_rom, + memcpy(_data_start_btdm, (void *)_data_start_btdm_rom, _data_end_btdm - _data_start_btdm); wlinfo(".data initialise [0x%08x] <== [0x%08x]\n", - (uint32_t)_data_start_btdm, (uint32_t)_data_start_btdm_rom); + (uint32_t)_data_start_btdm, _data_start_btdm_rom); /* initial em, .bss section */
[nuttx-apps] branch master updated: system/adb: Replace adb special reset cause with boardctl.h's value
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new fe1d701b7 system/adb: Replace adb special reset cause with boardctl.h's value fe1d701b7 is described below commit fe1d701b71aa0e648085433477c30d1b0c1a958b Author: Xiang Xiao AuthorDate: Sat Apr 1 19:35:42 2023 +0800 system/adb: Replace adb special reset cause with boardctl.h's value Signed-off-by: Xiang Xiao --- system/adb/Kconfig| 13 + system/adb/adb_main.c | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/system/adb/Kconfig b/system/adb/Kconfig index 524d99029..e5cf32437 100644 --- a/system/adb/Kconfig +++ b/system/adb/Kconfig @@ -50,21 +50,10 @@ config ADBD_TOKEN_SIZE endif # ADBD_AUTHENTICATION -if BOARDCTL_RESET -config ADBD_RESET_RECOVERY - int "Reset argument for recovery" - default 1 - -config ADBD_RESET_BOOTLOADER - int "Reset argument for bootloader" - default 2 -endif # BOARDCTL_RESET - -if !BOARDCTL_UNIQUEID config ADBD_DEVICE_ID string "Default adb device id" + depends on !BOARDCTL_UNIQUEID default "" -endif # BOARDCTL_UNIQUEID config ADBD_PRODUCT_NAME string "Default adb product name" diff --git a/system/adb/adb_main.c b/system/adb/adb_main.c index ff6c16a46..6401789f8 100644 --- a/system/adb/adb_main.c +++ b/system/adb/adb_main.c @@ -56,15 +56,15 @@ void adb_reboot_impl(const char *target) #ifdef CONFIG_BOARDCTL_RESET if (strcmp(target, "recovery") == 0) { - boardctl(BOARDIOC_RESET, CONFIG_ADBD_RESET_RECOVERY); + boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_ENTER_RECOVERY); } else if (strcmp(target, "bootloader") == 0) { - boardctl(BOARDIOC_RESET, CONFIG_ADBD_RESET_BOOTLOADER); + boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_ENTER_BOOTLOADER); } else { - boardctl(BOARDIOC_RESET, 0); + boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_USER_REBOOT); } #else adb_log("reboot not implemented\n");
[nuttx-website] 01/03: Add NuttX 12.1.0 release
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git commit b20af78e7e5e9cbed00752744d6d6d16341f74dd Author: Alin Jerpelea AuthorDate: Mon Apr 17 08:28:12 2023 +0200 Add NuttX 12.1.0 release Signed-off-by: Alin Jerpelea --- _releases/12.1.0.md | 980 1 file changed, 980 insertions(+) diff --git a/_releases/12.1.0.md b/_releases/12.1.0.md new file mode 100644 index ..97319ea4 --- /dev/null +++ b/_releases/12.1.0.md @@ -0,0 +1,980 @@ +--- +layout: page +released: true +apache: true +title: 12.1.0 +date: 2023-04-16 +summary: > +Release v12.1.0 + +artifact-root: "https://www.apache.org/dyn/closer.lua/nuttx/12.1.0; +checksum-root: "https://downloads.apache.org/nuttx/12.1.0; +key-file: "https://downloads.apache.org/nuttx/KEYS; + +source-os-dist: +- "apache-nuttx-12.1.0.tar.gz" +source-app-dist: +- "apache-nuttx-apps-12.1.0.tar.gz" + +--- + + + + +{% include JB/setup %} + +# Apache NuttX-12.1.0 Release Notes +* TOC +{:toc} + +What's New In This Release + +Changes to Core OS +Sched +* [](https://github.com/apache/nuttx/pull/) Correct Real Time signal definitions. #8881 + +* [#8286](https://github.com/apache/nuttx/pull/8286) sched: Add _NSIG, SIGFPE, SIGILL and SIGSEGV definition +* [#8686](https://github.com/apache/nuttx/pull/8686) sched: add critical section in nxsched_get_stateinfo +* [#8708](https://github.com/apache/nuttx/pull/8708) sched: build error fix in task_exithook +* [#4819](https://github.com/apache/nuttx/pull/4819) sched: Disable stdio api by default when DEFAULT_SMALL equals y +* [#8642](https://github.com/apache/nuttx/pull/8642) sched: fix kconfig warning +* [#8151](https://github.com/apache/nuttx/pull/8151) sched: fix task_delete crash in SMP case +* [#8311](https://github.com/apache/nuttx/pull/8311) sched: fix run ltp_interfaces_sched_setscheduler_17_1 fail +* [#8210](https://github.com/apache/nuttx/pull/8210) sched: Map both NZERO and PTHREAD_DEFAULT_PRIORITY to SCHED_PRIORITY_DEFAULT +* [#8330](https://github.com/apache/nuttx/pull/8330) sched: Map SCHED_OTHER to SCHED_FIFO or SCHED_RR +* [#7882](https://github.com/apache/nuttx/pull/7882) sched: remove unnecessary type cast +* [#8374](https://github.com/apache/nuttx/pull/8374) sched: Remove the unused TCB_FLAG_SCHED_OTHER +* [#7956](https://github.com/apache/nuttx/pull/7956) sched: assert: modify assert message +* [#7957](https://github.com/apache/nuttx/pull/7957) sched: assert: Do not call the user space "exit" function +* [#7952](https://github.com/apache/nuttx/pull/7952) sched: assert: Fix printing argv when address environments are in use +* [#8224](https://github.com/apache/nuttx/pull/8224) sched: assert: sched: Implement tkill/tgkill +* [#8556](https://github.com/apache/nuttx/pull/8556) sched: assert: sync ps/assert output +* [#8897](https://github.com/apache/nuttx/pull/8897) sched: clock_gettime: Remove output log +* [#8653](https://github.com/apache/nuttx/pull/8653) sched: env: add tg_envc in task_group_s to avoid some loops in code +* [#8394](https://github.com/apache/nuttx/pull/8394) sched: getpid: replace syscall getpid/tid/ppid() to kernel version +* [#8066](https://github.com/apache/nuttx/pull/8066) sched: group: fix task info heap-use-after-free +* [#7997](https://github.com/apache/nuttx/pull/7997) sched: group: Fix memory corruption in group_leave.c +* [#8282](https://github.com/apache/nuttx/pull/8282) sched: group: Implement group_drop() +* [#8169](https://github.com/apache/nuttx/pull/8169) sched: group/addrenv: An assorment of fixes to address environment handling (part1) +* [#7995](https://github.com/apache/nuttx/pull/7995) sched: misc: add linux-like reboot notifier list +* [#8035](https://github.com/apache/nuttx/pull/8035) sched: misc: assert: add a last type to call notifier +* [#8158](https://github.com/apache/nuttx/pull/8158) sched: misc: assert: fix build break +* [#8035](https://github.com/apache/nuttx/pull/8035) sched: misc: assert: add a last type to call notifier +* [#8144](https://github.com/apache/nuttx/pull/8144) sched: misc: crash dump message added +* [#7996](https://github.com/apache/nuttx/pull/7996) sched: misc: Rename panic.c to panic_notifier.c +* [#7893](https://github.com/apache/nuttx/pull/7893) sched: note: Change sched_note_[begin|end] to macro +* [#8521](https://github.com/apache/nuttx/pull/8521) sched: nxtask_sigchild: Set exit code when CONFIG_SCHED_CHILD_STATUS=y +* [#8486](https://github.com/apache/nuttx/pull/8486) sched: nxtask_sigchild: Set process exit code to group exit code +* [#8520](https://github.com/apache/nuttx/pull/8520) sched: pthread: change the wrong type cast +* [#8505](https://github.com/apache/nuttx/pull/8505) sched: pthread: check pthread group after fin
[nuttx-website] 03/03: download.md: fix git name after graduation
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git commit e36cef39aad5bf1e82697e4e034530ddb77fcf7f Author: Alin Jerpelea AuthorDate: Tue Apr 18 08:15:38 2023 +0200 download.md: fix git name after graduation the git was renamed after graduation and we should adjust the address Signed-off-by: Alin Jerpelea --- download.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.md b/download.md index 33116072..f5f1ef5b 100644 --- a/download.md +++ b/download.md @@ -66,7 +66,7 @@ download has completed OK. For fast downloads, current source distributions are hosted on mirror servers. For security, hash and signature files are always hosted at -[Apache](https://downloads.apache.org/incubator/nuttx/). +[Apache](https://downloads.apache.org/nuttx/). {% else %} No official Apache releases have been made yet!
[nuttx-website] branch master updated (1fb7c750 -> e36cef39)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-website.git from 1fb7c750 Bump commonmarker from 0.23.6 to 0.23.9 new b20af78e Add NuttX 12.1.0 release new 0fecf7cd 12.0.0.md: fix git name after graduation new e36cef39 download.md: fix git name after graduation The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: _releases/12.0.0.md | 1480 +-- _releases/12.1.0.md | 980 ++ download.md |2 +- 3 files changed, 1721 insertions(+), 741 deletions(-) create mode 100644 _releases/12.1.0.md
[nuttx] branch master updated (b705d9b1d5 -> 655f7f14ba)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from b705d9b1d5 sim: switch working directory add 655f7f14ba github/linters/setup.cfg: use ignore for E203 No new revisions were added by this update. Summary of changes: .github/linters/setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[nuttx-apps] branch master updated: github/linters/setup.cfg: ignore E203 for flake8 to fix compatibility issues with black
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new 6b35ff323 github/linters/setup.cfg: ignore E203 for flake8 to fix compatibility issues with black 6b35ff323 is described below commit 6b35ff323a9fac4a8f801dc5e95a3b1b4f46993b Author: raiden00pl AuthorDate: Mon Apr 17 10:25:42 2023 +0200 github/linters/setup.cfg: ignore E203 for flake8 to fix compatibility issues with black For more details, see https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8 --- .github/linters/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/setup.cfg b/.github/linters/setup.cfg index 9c18e21fe..b0224c147 100644 --- a/.github/linters/setup.cfg +++ b/.github/linters/setup.cfg @@ -1,5 +1,5 @@ [flake8] -ignore = W503,W605 +ignore = W503,W605,E203 max-complexity = 27 max-line-length = 125 show-source = True
[nuttx] branch master updated: Fix Black/Flake8 whitespace around slice disagreement
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new f1b646efc7 Fix Black/Flake8 whitespace around slice disagreement f1b646efc7 is described below commit f1b646efc7dab2ed5f4185be58aaf0f99e1963d4 Author: David Sidrane AuthorDate: Mon Apr 17 04:38:16 2023 -0400 Fix Black/Flake8 whitespace around slice disagreement See https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8 --- .github/linters/setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/linters/setup.cfg b/.github/linters/setup.cfg index 9c18e21fe5..7723f761ca 100644 --- a/.github/linters/setup.cfg +++ b/.github/linters/setup.cfg @@ -1,4 +1,5 @@ [flake8] +extend-ignore = E203 ignore = W503,W605 max-complexity = 27 max-line-length = 125
[nuttx] branch master updated (947100c5b8 -> 13d823f307)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 947100c5b8 sim: Fix iic/spi bus open failed add 13d823f307 spi_xx25xx: Repair the spi bus locking mechanism when waiting for write completion No new revisions were added by this update. Summary of changes: drivers/eeprom/spi_xx25xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[nuttx-apps] branch master updated: NuttX graduated the Incubator; update repository links
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new e4376a0e6 NuttX graduated the Incubator; update repository links e4376a0e6 is described below commit e4376a0e60c24a834d49013ccbc126dd061e54d2 Author: Nathan Hartman <59230071+hartmannat...@users.noreply.github.com> AuthorDate: Tue Nov 22 14:00:54 2022 -0500 NuttX graduated the Incubator; update repository links --- .github/workflows/build.yml | 10 +- .github/workflows/check.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb6d20c80..db3b97e8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,13 +62,13 @@ jobs: # Determine the repo and leave that unset to use the normal checkout behavior # of using the merge commit instead of HEAD case $GITHUB_REPOSITORY in - "apache/incubator-nuttx") + "apache/nuttx") # OS echo "Triggered by change in OS" APPS_REF=$REF_NAME ;; - "apache/incubator-nuttx-apps" ) + "apache/nuttx-apps" ) # APPS OS_REF=$REF_NAME echo "Triggered by change in APPS" @@ -86,7 +86,7 @@ jobs: - name: Checkout nuttx repo uses: actions/checkout@v3 with: - repository: apache/incubator-nuttx + repository: apache/nuttx ref: ${{ steps.gittargets.outputs.os_ref }} path: sources/nuttx fetch-depth: 1 @@ -96,7 +96,7 @@ jobs: - name: Checkout apps repo uses: actions/checkout@v3 with: - repository: apache/incubator-nuttx-apps + repository: apache/nuttx-apps ref: ${{ steps.gittargets.outputs.apps_ref }} path: sources/apps fetch-depth: 1 @@ -135,7 +135,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Docker Pull -run: docker pull ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux +run: docker pull ghcr.io/apache/nuttx/apache-nuttx-ci-linux - name: Export NuttX Repo SHA run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV - name: Run builds diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 19f65eb19..b7f935197 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -30,14 +30,14 @@ jobs: - name: Checkout nuttx repo uses: actions/checkout@v3 with: - repository: apache/incubator-nuttx + repository: apache/nuttx path: nuttx fetch-depth: 0 - name: Checkout apps repo uses: actions/checkout@v3 with: - repository: apache/incubator-nuttx-apps + repository: apache/nuttx-apps path: apps fetch-depth: 0
[nuttx] branch master updated (83a4b45dd4 -> 03802dad13)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 83a4b45dd4 boards/esp32-wrover-kit: Fix GPIO conflicts add 03802dad13 NuttX graduated the Incubator; update repository links No new revisions were added by this update. Summary of changes: .github/actions/ci-container/action.yaml |2 +- .github/workflows/build.yml| 10 +- .github/workflows/check.yml|2 +- Documentation/applications/index.rst |2 +- Documentation/applications/nsh/login.rst |6 +- .../components/drivers/character/timer.rst |2 +- .../components/drivers/character/watchdog.rst |2 +- Documentation/components/nxflat.rst|6 +- Documentation/components/nxgraphics/appendix.rst |2 +- Documentation/contributing/making-changes.rst | 18 +- Documentation/introduction/detailed_support.rst| 180 +- Documentation/platforms/arm/rp2040/index.rst |4 +- Documentation/platforms/risc-v/esp32c3/index.rst |2 +- Documentation/platforms/xtensa/esp32/index.rst |2 +- .../esp32s2/boards/esp32s2-saola-1/index.rst |2 +- Documentation/platforms/xtensa/esp32s2/index.rst |2 +- Documentation/quickstart/debugging.rst |4 +- Documentation/quickstart/install.rst | 16 +- Documentation/quickstart/organization.rst |2 +- README.md | 32 +- ReleaseNotes | 6568 ++-- arch/arm/src/common/Toolchain.defs |4 +- .../arm/rp2040/adafruit-feather-rp2040/README.txt |4 +- boards/arm/rp2040/adafruit-kb2040/README.txt |4 +- boards/arm/rp2040/adafruit-qt-py-rp2040/README.txt |4 +- boards/arm/rp2040/pimoroni-tiny2040/README.txt |4 +- boards/arm/rp2040/raspberrypi-pico-w/README.txt|4 +- boards/arm/rp2040/raspberrypi-pico/README.txt |4 +- boards/risc-v/fe310/hifive1-revb/README-qemu.txt |4 +- boards/risc-v/fe310/hifive1-revb/README.txt|4 +- boards/risc-v/k210/maix-bit/README-qemu.txt|4 +- boards/risc-v/k210/maix-bit/README.txt |4 +- boards/risc-v/litex/arty_a7/README.txt |4 +- boards/risc-v/qemu-rv/rv-virt/README.txt |8 +- tools/ci/cibuild.sh|4 +- tools/ci/docker/linux/Dockerfile |2 +- 36 files changed, 3464 insertions(+), 3464 deletions(-)
[incubator-nuttx] branch master updated: Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2"
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new f23ec0f995 Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2" f23ec0f995 is described below commit f23ec0f995ec12613924117c0c7004b83cc32312 Author: chao an AuthorDate: Tue Nov 22 23:26:54 2022 +0800 Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2" This reverts commit b4bab51e86e74e5c0ac50c43c52cf7246ffb39a0. Issue: Builtin math symbols are missing on llvm 15.0.2(libm.a): https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/issues/158 Signed-off-by: chao an --- arch/arm/src/armv6-m/Toolchain.defs | 2 +- arch/arm/src/armv7-m/Toolchain.defs | 10 +- arch/arm/src/armv8-m/Toolchain.defs | 14 +++--- arch/arm/src/tlsr82/Toolchain.defs | 2 +- tools/ci/cibuild.sh | 8 tools/ci/docker/linux/Dockerfile| 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs index b921a4bb57..c18787a736 100644 --- a/arch/arm/src/armv6-m/Toolchain.defs +++ b/arch/arm/src/armv6-m/Toolchain.defs @@ -26,7 +26,7 @@ TOOLCHAIN_MFLOAT := -mfloat-abi=soft # Clang Configuration files ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) - TOOLCHAIN_MARCH := --config armv6m_soft_nofp + TOOLCHAIN_MARCH := --config armv6m_soft_nofp_nosys else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y) LDFLAGS += --cpu=Cortex-M0 endif diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs index 25971ceff4..07c942c38b 100644 --- a/arch/arm/src/armv7-m/Toolchain.defs +++ b/arch/arm/src/armv7-m/Toolchain.defs @@ -61,18 +61,18 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) ifeq ($(CONFIG_ARCH_CORTEXM4),y) ifeq ($(CONFIG_ARCH_FPU),y) - TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16 + TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16_nosys else - TOOLCHAIN_MARCH += --config armv7em_soft_nofp + TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys endif else ifeq ($(CONFIG_ARCH_CORTEXM7),y) ifeq ($(CONFIG_ARCH_FPU),y) - TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16 + TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16_nosys else - TOOLCHAIN_MARCH += --config armv7em_soft_nofp + TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys endif else # ifeq ($(CONFIG_ARCH_CORTEXM3),y) - TOOLCHAIN_MARCH += --config armv7m_soft_nofp + TOOLCHAIN_MARCH += --config armv7m_soft_nofp_nosys endif else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y) diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs index bba57b0364..8407e7cd8c 100644 --- a/arch/arm/src/armv8-m/Toolchain.defs +++ b/arch/arm/src/armv8-m/Toolchain.defs @@ -63,24 +63,24 @@ endif ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) ifeq ($(CONFIG_ARCH_CORTEXM23),y) -TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp +TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys else ifeq ($(CONFIG_ARCH_CORTEXM33),y) ifeq ($(CONFIG_ARCH_FPU),y) - TOOLCHAIN_MARCH += --config armv8m.main_hard_fp + TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys else - TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp + TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys endif else ifeq ($(CONFIG_ARCH_CORTEXM35P),y) ifeq ($(CONFIG_ARCH_FPU),y) - TOOLCHAIN_MARCH += --config armv8m.main_hard_fp + TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys else - TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp + TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys endif else ifeq ($(CONFIG_ARCH_CORTEXM55),y) ifeq ($(CONFIG_ARCH_FPU),y) - TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp + TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp_nosys else - TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve + TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve_nosys endif endif diff --git a/arch/arm/src/tlsr82/Toolchain.defs b/arch/arm/src/tlsr82/Toolchain.defs index f473af6a14..410eae8aa9 100644 --- a/arch/arm/src/tlsr82/Toolchain.defs +++ b/arch/arm/src/tlsr82/Toolchain.defs @@ -21,7 +21,7 @@ # Clang Configuration files ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) - TOOLCHAIN_MARCH := --config armv6m_soft_nofp + TOOLCHAIN_MARCH := --config armv6m_soft_nofp_nosys endif # Generic GNU EABI toolchain diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh index 8465b7d841..7abf228f43 100755 --- a/tools/ci/cibuild.sh +++ b/tools/ci/cibuild.sh @@ -60,11 +60,11 @@ function arm-clang-toolchain { if [ ! -f "$
[incubator-nuttx] branch master updated: arch/arm64: Add support for Generic Interrupt Controller Version 2
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 6aba739f05 arch/arm64: Add support for Generic Interrupt Controller Version 2 6aba739f05 is described below commit 6aba739f0542993635aabf7716a60972bf099076 Author: Lee Lup Yuen AuthorDate: Wed Nov 16 15:29:43 2022 +0800 arch/arm64: Add support for Generic Interrupt Controller Version 2 Currently NuttX on Arm64 supports Generic Interrupt Controller (GIC) Versions 3 and 4: [`arm64_gicv3.c`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm64/src/common/arm64_gicv3.c), [`arm64_gic.h`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm64/src/common/arm64_gic.h). This PR adds support for GIC Version 2, which is needed by [Pine64 PinePhone](https://lupyuen.github.io/articles/interrupt) based on Allwinner A64 SoC. This 64-bit implementation of GIC v2 is mostly identical to the existing GIC v2 for 32-bit Armv7-A ([`armv7-a/arm_gicv2.c`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm/src/armv7-a/arm_gicv2.c), [`armv7-a/gic.h`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm/src/armv7-a/gic.h)), with minor modifications to support 64-bit Registers (Interrupt Context). - `arch/arm64/Kconfig`: Under "ARM64 Options", we added an integer option `ARM_GIC_VERSION` ("GIC version") that selects the GIC Version. Valid values are 2, 3 and 4, default is 3. - `arch/arm64/src/common/arm64_gicv2.c`: Implements 64-bit GIC v2 based on 32-bit [`armv7-a/arm_gicv2.c`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm/src/armv7-a/arm_gicv2.c) and [`armv7-a/gic.h`](https://github.com/apache/incubator-nuttx/blob/master/arch/arm/src/armv7-a/gic.h), modified to support 64-bit Registers (Interrupt Context). Function and Macro Names have not been changed, for easier cross-referencing between the 32-bit and 64-bit implementations of GIC v2. - `arch/arm64/src/common/arm64_gicv3.c`: Added Conditional Compilation for GIC v3. This file will not be compiled if `ARM_GIC_VERSION` is 2. - `arch/arm64/src/common/arm64_gic.h`: Added the Version Identifier for GIC v2. At startup we read the GIC Version from hardware and verify that it matches `ARM_GIC_VERSION`. - `arch/arm64/include/qemu/chip.h`: Added the QEMU Base Addresses for GIC v2. - `arch/arm64/src/common/Make.defs`: Added the source file that implements GIC v2. - `boards/arm64/qemu/qemu-armv8a/README.txt`: Added the documentation for testing GIC v2 with QEMU. - `boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig`: Added the Board Configuration `qemu-armv8a:nsh_gicv2` for testing GIC v2 with QEMU. Identical to `qemu-armv8a:nsh`, except that `ARM_GIC_VERSION` is 2. --- arch/arm64/Kconfig |8 + arch/arm64/include/qemu/chip.h | 13 + arch/arm64/src/common/Make.defs|2 +- arch/arm64/src/common/arm64_gic.h |1 + arch/arm64/src/common/arm64_gicv2.c| 1389 arch/arm64/src/common/arm64_gicv3.c|4 + boards/arm64/qemu/qemu-armv8a/README.txt | 21 +- .../qemu/qemu-armv8a/configs/nsh_gicv2/defconfig | 66 + 8 files changed, 1500 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 483f3f6073..cb74385bf4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -95,6 +95,14 @@ config ARM_HAVE_NEON ---help--- Decide whether support NEON instruction +config ARM_GIC_VERSION + int "GIC version" + default 3 + range 2 4 + ---help--- + Version of Generic Interrupt Controller (GIC) supported by the + architecture + if ARCH_CHIP_QEMU source "arch/arm64/src/qemu/Kconfig" endif diff --git a/arch/arm64/include/qemu/chip.h b/arch/arm64/include/qemu/chip.h index 745876852b..6b6cae7521 100644 --- a/arch/arm64/include/qemu/chip.h +++ b/arch/arm64/include/qemu/chip.h @@ -35,9 +35,22 @@ #if defined(CONFIG_ARCH_CHIP_QEMU) +#if CONFIG_ARM_GIC_VERSION == 2 + +#define CONFIG_GICD_BASE 0x800 +#define CONFIG_GICR_BASE 0x801 + +#elif CONFIG_ARM_GIC_VERSION == 3 || CONFIG_ARM_GIC_VERSION == 4 + #define CONFIG_GICD_BASE 0x800 #define CONFIG_GICR_BASE 0x80a +#else + +#error CONFIG_ARM_GIC_VERSION should be 2, 3 or 4 + +#endif /* CONFIG_ARM_GIC_VERSION */ + #define CONFIG_RAMBANK1_ADDR 0x4000 #define CONFIG_RAMBANK1_SIZE MB(128) diff --git a/arch/arm64/src/common/Make.defs b/arch/arm64/src/common/Make.defs index 4e4b1a3a76..515b85f793 100644 ---
[incubator-nuttx-website] branch master updated: Add link to Apache Software Foundation's Privacy Policy
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 3f63f34 Add link to Apache Software Foundation's Privacy Policy 3f63f34 is described below commit 3f63f34b69e8e76bc58212e2cb96ccc0d16b9361 Author: Nathan Hartman <59230071+hartmannat...@users.noreply.github.com> AuthorDate: Mon Nov 7 10:42:49 2022 -0500 Add link to Apache Software Foundation's Privacy Policy * _includes/themes/apache/_navigation.html Add link to Apache.org Privacy Policy. All projects are required to link to the Privacy Policy per: https://www.apache.org/foundation/marks/pmcs.html#navigation --- _includes/themes/apache/_navigation.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/themes/apache/_navigation.html b/_includes/themes/apache/_navigation.html index 4ece4dd..d06f1f6 100644 --- a/_includes/themes/apache/_navigation.html +++ b/_includes/themes/apache/_navigation.html @@ -29,6 +29,7 @@ http://www.apache.org/foundation/how-it-works.html;>Apache Software Foundation http://www.apache.org/licenses/;>License http://www.apache.org/security/;>Security +https://privacy.apache.org/policies/privacy-policy-public.html;>Privacy http://www.apache.org/events/current-event;>Events http://www.apache.org/foundation/sponsorship.html;>Sponsorship http://www.apache.org/foundation/thanks.html;>Thanks
[incubator-nuttx] 02/02: tools/ci/docker/linux/Dockerfile: Keep the installation in alphabetical order
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 8c1036b7a1a7971fead89f070974fc8c60a6ad18 Author: Xiang Xiao AuthorDate: Mon Oct 24 01:05:13 2022 +0800 tools/ci/docker/linux/Dockerfile: Keep the installation in alphabetical order Signed-off-by: Xiang Xiao --- tools/ci/docker/linux/Dockerfile | 193 +++ 1 file changed, 96 insertions(+), 97 deletions(-) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index a3424ce284..be20984c7e 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -27,15 +27,15 @@ RUN apt-get update -qq && apt-get install -y -qq \ FROM builder-base AS nuttx-tools RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \ - flex \ bison \ - gperf \ - libncurses5-dev \ - make \ cmake \ + flex \ g++ \ gawk \ - git + git \ + gperf \ + libncurses5-dev \ + make RUN mkdir /tools WORKDIR /tools @@ -44,8 +44,10 @@ RUN mkdir -p /tools/nuttx-tools RUN curl -s -L https://bitbucket.org/nuttx/tools/get/9ad3e1ee75c7.tar.gz \ | tar -C nuttx-tools --strip-components=1 -xz -RUN cd nuttx-tools/kconfig-frontends \ - && ./configure --enable-mconf --disable-gconf --disable-qconf --enable-static --prefix=/tools/kconfig-frontends \ +RUN mkdir bloaty -p \ + && git clone --depth 1 --branch v1.1 https://github.com/google/bloaty bloaty \ + && cd bloaty \ + && cmake -DCMAKE_SYSTEM_PREFIX_PATH=/tools/bloaty \ && make install RUN cd nuttx-tools \ @@ -54,10 +56,8 @@ RUN cd nuttx-tools \ && cd genromfs \ && make install PREFIX=/tools/genromfs -RUN mkdir bloaty -p \ - && git clone --depth 1 --branch v1.1 https://github.com/google/bloaty bloaty \ - && cd bloaty \ - && cmake -DCMAKE_SYSTEM_PREFIX_PATH=/tools/bloaty \ +RUN cd nuttx-tools/kconfig-frontends \ + && ./configure --enable-mconf --disable-gconf --disable-qconf --enable-static --prefix=/tools/kconfig-frontends \ && make install # Install Rust and targets supported from NuttX @@ -83,6 +83,11 @@ WORKDIR /tools # Build image for tool required by ARM builds ### FROM nuttx-toolchain-base AS nuttx-toolchain-arm +# Download the latest ARM clang toolchain prebuilt by ARM +RUN mkdir clang-arm-none-eabi && \ + curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz; \ + | tar -C clang-arm-none-eabi --strip-components 1 -xz + # Download the latest ARM GCC toolchain prebuilt by ARM RUN mkdir gcc-arm-none-eabi && \ curl -s -L "https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz; \ @@ -90,11 +95,6 @@ RUN mkdir gcc-arm-none-eabi && \ && curl -s -L -O "https://raw.githubusercontent.com/apache/incubator-nuttx/master/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch; \ && patch -p0 < arm-none-eabi-workaround-for-newlib-version-break.patch -# Download the latest ARM clang toolchain prebuilt by ARM -RUN mkdir clang-arm-none-eabi && \ - curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz; \ - | tar -C clang-arm-none-eabi --strip-components 1 -xz - ### # Build image for tool required by ARM64 builds ### @@ -114,66 +114,20 @@ RUN mkdir pinguino-compilers && \ curl -s -L "https://github.com/PinguinoIDE/pinguino-compilers/archive/62db5158d7f6d41c6fadb05de81cc31dd81a1958.tar.gz; \ | tar -C pinguino-compilers --strip-components=2 --wildcards -xz */linux64 -### -# Build image for tool required by RISCV builds -### -FROM nuttx-toolchain-base AS nuttx-toolchain-riscv -# Download the latest RISCV GCC toolchain prebuilt by SiFive -RUN mkdir riscv64-unknown-elf-gcc && \ - curl -s -L "https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14.tar.gz; \ - | tar -C riscv64-unknown-elf-gcc --strip-components 1 -xz - -### -# Build image for tool required by SPARC builds -
[incubator-nuttx] branch master updated (4aad964d48 -> 8c1036b7a1)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git from 4aad964d48 Fix sam4s_nand.c:152:3: error: this 'while' clause does not guard... [-Werror=misleading-indentation] new d922119f0a tools/ci/docker/linux/Dockerfile: Intall libtinfo5 in final image new 8c1036b7a1 tools/ci/docker/linux/Dockerfile: Keep the installation in alphabetical order The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tools/ci/docker/linux/Dockerfile | 194 +++ 1 file changed, 97 insertions(+), 97 deletions(-)
[incubator-nuttx] 01/02: tools/ci/docker/linux/Dockerfile: Intall libtinfo5 in final image
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit d922119f0acc69debd775379ee2a73d97032b8dc Author: Xiang Xiao AuthorDate: Mon Oct 24 00:44:20 2022 +0800 tools/ci/docker/linux/Dockerfile: Intall libtinfo5 in final image fix the following error: /tools/clang-arm-none-eabi/bin/clang: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory Signed-off-by: Xiang Xiao --- tools/ci/docker/linux/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 8bceff7013..a3424ce284 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -248,6 +248,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q libpulse-dev libpulse-dev:i386 \ libpython2.7 \ libncurses5-dev \ + libtinfo5 \ libx11-dev libx11-dev:i386 \ libxext-dev libxext-dev:i386 \ linux-libc-dev:i386 \
[incubator-nuttx] branch master updated (70290b6e38 -> d129c95fd2)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git from 70290b6e38 arch: Change the linker generated symbols from uint32_t to uint8_t * add d129c95fd2 boards/b-g474e-dpow1: Add note about udev/sudo regarding openocd No new revisions were added by this update. Summary of changes: boards/arm/stm32/b-g474e-dpow1/README.txt | 6 ++ 1 file changed, 6 insertions(+)
svn commit: r56272 - /dev/incubator/nuttx/KEYS
Author: btashton Date: Sun Aug 14 02:25:16 2022 New Revision: 56272 Log: nuttx: Add new signing key for btash...@apache.org Modified: dev/incubator/nuttx/KEYS Modified: dev/incubator/nuttx/KEYS == --- dev/incubator/nuttx/KEYS (original) +++ dev/incubator/nuttx/KEYS Sun Aug 14 02:25:16 2022 @@ -400,3 +400,44 @@ Ry/NvVpdxOXdIX/35HsCKQnWCkP55NkfSeBW05bo hfAeYixxQip1A5obhfNr4Ue7 =0HV0 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2022-08-13 [SC] [expires: 2024-08-12] + E6ECA9BA49003B2A246FD9866E72660F995FBC42 +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-13 Brennan Ashton +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [S] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub cv25519 2022-08-14 [E] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [A] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton + +-BEGIN PGP PUBLIC KEY BLOCK- + +mDMEYvg45xYJKwYBBAHaRw8BAQdAn+DPguDU8tLrOuicKQESzhTZ3bFjLPVF9QXl +4veLw1y0KkJyZW5uYW4gQXNodG9uIDxiYXNodG9uQGJyZW5uYW5hc2h0b24uY29t +PoidBBMWCgBFAhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgBYh +BObsqbpJADsqJG/Zhm5yZg+ZX7xCBQJi+DrkAhkBAAoJEG5yZg+ZX7xCRKoBAIBm +Ungvmrr+dhn67yfEfsHUAjRBpc/Wx2DxAXVuq+c3AQD2gkLMANnM1limnuYEcCyP +vw6qbrwpOXPzHSj/hfTmDLQkQnJlbm5hbiBBc2h0b24gPGJ0YXNodG9uQGFwYWNo +ZS5vcmc+iJoEExYKAEIWIQTm7Km6SQA7KiRv2YZucmYPmV+8QgUCYvg+kwIbAwUJ +A8JnAAULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AACgkQbnJmD5lfvEKdvQEA +vK1gY8cRJiDUWy7Z189mKfOaEDk6aBwtkralhPPqhRkBAPUkynFuSePrLrUo8Sya +IUaUozljxKhloY3OBngyg/MGuDMEYvg7+BYJKwYBBAHaRw8BAQdA1b+3iSG6XWGC +kKcr5v1B6bqYS6TNGPuYIZayOmYZOJyI9QQYFgoAJhYhBObsqbpJADsqJG/Zhm5y +Zg+ZX7xCBQJi+Dv4AhsCBQkDwmcAAIEJEG5yZg+ZX7xCdiAEGRYKAB0WIQRrbf/Z +Q0IyJcLL6wn20bLEj1euvgUCYvg7+AAKCRD20bLEj1euvrttAQDbjjqpVLQx5oQ+ +1OAIkQIxd4BDf9qhmwoNV5Xg1XdNfgEA4xNNPH2SQUtpPY+g+E90jVqZN0Fx/xnm +TU3VFCYmAgRaoQEAqHqE+iVERXiYI9f/z5BnQpR37ddBtzP+ghNdQPoQ+xYBAKQx +JDrD03CfdOGymrgyk3NbgspZgCvM0uAY/3Ivx+QAuDgEYvg8FxIKKwYBBAGXVQEF +AQEHQGoxz+L6ViiWz4TvsMEjoC5wx1B2gJgVuifVbEtEUnIGAwEIB4h+BBgWCgAm +FiEE5uypukkAOyokb9mGbnJmD5lfvEIFAmL4PBcCGwwFCQPCZwAACgkQbnJmD5lf +vEJg7AEAgQxVDme244fbCIF7FcJA+Kn9KbvzmwdqjLSEclxHPWYBAK9Scqtdm/0R +ZczPGB8PCh7MSR/o3pKs1kaEFT7leOwOuDMEYvg8LRYJKwYBBAHaRw8BAQdA0k36 +19k0Yful7WGI82JcoguqovzRqwmmPFeHYRiUSyuIfgQYFgoAJhYhBObsqbpJADsq +JG/Zhm5yZg+ZX7xCBQJi+DwtAhsgBQkDwmcAAAoJEG5yZg+ZX7xC7wsA/0tGWKqU +zfkT+Ylv8txMCRoMTbByBR2ORI++XeQ7XYuHAQC3gq6TKnUWP5Zoer+DZYOfZ3t7 +JEIBhZo5M3xHPE1fAg== +=TOEH +-END PGP PUBLIC KEY BLOCK-
svn commit: r56271 - in /release/incubator/nuttx: ./ 10.0.1/ 9.1.1/
Author: btashton Date: Sun Aug 14 02:13:28 2022 New Revision: 56271 Log: nuttx: Add new signing key for btash...@apache.org Modified: release/incubator/nuttx/10.0.1/apache-nuttx-10.0.1-incubating.tar.gz.asc release/incubator/nuttx/10.0.1/apache-nuttx-apps-10.0.1-incubating.tar.gz.asc release/incubator/nuttx/9.1.1/apache-nuttx-9.1.1-incubating.tar.gz.asc release/incubator/nuttx/9.1.1/apache-nuttx-apps-9.1.1-incubating.tar.gz.asc release/incubator/nuttx/KEYS Modified: release/incubator/nuttx/10.0.1/apache-nuttx-10.0.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/10.0.1/apache-nuttx-apps-10.0.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/9.1.1/apache-nuttx-9.1.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/9.1.1/apache-nuttx-apps-9.1.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/KEYS == --- release/incubator/nuttx/KEYS (original) +++ release/incubator/nuttx/KEYS Sun Aug 14 02:13:28 2022 @@ -400,3 +400,44 @@ Ry/NvVpdxOXdIX/35HsCKQnWCkP55NkfSeBW05bo hfAeYixxQip1A5obhfNr4Ue7 =0HV0 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2022-08-13 [SC] [expires: 2024-08-12] + E6ECA9BA49003B2A246FD9866E72660F995FBC42 +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-13 Brennan Ashton +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [S] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub cv25519 2022-08-14 [E] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [A] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton + +-BEGIN PGP PUBLIC KEY BLOCK- + +mDMEYvg45xYJKwYBBAHaRw8BAQdAn+DPguDU8tLrOuicKQESzhTZ3bFjLPVF9QXl +4veLw1y0KkJyZW5uYW4gQXNodG9uIDxiYXNodG9uQGJyZW5uYW5hc2h0b24uY29t +PoidBBMWCgBFAhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgBYh +BObsqbpJADsqJG/Zhm5yZg+ZX7xCBQJi+DrkAhkBAAoJEG5yZg+ZX7xCRKoBAIBm +Ungvmrr+dhn67yfEfsHUAjRBpc/Wx2DxAXVuq+c3AQD2gkLMANnM1limnuYEcCyP +vw6qbrwpOXPzHSj/hfTmDLQkQnJlbm5hbiBBc2h0b24gPGJ0YXNodG9uQGFwYWNo +ZS5vcmc+iJoEExYKAEIWIQTm7Km6SQA7KiRv2YZucmYPmV+8QgUCYvg+kwIbAwUJ +A8JnAAULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AACgkQbnJmD5lfvEKdvQEA +vK1gY8cRJiDUWy7Z189mKfOaEDk6aBwtkralhPPqhRkBAPUkynFuSePrLrUo8Sya +IUaUozljxKhloY3OBngyg/MGuDMEYvg7+BYJKwYBBAHaRw8BAQdA1b+3iSG6XWGC +kKcr5v1B6bqYS6TNGPuYIZayOmYZOJyI9QQYFgoAJhYhBObsqbpJADsqJG/Zhm5y +Zg+ZX7xCBQJi+Dv4AhsCBQkDwmcAAIEJEG5yZg+ZX7xCdiAEGRYKAB0WIQRrbf/Z +Q0IyJcLL6wn20bLEj1euvgUCYvg7+AAKCRD20bLEj1euvrttAQDbjjqpVLQx5oQ+ +1OAIkQIxd4BDf9qhmwoNV5Xg1XdNfgEA4xNNPH2SQUtpPY+g+E90jVqZN0Fx/xnm +TU3VFCYmAgRaoQEAqHqE+iVERXiYI9f/z5BnQpR37ddBtzP+ghNdQPoQ+xYBAKQx +JDrD03CfdOGymrgyk3NbgspZgCvM0uAY/3Ivx+QAuDgEYvg8FxIKKwYBBAGXVQEF +AQEHQGoxz+L6ViiWz4TvsMEjoC5wx1B2gJgVuifVbEtEUnIGAwEIB4h+BBgWCgAm +FiEE5uypukkAOyokb9mGbnJmD5lfvEIFAmL4PBcCGwwFCQPCZwAACgkQbnJmD5lf +vEJg7AEAgQxVDme244fbCIF7FcJA+Kn9KbvzmwdqjLSEclxHPWYBAK9Scqtdm/0R +ZczPGB8PCh7MSR/o3pKs1kaEFT7leOwOuDMEYvg8LRYJKwYBBAHaRw8BAQdA0k36 +19k0Yful7WGI82JcoguqovzRqwmmPFeHYRiUSyuIfgQYFgoAJhYhBObsqbpJADsq +JG/Zhm5yZg+ZX7xCBQJi+DwtAhsgBQkDwmcAAAoJEG5yZg+ZX7xC7wsA/0tGWKqU +zfkT+Ylv8txMCRoMTbByBR2ORI++XeQ7XYuHAQC3gq6TKnUWP5Zoer+DZYOfZ3t7 +JEIBhZo5M3xHPE1fAg== +=TOEH +-END PGP PUBLIC KEY BLOCK-
[incubator-nuttx] branch master updated: drivers/leds/ws2812: Revert SPI frequency change
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new e1e89b925f drivers/leds/ws2812: Revert SPI frequency change e1e89b925f is described below commit e1e89b925fc7bf6a66f85ce5853ab3a9101eae05 Author: Diego Herranz AuthorDate: Sat Aug 13 17:33:10 2022 +0200 drivers/leds/ws2812: Revert SPI frequency change https://github.com/apache/incubator-nuttx/commit/0c3db448bb64c8877a4dfa62416027b24a639a8e added the option to generate the waveforms to drive ws2812 and similar LEDs using different hardware (e.g. RP2040 PIO instead of SPI). For that new mode, the concept of CONFIG_WS2812_FREQUENCY is different. Instead of the SPI frequency (commonly a few MHz), it is the frequency of the actual output waveform (commonly 400 or 800 kHz). There was an attempt to express the SPI frequency divided by 10, but it's not actually the case either (it would be divided by 8). I think it is clearer to explain in Kconfig what CONFIG_WS2812_FREQUENCY means for each mode and go back to the previous behaviour for the original SPI mode (also to avoid breaking out-of-tree boards). --- drivers/leds/Kconfig | 12 drivers/leds/ws2812.c | 8 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index ad23a4ca94..f2525a81ea 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -148,9 +148,13 @@ config WS2812_FREQUENCY default 80 depends on WS2812 ---help--- - This is should be set to the bit frequency of the - ws2812s being used. Newer chips use an 800 kHz - bit frequency (the default); although, some older - chips run at 400 kHz. + Frequency in Hz. + On SPI mode (WS2812_NON_SPI_DRIVER not selected), this is + the SPI frequency (commonly a few MHz) to generate the required + waveforms to represent a 0/1 symbol. + On non SPI mode (WS2812_NON_SPI_DRIVER selected), this should be set + to the bit frequency of the ws2812s being used. Newer chips use an + 800 kHz bit frequency (the default); although, some older chips run + at 400 kHz. endmenu # LED Support diff --git a/drivers/leds/ws2812.c b/drivers/leds/ws2812.c index 0919d3f500..f47fd2e61b 100644 --- a/drivers/leds/ws2812.c +++ b/drivers/leds/ws2812.c @@ -78,10 +78,10 @@ * Reset: low signal >50us */ -#if CONFIG_WS2812_FREQUENCY >= 36 && CONFIG_WS2812_FREQUENCY <= 50 +#if CONFIG_WS2812_FREQUENCY >= 360 && CONFIG_WS2812_FREQUENCY <= 500 # define WS2812_ZERO_BYTE 0b0100 /* 200ns at 5 MHz, 278ns at 3.6 MHz */ # define WS2812_ONE_BYTE 0b0111 /* 600ns at 5 MHz, 833ns at 3.6 MHz */ -#elif CONFIG_WS2812_FREQUENCY >= 59 && CONFIG_WS2812_FREQUENCY <= 90 +#elif CONFIG_WS2812_FREQUENCY >= 590 && CONFIG_WS2812_FREQUENCY <= 900 # define WS2812_ZERO_BYTE 0b0110 /* 222ns at 9 MHz, 339ns at 5.9 MHz */ # define WS2812_ONE_BYTE 0b0100 /* 556ns at 9 MHz, 847ns at 5.9 MHz */ #else @@ -93,7 +93,7 @@ * Aiming for 60 us, safely above the 50us required. */ -#define WS2812_RST_CYCLES (CONFIG_WS2812_FREQUENCY * 60 / 10 / 8) +#define WS2812_RST_CYCLES (CONFIG_WS2812_FREQUENCY * 60 / 100 / 8) #define WS2812_BYTES_PER_LED (8 * 3) @@ -389,7 +389,7 @@ static inline void ws2812_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE3); SPI_SETBITS(spi, 8); SPI_HWFEATURES(spi, 0); - SPI_SETFREQUENCY(spi, 10 * CONFIG_WS2812_FREQUENCY); + SPI_SETFREQUENCY(spi, CONFIG_WS2812_FREQUENCY); } /
[incubator-nuttx] branch master updated (4285274c31 -> feb5c5307a)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git from 4285274c31 New stm32wb chip family add 0c3db448bb Added Adafruit Feather RP2040, Adafruit KB2040 and Added neopixel driver to support RP2040 add feb5c5307a fixed up defconfig files. No new revisions were added by this update. Summary of changes: .../components/drivers/character/ws2812.rst| 32 ++ Kconfig| 2 +- arch/arm/src/rp2040/Kconfig| 15 +- arch/arm/src/rp2040/Make.defs | 4 + arch/arm/src/rp2040/rp2040_dmac.c | 2 +- arch/arm/src/rp2040/rp2040_dmac.h | 2 +- arch/arm/src/rp2040/rp2040_ws2812.c| 635 + .../arm/src/rp2040/rp2040_ws2812.h | 71 ++- arch/arm/src/rp2040/rp2040_ws2812.pio | 46 ++ boards/Kconfig | 22 + boards/arm/rp2040/adafruit-feather-rp2040/Kconfig | 342 +++ .../arm/rp2040/adafruit-feather-rp2040/README.txt | 180 ++ .../configs/audiopack/defconfig| 76 +++ .../configs/composite/defconfig| 79 +++ .../configs/displaypack/defconfig | 103 .../configs/enc28j60/defconfig | 88 +++ .../configs/lcd1602/defconfig | 61 ++ .../adafruit-feather-rp2040/configs/nsh/defconfig | 53 ++ .../configs/nshsram/defconfig | 53 ++ .../adafruit-feather-rp2040/configs/smp/defconfig | 59 ++ .../configs/spisd/defconfig| 65 +++ .../configs/ssd1306/defconfig | 80 +++ .../configs/st7735/defconfig | 64 +++ .../configs/usbmsc/defconfig | 72 +++ .../configs/usbnsh/defconfig | 57 ++ .../configs/waveshare-lcd-1.14/defconfig | 100 .../configs/waveshare-lcd-1.3/defconfig| 97 .../rp2040/adafruit-feather-rp2040/include/board.h | 116 .../include/rp2040_i2cdev.h| 48 +- .../include/rp2040_i2sdev.h| 48 +- .../include/rp2040_spidev.h| 45 +- .../adafruit-feather-rp2040/include/rp2040_spisd.h | 55 +- .../adafruit-feather-rp2040/scripts/Make.defs | 45 ++ .../scripts/adafruit-feather-rp2040-flash.ld | 112 .../scripts/adafruit-feather-rp2040-sram.ld| 97 .../rp2040/adafruit-feather-rp2040/src/Make.defs | 41 ++ .../adafruit-feather-rp2040/src/rp2040_appinit.c | 62 +- .../src/rp2040_boardinitialize.c | 166 ++ .../adafruit-feather-rp2040/src/rp2040_bringup.c | 466 +++ .../adafruit-feather-rp2040/src/rp2040_gpio.c | 392 + .../adafruit-feather-rp2040/src/rp2040_pico.h | 36 ++ .../adafruit-feather-rp2040/src/rp2040_reset.c | 55 +- .../adafruit-feather-rp2040/src/rp2040_spi.c | 150 + boards/arm/rp2040/adafruit-kb2040/Kconfig | 359 boards/arm/rp2040/adafruit-kb2040/README.txt | 179 ++ .../adafruit-kb2040/configs/audiopack/defconfig| 76 +++ .../adafruit-kb2040/configs/composite/defconfig| 79 +++ .../adafruit-kb2040/configs/displaypack/defconfig | 103 .../adafruit-kb2040/configs/enc28j60/defconfig | 88 +++ .../adafruit-kb2040/configs/lcd1602/defconfig | 61 ++ .../rp2040/adafruit-kb2040/configs/nsh/defconfig | 53 ++ .../adafruit-kb2040/configs/nshsram/defconfig | 53 ++ .../rp2040/adafruit-kb2040/configs/smp/defconfig | 59 ++ .../rp2040/adafruit-kb2040/configs/spisd/defconfig | 65 +++ .../adafruit-kb2040/configs/ssd1306/defconfig | 80 +++ .../adafruit-kb2040/configs/st7735/defconfig | 64 +++ .../adafruit-kb2040/configs/usbmsc/defconfig | 72 +++ .../adafruit-kb2040/configs/usbnsh/defconfig | 57 ++ .../configs/waveshare-lcd-1.14/defconfig | 100 .../configs/waveshare-lcd-1.3/defconfig| 97 boards/arm/rp2040/adafruit-kb2040/include/board.h | 116 .../rp2040/adafruit-kb2040/include/rp2040_i2cdev.h | 48 +- .../rp2040/adafruit-kb2040/include/rp2040_i2sdev.h | 48 +- .../rp2040/adafruit-kb2040/include/rp2040_spidev.h | 45 +- .../rp2040/adafruit-kb2040/include/rp2040_spisd.h | 55 +- .../arm/rp2040/adafruit-kb2040/scripts/Make.defs | 45 ++ .../scripts/adafruit-kb2040-flash.ld | 112 .../scripts/adafruit-kb2040-sram.ld| 97 boards/arm/rp2040/adafruit-kb2040/src/Make.defs| 41 ++ .../rp2040/adafruit-kb2040/src/rp2040_appinit.c| 62 +- .../adafruit-kb2040/src/rp2040_boardinitialize.c | 160 ++ .../rp2040/adafruit-kb2040/src/rp2040_bringup.c| 466 +++ .../arm/rp2040
[incubator-nuttx-apps] 01/02: .github/workflows: Add nuttx/source to the safe directory
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git commit 99d905369ec26d547a6d6981575c4bf8719a872c Author: Xiang Xiao AuthorDate: Thu Jun 23 05:33:15 2022 +0800 .github/workflows: Add nuttx/source to the safe directory Signed-off-by: Xiang Xiao --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da2c14eb9..1e9ded99d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,6 +145,7 @@ jobs: export CCACHE_DIR=`pwd`/ccache mkdir $CCACHE_DIR export ARTIFACTDIR=`pwd`/buildartifacts +git config --global --add safe.directory /github/workspace/sources/nuttx cd sources/nuttx/tools/ci ./cibuild.sh -A -c testlist/${{matrix.boards}}.dat ccache -s
[incubator-nuttx-apps] 02/02: .github/workflows: Add nuttx/source to the safe directory, covering apps
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git commit db9ea407986ff9c73dc92307e220c609d036b70d Author: qinwei1 AuthorDate: Fri Jun 24 18:28:22 2022 -0700 .github/workflows: Add nuttx/source to the safe directory, covering apps Signed-off-by: qinwei1 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e9ded99d..5ab725e35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,6 +146,7 @@ jobs: mkdir $CCACHE_DIR export ARTIFACTDIR=`pwd`/buildartifacts git config --global --add safe.directory /github/workspace/sources/nuttx +git config --global --add safe.directory /github/workspace/sources/apps cd sources/nuttx/tools/ci ./cibuild.sh -A -c testlist/${{matrix.boards}}.dat ccache -s
[incubator-nuttx-apps] branch master updated (61250d551 -> db9ea4079)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git from 61250d551 wireless/wapi: add get country code support new 99d905369 .github/workflows: Add nuttx/source to the safe directory new db9ea4079 .github/workflows: Add nuttx/source to the safe directory, covering apps The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+)
[incubator-nuttx-website] branch master updated: Revert "Revert "Add release 10.3.0""
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 3c980bc Revert "Revert "Add release 10.3.0"" 3c980bc is described below commit 3c980bc717a3874c683a1bd2a48c64c33af05833 Author: Alin Jerpelea AuthorDate: Wed Jun 22 07:30:13 2022 +0200 Revert "Revert "Add release 10.3.0"" This reverts commit da814d4197bf52d49b3681b9a8b9d04cd272ff5f. --- _releases/10.3.0.md | 1098 +++ 1 file changed, 1098 insertions(+) diff --git a/_releases/10.3.0.md b/_releases/10.3.0.md new file mode 100644 index 000..6b40685 --- /dev/null +++ b/_releases/10.3.0.md @@ -0,0 +1,1098 @@ +--- +layout: page +released: true +apache: true +title: 10.3.0 +date: 2022-06-03 +summary: > +Release v10.3.0 + +artifact-root: "https://www.apache.org/dyn/closer.lua/incubator/nuttx/10.3.0; +checksum-root: "https://downloads.apache.org/incubator/nuttx/10.3.0; +key-file: "https://downloads.apache.org/incubator/nuttx/KEYS; + +source-os-dist: +- "apache-nuttx-10.3.0-incubating.tar.gz" +source-app-dist: +- "apache-nuttx-apps-10.3.0-incubating.tar.gz" + +--- + + + + +{% include JB/setup %} + +# Apache NuttX-10.3.0 Release Notes +* TOC +{:toc} + + +# What's New In This Release + +## Major Changes to Core OS + +### New Features + +* [#5524](https://github.com/apache/incubator-nuttx/pull/#5524) mm: iob: add support of alloc with timeout iob_timedalloc() +* [#4743](https://github.com/apache/incubator-nuttx/pull/#4743) mm: Support the kernel address sanitizer +* [#5498](https://github.com/apache/incubator-nuttx/pull/#5498) sched: Implement task local storage +* [#5418](https://github.com/apache/incubator-nuttx/pull/#5418) sched: Implement sysinfo function +* [#5590](https://github.com/apache/incubator-nuttx/pull/#5590) sched: os init_state: add new state OSINIT_IDLELOOP +* [#4698](https://github.com/apache/incubator-nuttx/pull/#4698) sched: mq_open: add long file name check and parameter check +* [#5445](https://github.com/apache/incubator-nuttx/pull/#5445) task: Always implement posix_spawnp as macro +* [#4963](https://github.com/apache/incubator-nuttx/pull/#4963) trace: and sched note dump +* [#5366](https://github.com/apache/incubator-nuttx/pull/#5366) binfmt: libelf: Implement sh_addralign handling +* [#4871](https://github.com/apache/incubator-nuttx/pull/#4871) binfmt: elf: add bare metal coredump support + +### Bug Fixes + +* [#5503](https://github.com/apache/incubator-nuttx/pull/#5503) Replece clock_gettime with clock_systime_timespec if suitable +* [#5721](https://github.com/apache/incubator-nuttx/pull/#5721) Remove the unnecessary code from nx_start +* [#5681](https://github.com/apache/incubator-nuttx/pull/#5681) Simplify and unify fcntl with FIOCLEX and FIONCLEX +* [#5082](https://github.com/apache/incubator-nuttx/pull/#5082) compile/flags: add FRAME_POINTER into Toolchain.defs +* [#5199](https://github.com/apache/incubator-nuttx/pull/#5199) file_operations: get back C89 compatible initializer +* [#5065](https://github.com/apache/incubator-nuttx/pull/#5065) reanme CONFIG_USER_ENTRYPOINT to CONFIG_INIT_ENTRYPOINT +* [#5399](https://github.com/apache/incubator-nuttx/pull/#5399) Add CONFIG_NDEBUG Kconfig to control NDEBUG definition +* [#5347](https://github.com/apache/incubator-nuttx/pull/#5347) register_driver: fix driver modes accross the code +* [#5509](https://github.com/apache/incubator-nuttx/pull/#5509) libc.csv: Add pthread_setname_np and pthread_getname_np +* [#5364](https://github.com/apache/incubator-nuttx/pull/#5364) libc.csv: Add more symbols + +* [#4971](https://github.com/apache/incubator-nuttx/pull/#4971) audio: audio_comp.c: capbility should use collections +* [#5072](https://github.com/apache/incubator-nuttx/pull/#5072) graphics: vncserver: Implement vsync +* [#5058](https://github.com/apache/incubator-nuttx/pull/#5058) graphics: vncserver: Fix buffer overflow +* [#5132](https://github.com/apache/incubator-nuttx/pull/#5132) graphics: vnc: Decouple VNC server from NX graphic stack +* [#4998](https://github.com/apache/incubator-nuttx/pull/#4998) system: note dump: add CONFIG_SCHED_INSTRUMENTATION_SWITCH +* [#5435](https://github.com/apache/incubator-nuttx/pull/#5435) wireless: bluetooth: fix build break if NET_6LOWPAN enabled + +* [#5487](https://github.com/apache/incubator-nuttx/pull/#5487) binfmt: Decouple builtin from binfs file system +* [#4667](https://github.com/apache/incubator-nuttx/pull/#4667) binfmt: Remove umm_initialize from elf_load +* [#5351](https://github.com/apache/incubator-nuttx/pull/#5351) binfmt: elf.c: Fix syslog formats for ELF64 +* [#5522](https://github.com/apache/incubator-nuttx/pull/#5522)
[incubator-nuttx] branch master updated (c5bdbc8 -> fbfe457)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from c5bdbc8 ci: get rust copied to final image. add fbfe457 ci: add RUSTUP_HOME to get rustup parts into container No new revisions were added by this update. Summary of changes: tools/ci/docker/linux/Dockerfile | 2 ++ 1 file changed, 2 insertions(+)
[incubator-nuttx] branch master updated (419bc2f -> c5bdbc8)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 419bc2f mm: handle take mm sem in IRQ add c5bdbc8 ci: get rust copied to final image. No new revisions were added by this update. Summary of changes: tools/ci/cibuild.sh | 4 ++-- tools/ci/docker/linux/Dockerfile | 20 2 files changed, 14 insertions(+), 10 deletions(-)
[incubator-nuttx] branch master updated: Doc: Update download version to 10.1 and fix tar command
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new eaf50cd Doc: Update download version to 10.1 and fix tar command eaf50cd is described below commit eaf50cd06b5e5b1c6521f0594a4bd6abde5b15fe Author: Alan C. Assis AuthorDate: Thu Sep 16 12:49:45 2021 -0300 Doc: Update download version to 10.1 and fix tar command --- Documentation/quickstart/install.rst | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/quickstart/install.rst b/Documentation/quickstart/install.rst index f08b036..ea8c197 100644 --- a/Documentation/quickstart/install.rst +++ b/Documentation/quickstart/install.rst @@ -165,8 +165,8 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, ` $ cd nuttx $ curl -L https://github.com/apache/incubator-nuttx/tarball/master -o nuttx.tar.gz $ curl -L https://github.com/apache/incubator-nuttx-apps/tarball/master -o apps.tar.gz - $ tar zxf nuttx.tar.gz - $ tar zxf apps.tar.gz + $ tar zxf nuttx.tar.gz --one-top-level=nuttx --strip-components 1 + $ tar zxf apps.tar.gz --one-top-level=apps --strip-components 1 There are also ``.zip`` archives available (useful for Windows users): just replace ``tarball`` with ``zipball``. @@ -174,13 +174,13 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, ` .. tab:: Download stable release Go to `releases <https://nuttx.apache.org/download/>`_ and choose a version to download. The following -example uses version 9.1.0: +example uses version 10.1.0: .. code-block:: console $ mkdir nuttx $ cd nuttx - $ curl -L https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-9.1.0-incubating.tar.gz -o nuttx.tar.gz - $ curl -L https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-apps-9.1.0-incubating.tar.gz -o apps.tar.gz + $ curl -L https://www.apache.org/dyn/closer.lua/incubator/nuttx/10.1.0/apache-nuttx-10.1.0-incubating.tar.gz?action=download -o nuttx.tar.gz + $ curl -L https://www.apache.org/dyn/closer.lua/incubator/nuttx/10.1.0/apache-nuttx-apps-10.1.0-incubating.tar.gz?action=download -o apps.tar.gz $ tar zxf nuttx.tar.gz $ tar zxf apps.tar.gz
[incubator-nuttx-website] branch master updated: Change KEYS link to https://downloads.apache.org/incubator/nuttx/KEYS
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new ea6fce8 Change KEYS link to https://downloads.apache.org/incubator/nuttx/KEYS ea6fce8 is described below commit ea6fce84bf8202600a0318215864afe272c81f07 Author: Xiang Xiao AuthorDate: Fri Sep 17 10:39:05 2021 +0800 Change KEYS link to https://downloads.apache.org/incubator/nuttx/KEYS Signed-off-by: Xiang Xiao --- download.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.md b/download.md index ebab173..be101cb 100644 --- a/download.md +++ b/download.md @@ -59,7 +59,7 @@ and another for the integrated Apps. Choose a source distribution in *tar.gz* format, and [verify](http://www.apache.org/dyn/closer.cgi#verify) using the corresponding *pgp* signature (using the committer file in -[KEYS](http://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)). +[KEYS](https://downloads.apache.org/{{ site.data.project.incubator_slash_name }}/KEYS)). If you cannot do that, the *sha512* hash file may be used to check that the download has completed OK.
[incubator-nuttx] branch master updated: Remove duplicated Documentation of the bl602evb
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new b9ec006 Remove duplicated Documentation of the bl602evb b9ec006 is described below commit b9ec0063bc847d4ddf01dbf37027b3636c4c62a5 Author: Alan C. Assis AuthorDate: Mon Jul 19 10:23:14 2021 -0300 Remove duplicated Documentation of the bl602evb --- boards/risc-v/bl602/bl602evb/README.txt | 197 1 file changed, 197 deletions(-) diff --git a/boards/risc-v/bl602/bl602evb/README.txt b/boards/risc-v/bl602/bl602evb/README.txt deleted file mode 100644 index 427c8e3..000 --- a/boards/risc-v/bl602/bl602evb/README.txt +++ /dev/null @@ -1,197 +0,0 @@ -# Getting Started with nsh configuration -1. Download and install toolchain - - $ curl https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14.tar.gz - -2. Download flash tools - There are multiple tools that can be used, but option (a) is recommended. - a. blflash -- cross platform open-source (recommended) - curl -L -o blflash https://github.com/spacemeowx2/blflash/releases/download/v0.3.0/blflash-linux-amd64 - chmod +x ./blflash - - b. Bouffalo Lab flash tools (official) - https://github.com/bouffalolab/flash_tools.git - -3. Configure and build NuttX - - $ mkdir ./nuttx; cd ./nuttx - $ git clone https://github.com/apache/incubator-nuttx.git nuttx - $ git clone https://github.com/apache/incubator-nuttx-apps.git apps - $ cd nuttx - $ make distclean - $ ./tools/configure.sh bl602evb:nsh - $ make -j - -4. Connect bl602 and computer via USB - -5. Flash - Use option (a) or (b) based on tool selection in section 2. - a. Using blflash -Place the board in bootloader mode - bl602evb: Jumper IO8 to HI and press reset - DT-BL10: Press and hold D8, press and release EN, release D8 - -$ blflash flash nuttx.bin --port /dev/ttyUSB0 - [INFO blflash::flasher] Start connection... - [TRACE blflash::flasher] 5ms send count 55 - [TRACE blflash::flasher] handshake sent elapsed 159.674µs - [INFO blflash::flasher] Connection Succeed - [INFO blflash] Bootrom version: 1 - [TRACE blflash] Boot info: BootInfo { len: 14, bootrom_version: 1, otp_info: [0, 0, 0, 0, 3, 0, 0, 0, a4, 9b, 2, 42, e8, b4, 1d, 0] } - [INFO blflash::flasher] Sending eflash_loader... - [INFO blflash::flasher] Finished 2.563450723s 11.15KB/s - [TRACE blflash::flasher] 5ms send count 500 - [TRACE blflash::flasher] handshake sent elapsed 5.065786ms - [INFO blflash::flasher] Entered eflash_loader - [INFO blflash::flasher] Skip segment addr: 0 size: 47504 sha256 matches - [INFO blflash::flasher] Skip segment addr: e000 size: 272 sha256 matches - [INFO blflash::flasher] Skip segment addr: f000 size: 272 sha256 matches - [INFO blflash::flasher] Skip segment addr: 1 size: 351584 sha256 matches - [INFO blflash::flasher] Skip segment addr: 1f8000 size: 5671 sha256 matches - [INFO blflash] Success - - b Using BL flash_tools -Run flash tools, select the nuttx.bin generated in the previous step in the -Firmware bin field, and refer to the document for the settings of the remaining fields. - -6. Run connect terminal to UART (default baudrate 200) -$ screen /dev/ttyUSB0 200 -7. Reset Device -bl602evb: Press reset -DT-BL10: Press and release EN -8. NSH should appear on console - - -# Using openocd and gdb: -This guide is focused on the bl602evb board. See the reference manual for -how to connect to the JTAG interface for other boards. - -1. Make sure you are running a recently built version of openocd. The packaged -versions are very old, and will likely not work. https://github.com/ntfreak/openocd - - -2. Create a openocd-bl602.cfg file -## -adapter driver ftdi -ftdi_vid_pid 0x0403 0x6010 -ftdi_channel 1 - -transport select jtag -adapter speed 2000 - -ftdi_layout_init 0x00f8 0x00fb -set _CHIPNAME riscv -jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x2c05 - -set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME.0 riscv -chain-position $_TARGETNAME -$_TARGETNAME.0 configure -work-area-phys 0x2202 -work-area-size 0x1 -work-area-backup 1 - -echo "Ready for Remote Connections" - -$_TARGETNAME.0 configure -event reset-assert-pre { -echo "reset-assert-pre" -adapter speed 100 -} - -$_TARGETNAME.0 configure -event reset-deassert-post { -echo "reset-deassert-post" -adapter speed 4000 -reg mstatus 0x8000 -reg pc 0x2100 -} - -$_TARGETNAME.0 configure -event reset-init { -echo "reset-init" -adapter speed 4000 -} - -gdb_memory_map en
[incubator-nuttx] branch master updated (77dfb39 -> 37e30cc)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 77dfb39 risc-v/esp32c3: Uniformize references to CPU interrupt ID add 37e30cc tools/ci: Workaround conflict with x86_64-elf-binutils after avr-gcc version bump No new revisions were added by this update. Summary of changes: tools/ci/cibuild.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
[incubator-nuttx-website] branch master updated: Add Sara as member
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 00a9603 Add Sara as member 00a9603 is described below commit 00a9603e0c1f0b3169c50befd0cf6aa8a40daec3 Author: Alan C. Assis AuthorDate: Thu May 27 19:17:36 2021 -0300 Add Sara as member --- _data/contributors.yml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/_data/contributors.yml b/_data/contributors.yml index 07c2675..13a5974 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -143,6 +143,12 @@ role: PPMC, Committer org: +- name: Sara da Cunha Monteiro de Souza + apacheId: sara + githubId: saramonteiro + role: PPMC, Committer + org: + - name: Sebastian Ene apacheId: sene githubId: sebastianene07
[incubator-nuttx-website] branch master updated: Add release 10.1.0
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new a8e3edf Add release 10.1.0 a8e3edf is described below commit a8e3edf6caf2d6c6a8e0c58369a54bdbb23e3fdf Author: Alin Jerpelea AuthorDate: Wed May 26 09:17:39 2021 +0200 Add release 10.1.0 Signed-off-by: Alin Jerpelea --- _releases/10.1.0.md | 998 1 file changed, 998 insertions(+) diff --git a/_releases/10.1.0.md b/_releases/10.1.0.md new file mode 100644 index 000..2398b07 --- /dev/null +++ b/_releases/10.1.0.md @@ -0,0 +1,998 @@ +--- +layout: page +released: true +apache: true +title: 10.1.0 +date: 2021-5-26 +summary: > +Release v10.1.0 + +artifact-root: "https://downloads.apache.org/incubator/nuttx/10.1.0; +checksum-root: "https://downloads.apache.org/incubator/nuttx/10.1.0; +key-file: "https://downloads.apache.org/incubator/nuttx/KEYS; + +source-os-dist: +- "apache-nuttx-10.1.0-incubating.tar.gz" +source-app-dist: +- "apache-nuttx-apps-10.1.0-incubating.tar.gz" + +--- + + + + +{% include JB/setup %} + +# Apache NuttX-10.1.0 Release Notes +* TOC +{:toc} + +# What's New In This Release + +## Highlights + +* Better separation between kernel and userspace. +* Heap and stack management improvements. +* More closely follow POSIX and Linux interfaces. +* Symmetric Multi-Processing (SMP) performance improvements and bug fixes. +* Networking improvements and bug fixes. +* Added support for many microcontrollers and boards, and improved support for many existing ones. +* Many added and improved drivers. +* Build system improvements to deliver faster builds. +* Thousands of NuttX files converted to Apache 2.0 License with permission of their authors. +* Improved listing of 3rd party licenses used in NuttX (see LICENSE, NOTICE, and DISCLAIMER-WIP files). + +## Major Changes to Core OS + +### New Features +* [#2324](https://github.com/apache/incubator-nuttx/pull/2324) audio: libsamplerate: add initial audio Sample Rate Converter +* [#2820](https://github.com/apache/incubator-nuttx/pull/2820) arch, boards, drivers, include, sched, wireless: Change spinlock APIs. +* [#2885](https://github.com/apache/incubator-nuttx/pull/2885) Ensure the kernel component don't call userspace API + +### Bug Fixes +* [#1852](https://github.com/apache/incubator-nuttx/pull/1852) sysconf: add _SC_PAGESIZE sysconf support +* [#1922](https://github.com/apache/incubator-nuttx/pull/1922) sched: nxtask_start should call entry point directly for kernel thread +* [#1994](https://github.com/apache/incubator-nuttx/pull/1994) libc: Don't fclose and fopen file in freopen +* [#2005](https://github.com/apache/incubator-nuttx/pull/2005) Fix note_syscall_leave_s to avoid unaligned access +* [#2043](https://github.com/apache/incubator-nuttx/pull/2043) sched: Add SCHED_INSTRUMENTATION_HIRES support +* [#2044](https://github.com/apache/incubator-nuttx/pull/2044) sched: Add note_syscall args support +* [#2071](https://github.com/apache/incubator-nuttx/pull/2071) pollnotify: we should send poll events before semaphore incrementes. +* [#2076](https://github.com/apache/incubator-nuttx/pull/2076) libc: math: Make this friendly with libcxx +* [#2111](https://github.com/apache/incubator-nuttx/pull/2111) LIBCXX related fixes +* [#2147](https://github.com/apache/incubator-nuttx/pull/2147) sched: Use nx_close() inside OS +* [#2176](https://github.com/apache/incubator-nuttx/pull/2176) syscall/syscall.csv: Increase number of arguments for prctl() +* [#2204](https://github.com/apache/incubator-nuttx/pull/2204) sched: irq: Fix enter_critical_section() in an irq handler for SMP +* [#2218](https://github.com/apache/incubator-nuttx/pull/2218) sched: signal.h: fix compile failed when open TTY_SIGINT +* [#2229](https://github.com/apache/incubator-nuttx/pull/2229) sched/sched/sched_waitid.c: Allow WNOHANG +* [#2236](https://github.com/apache/incubator-nuttx/pull/2236) sched/task/task_exithook.c: Remove a redundant assignment +* [#2243](https://github.com/apache/incubator-nuttx/pull/2243) libcxx: Update [0001-libcxx-Port-to-NuttX-https-nuttx.apache.org](http://0001-libcxx-Port-to-NuttX-https-nuttx.apache.org)-RTOS.patch +* [#2255](https://github.com/apache/incubator-nuttx/pull/2255) sys/epoll: sync the epoll define with linux +* [#2256](https://github.com/apache/incubator-nuttx/pull/2256) unistd/sched_sporadic: correct the disable value +* [#2261](https://github.com/apache/incubator-nuttx/pull/2261) sched/timer: add support of CLOCK_MONOTONIC +* [#2262](https://github.com/apache/incubator-nuttx/pull/2262) sched/init: init the default home directory to environment +* [#2285](https://github.com/apache/incubator-nuttx/pull/2285) libc/stdlib: Fix range check in st
[incubator-nuttx] branch master updated: cmd/free: add nused/nfree field in command free
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new fea1da2 cmd/free: add nused/nfree field in command free fea1da2 is described below commit fea1da2f53be1603a809ac00f9d257d212bf3796 Author: Jiuzhu Dong AuthorDate: Wed Apr 28 11:05:20 2021 +0800 cmd/free: add nused/nfree field in command free Change-Id: I74aa4b1e7394a17c3b117322a4cc24aa52aac3b8 Signed-off-by: Jiuzhu Dong --- Documentation/applications/nsh/commands.rst | 7 +-- fs/procfs/fs_procfsmeminfo.c| 20 ++-- include/malloc.h| 1 + mm/mm_heap/mm_mallinfo.c| 3 +++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Documentation/applications/nsh/commands.rst b/Documentation/applications/nsh/commands.rst index 3524128..cb91899 100644 --- a/Documentation/applications/nsh/commands.rst +++ b/Documentation/applications/nsh/commands.rst @@ -495,8 +495,9 @@ Show Memory Manager Status (free) example:: nsh> free - total used freelargest - Mem: 4194288159155226027362601584 + total used freelargest nused nfree + Mem: 5583024161478439682403967792244 4 + nsh> **Where:** @@ -506,6 +507,8 @@ totalThis is the total size of memory allocated for use by malloc in bytes. used This is the total size of memory occupied by chunks handed out by malloc. free This is the total size of memory occupied by free (not in use) chunks. largest Size of the largest free (not in use) chunk. +nusedThis is the number of allocated chunks +nfreeThis is the number of free chunks === == .. _cmdget: diff --git a/fs/procfs/fs_procfsmeminfo.c b/fs/procfs/fs_procfsmeminfo.c index bc10f78..ebef16a 100644 --- a/fs/procfs/fs_procfsmeminfo.c +++ b/fs/procfs/fs_procfsmeminfo.c @@ -54,7 +54,7 @@ * to handle the longest line generated by this logic. */ -#define MEMINFO_LINELEN 62 +#define MEMINFO_LINELEN 80 / * Private Types @@ -74,6 +74,7 @@ struct progmem_info_s { int arena; /* Total size of available progmem. */ int ordblks;/* This is the number of free chunks */ + int aordblks; /* This is the number of allocated chunks */ int mxordblk; /* Size of the largest free chunk */ int uordblks; /* Total size of memory for allocated chunks */ int fordblks; /* Total size of memory for free chunks. */ @@ -147,6 +148,8 @@ static void meminfo_progmem(FAR struct progmem_info_s *progmem) ssize_t status; progmem->arena= 0; + progmem->ordblks = 0; + progmem->aordblks = 0; progmem->fordblks = 0; progmem->uordblks = 0; progmem->mxordblk = 0; @@ -171,6 +174,7 @@ static void meminfo_progmem(FAR struct progmem_info_s *progmem) } else if (status != 0) { + progmem->aordblks++; progmem->uordblks += pagesize; if (stpage != 0x && up_progmem_isuniform()) @@ -285,7 +289,7 @@ static ssize_t meminfo_read(FAR struct file *filep, FAR char *buffer, linesize = snprintf(procfile->line, MEMINFO_LINELEN, " " - "total used freelargest\n"); + "total used freelargest nused nfree\n"); copysize = procfs_memcpy(procfile->line, linesize, buffer, buflen, ); @@ -308,12 +312,14 @@ static ssize_t meminfo_read(FAR struct file *filep, FAR char *buffer, entry->mallinfo(entry->user_data, ); linesize = snprintf(procfile->line, MEMINFO_LINELEN, -"%12s: %11lu%11lu%11lu%11lu\n", +"%12s: %11lu%11lu%11lu%11lu%7lu%7lu\n", entry->name, (unsigned long)minfo.arena, (unsigned long)minfo.uordblks, (unsigned long)minfo.fordblks, -(unsigned long)minfo.mxordblk); +(unsigned long)minfo.mxordblk, +(unsigned long)minfo.aordblks, +(unsigned long)minfo.ordblks); copysize = procfs_memcpy(procfile->line, linesize, buffer, buflen, ); totalsize += copysize; @@ -364,11 +370,13 @@ static ssize_t meminfo_read
[incubator-nuttx] 01/02: stm32h7 rcc: Sync h7x7xx and h7x3xx. Changes are relevant to both
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 35553147ba2afdf240bfb744d1c58b7df4fc96e0 Author: Anthony Merlino AuthorDate: Sat May 15 18:00:52 2021 -0400 stm32h7 rcc: Sync h7x7xx and h7x3xx. Changes are relevant to both --- arch/arm/src/stm32h7/stm32h7x3xx_rcc.c | 20 ++- arch/arm/src/stm32h7/stm32h7x7xx_rcc.c | 36 -- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c index c9e0dd2..49f8d49 100644 --- a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c +++ b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c @@ -247,11 +247,17 @@ static inline void rcc_enableahb2(void) regval = getreg32(STM32_RCC_AHB2ENR); #ifdef CONFIG_STM32H7_SDMMC2 - /* SDMMC clock enable */ + /* SDMMC2 clock enable */ regval |= RCC_AHB2ENR_SDMMC2EN; #endif +#ifdef CONFIG_STM32H7_RNG + /* Random number generator clock enable */ + + regval |= RCC_AHB2ENR_RNGEN; +#endif + putreg32(regval, STM32_RCC_AHB2ENR); /* Enable peripherals */ } @@ -473,6 +479,18 @@ static inline void rcc_enableapb2(void) regval |= RCC_APB2ENR_SPI5EN; #endif +#ifdef CONFIG_STM32H7_USART1 + /* USART1 clock enable */ + + regval |= RCC_APB2ENR_USART1EN; +#endif + +#ifdef CONFIG_STM32H7_USART6 + /* USART1 clock enable */ + + regval |= RCC_APB2ENR_USART6EN; +#endif + putreg32(regval, STM32_RCC_APB2ENR); /* Enable peripherals */ } diff --git a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c index 13464ad..af179c5 100644 --- a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c +++ b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c @@ -246,7 +246,17 @@ static inline void rcc_enableahb2(void) regval = getreg32(STM32_RCC_AHB2ENR); - /* TODO: ... */ +#ifdef CONFIG_STM32H7_SDMMC2 + /* SDMMC2 clock enable */ + + regval |= RCC_AHB2ENR_SDMMC2EN; +#endif + +#ifdef CONFIG_STM32H7_RNG + /* Random number generator clock enable */ + + regval |= RCC_AHB2ENR_RNGEN; +#endif putreg32(regval, STM32_RCC_AHB2ENR); /* Enable peripherals */ } @@ -469,12 +479,6 @@ static inline void rcc_enableapb2(void) regval |= RCC_APB2ENR_SPI5EN; #endif -#ifdef CONFIG_STM32H7_SDMMC2 - /* SDMMC2 clock enable */ - - regval |= RCC_APB2ENR_SDMMC2EN; -#endif - #ifdef CONFIG_STM32H7_USART1 /* USART1 clock enable */ @@ -826,8 +830,6 @@ void stm32_stdclockconfig(void) regval |= STM32_PWR_CR3_LDOEN | STM32_PWR_CR3_LDOESCUEN; putreg32(regval, STM32_PWR_CR3); -#if 0 - /* Set the voltage output scale */ regval = getreg32(STM32_PWR_D3CR); @@ -839,6 +841,12 @@ void stm32_stdclockconfig(void) { } + /* See Reference manual Section 5.4.1, System supply startup */ + + while ((getreg32(STM32_PWR_CSR1) & PWR_CSR1_ACTVOSRDY) == 0) +{ +} + /* Over-drive is needed if * - Voltage output scale 1 mode is selected and SYSCLK frequency is *over 400 MHz. @@ -863,7 +871,6 @@ void stm32_stdclockconfig(void) { } } -#endif /* Configure FLASH wait states */ @@ -952,6 +959,15 @@ void stm32_stdclockconfig(void) putreg32(regval, STM32_RCC_D3CCIPR); #endif + /* Configure FDCAN source clock */ + +#if defined(STM32_RCC_D2CCIP1R_FDCANSEL) + regval = getreg32(STM32_RCC_D2CCIP1R); + regval &= ~RCC_D2CCIP1R_FDCANSEL_MASK; + regval |= STM32_RCC_D2CCIP1R_FDCANSEL; + putreg32(regval, STM32_RCC_D2CCIP1R); +#endif + #if defined(CONFIG_STM32H7_IWDG) || defined(CONFIG_STM32H7_RTC_LSICLOCK) /* Low speed internal clock source LSI */
[incubator-nuttx] branch master updated (6b5a4cb -> c9ccbb9)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 6b5a4cb arch: cxd56xx: Fix parameter check of hostif buffer new 3555314 stm32h7 rcc: Sync h7x7xx and h7x3xx. Changes are relevant to both new c9ccbb9 stm32h7_rcc.c: Fixes typo in comment The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: arch/arm/src/stm32h7/stm32h7x3xx_rcc.c | 20 +- arch/arm/src/stm32h7/stm32h7x7xx_rcc.c | 38 -- 2 files changed, 46 insertions(+), 12 deletions(-)
[incubator-nuttx] 02/02: stm32h7xxxx_rcc.c: Fixes typo in comment
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit c9ccbb9e035450688cf53707eaa741f7832225f2 Author: Anthony Merlino AuthorDate: Sun May 16 11:28:04 2021 -0400 stm32h7_rcc.c: Fixes typo in comment --- arch/arm/src/stm32h7/stm32h7x3xx_rcc.c | 2 +- arch/arm/src/stm32h7/stm32h7x7xx_rcc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c index 49f8d49..9218861 100644 --- a/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c +++ b/arch/arm/src/stm32h7/stm32h7x3xx_rcc.c @@ -486,7 +486,7 @@ static inline void rcc_enableapb2(void) #endif #ifdef CONFIG_STM32H7_USART6 - /* USART1 clock enable */ + /* USART6 clock enable */ regval |= RCC_APB2ENR_USART6EN; #endif diff --git a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c index af179c5..81e7e8a 100644 --- a/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c +++ b/arch/arm/src/stm32h7/stm32h7x7xx_rcc.c @@ -486,7 +486,7 @@ static inline void rcc_enableapb2(void) #endif #ifdef CONFIG_STM32H7_USART6 - /* USART1 clock enable */ + /* USART6 clock enable */ regval |= RCC_APB2ENR_USART6EN; #endif
[incubator-nuttx] branch master updated: tools/ci: Remove sim01.dat and sim02.dat
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new b3e1d1c tools/ci: Remove sim01.dat and sim02.dat b3e1d1c is described below commit b3e1d1c3dfc731d7d1d035c6658e3af99e856ef5 Author: Xiang Xiao AuthorDate: Mon May 17 02:24:59 2021 +0800 tools/ci: Remove sim01.dat and sim02.dat Signed-off-by: Xiang Xiao --- .github/workflows/build.yml | 2 +- tools/ci/testlist/sim01.dat | 23 --- tools/ci/testlist/sim02.dat | 10 -- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a678126..122d1dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: needs: Fetch-Source strategy: matrix: -boards: [macos, sim01, sim02] +boards: [macos, sim-01, sim-02] steps: - name: Download Source Artifact uses: actions/download-artifact@v1 diff --git a/tools/ci/testlist/sim01.dat b/tools/ci/testlist/sim01.dat deleted file mode 100644 index bb9292a..000 --- a/tools/ci/testlist/sim01.dat +++ /dev/null @@ -1,23 +0,0 @@ -/sim/*/*/*/[a-n]* - -# macOS doesn't have ALSA --Darwin,sim:alsa - --Darwin,sim:cxxtest --Darwin,sim:libcxxtest - -# Do not build Linux configs --Darwin,sim:linuxi2c - -# macOS doesn't support 32bit(CONFIG_SIM_M32=y) anymore --Darwin,sim:elf --Darwin,sim:foc --Darwin,sim:loadable --Darwin,sim:module32 - -# macOS doesn't have X11 --Darwin,sim:lvgl --Darwin,sim:nsh2 --Darwin,sim:nx11 --Darwin,sim:nxlines --Darwin,sim:nxwm diff --git a/tools/ci/testlist/sim02.dat b/tools/ci/testlist/sim02.dat deleted file mode 100644 index 1974acb..000 --- a/tools/ci/testlist/sim02.dat +++ /dev/null @@ -1,10 +0,0 @@ -/sim/*/*/*/[o-z]* - -# macOS doesn't support 32bit anymore(CONFIG_SIM_M32=y) --Darwin,sim:posix_spawn --Darwin,sim:rpproxy --Darwin,sim:rpserver --Darwin,sim:sotest32 - -# macOS doesn't have X11 --Darwin,sim:touchscreen
[incubator-nuttx] branch master updated (4a2d4c1 -> 09a0ed1)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 4a2d4c1 board/circuit-express: Add usbnsh configuration add 09a0ed1 tools/ci: Rename sim0x.dat to sim-0x.dat to align with arm-xx.dat No new revisions were added by this update. Summary of changes: .github/workflows/build.yml | 2 +- tools/ci/testlist/{sim01.dat => sim-01.dat} | 0 tools/ci/testlist/{sim02.dat => sim-02.dat} | 0 3 files changed, 1 insertion(+), 1 deletion(-) copy tools/ci/testlist/{sim01.dat => sim-01.dat} (100%) copy tools/ci/testlist/{sim02.dat => sim-02.dat} (100%)
[incubator-nuttx] branch master updated: Update libcxx to 12.0.0 release
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new a81166a Update libcxx to 12.0.0 release a81166a is described below commit a81166aef6ccd4993e22619fc54ea3451b3a0236 Author: Xiang Xiao AuthorDate: Thu May 13 17:52:38 2021 +0800 Update libcxx to 12.0.0 release and remove the temporary patch since all patch is in the mainline now Signed-off-by: Xiang Xiao --- boards/sim/sim/sim/scripts/Make.defs | 5 +- libs/libxx/0001-libc-Fix-a-few-warnings.patch | 43 --- ...sts-failing-with-Clang-after-removing-GCC.patch | 26 ...ix-several-GCC-warnings-in-the-test-suite.patch | 135 - ...k-_LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE-fir.patch | 78 ...Port-to-NuttX-https-nuttx.apache.org-RTOS.patch | 112 - libs/libxx/libcxx.defs | 7 +- 7 files changed, 4 insertions(+), 402 deletions(-) diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index 1e78f79..bd17433 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -108,14 +108,15 @@ CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) \ AFLAGS := $(CFLAGS) -D__ASSEMBLY__ ifeq ($(CONFIG_LIBCXX),y) - # Why c++14? + # Why c++17? # * libcxx seems to require c++11. # * The compiler defaults varies: # clang/macOS (from xcode): 199711L # gcc/ubuntu: 201402L # * There is a precedent to use c++14. #(boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs) - CXXFLAGS += -std=c++14 + # * libs/libxx/libcxx/src/barrier.cpp depends on aligned new + CXXFLAGS += -std=c++17 ifeq ($(CONFIG_HOST_MACOS),y) # macOS uses libc++abi diff --git a/libs/libxx/0001-libc-Fix-a-few-warnings.patch b/libs/libxx/0001-libc-Fix-a-few-warnings.patch deleted file mode 100644 index b7bb109..000 --- a/libs/libxx/0001-libc-Fix-a-few-warnings.patch +++ /dev/null @@ -1,43 +0,0 @@ -From acd7be74ca12f8f08e52d6d80850a9b230109134 Mon Sep 17 00:00:00 2001 -From: YAMAMOTO Takashi -Date: Wed, 28 Oct 2020 15:40:16 -0400 -Subject: [PATCH] [libc++] Fix a few warnings - -Found during a NuttX porting effort. -But these changes are not directly relevant to NuttX. - -Differential Revision: https://reviews.llvm.org/D90139 - src/filesystem/operations.cpp | 2 +- - src/locale.cpp| 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/filesystem/operations.cpp libcxx/src/filesystem/operations.cpp -index 95d7d0d9642..788e31b673a 100644 a/src/filesystem/operations.cpp -+++ libcxx/src/filesystem/operations.cpp -@@ -534,7 +534,7 @@ path __canonical(path const& orig_p, error_code* ec) { - ErrorHandler err("canonical", ec, _p, ); - - path p = __do_absolute(orig_p, , ec); --#if _POSIX_VERSION >= 200112 -+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112 - std::unique_ptr - hold(::realpath(p.c_str(), nullptr), &::free); - if (hold.get() == nullptr) -diff --git a/src/locale.cpp libcxx/src/locale.cpp -index b9180880e49..02dbb334ff8 100644 a/src/locale.cpp -+++ libcxx/src/locale.cpp -@@ -1149,7 +1149,7 @@ ctype::__classic_upper_table() _NOEXCEPT - { - return _LIBCPP_GET_C_LOCALE->__ctype_toupper; - } --#elif __NetBSD__ -+#elif defined(__NetBSD__) - const short* - ctype::__classic_lower_table() _NOEXCEPT - { --- -2.17.1 - diff --git a/libs/libxx/0001-libc-Fix-tests-failing-with-Clang-after-removing-GCC.patch b/libs/libxx/0001-libc-Fix-tests-failing-with-Clang-after-removing-GCC.patch deleted file mode 100644 index 5e28838..000 --- a/libs/libxx/0001-libc-Fix-tests-failing-with-Clang-after-removing-GCC.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 81b6aa0e27abc3037c84d1ff2065bf60207f9b8b Mon Sep 17 00:00:00 2001 -From: Louis Dionne -Date: Fri, 30 Oct 2020 14:55:37 -0400 -Subject: [PATCH] [libc++] Fix tests failing with Clang after removing GCC - warnings - - src/filesystem/filesystem_common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/filesystem/filesystem_common.h libcxx/src/filesystem/filesystem_common.h -index a7828ef3863..dc55f93da70 100644 a/src/filesystem/filesystem_common.h -+++ libcxx/src/filesystem/filesystem_common.h -@@ -198,7 +198,7 @@ private: - using chrono::duration; - using chrono::duration_cast; - --using TimeSpec = std::timespec; -+using TimeSpec = timespec; - using StatT = struct stat; - - template -Date: Fri, 30 Oct 2020 11:19:07 -0400 -Subject: [PATCH] [libc++] NFC: Fix several GCC warnings in the test suite - -- Several -Wshadow warnings -- Several places where we did not initialize our base class explicitly -- Unused variable warnings -- Some tautological comparisons
[incubator-nuttx] branch master updated: fs/hostfs: fix bug about getting error file size by fstat
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 9980a1c fs/hostfs: fix bug about getting error file size by fstat 9980a1c is described below commit 9980a1c27dfef1796b243417bb703da3ae0811d7 Author: Jiuzhu Dong AuthorDate: Fri Apr 23 17:44:03 2021 +0800 fs/hostfs: fix bug about getting error file size by fstat Change-Id: I10a0d52da649e4c3138e5a2301bcb6525e2e3350 Signed-off-by: Jiuzhu Dong --- fs/hostfs/hostfs_rpmsg.h | 27 --- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/fs/hostfs/hostfs_rpmsg.h b/fs/hostfs/hostfs_rpmsg.h index 6482f02..b5b9822 100644 --- a/fs/hostfs/hostfs_rpmsg.h +++ b/fs/hostfs/hostfs_rpmsg.h @@ -116,9 +116,17 @@ begin_packed_struct struct hostfs_rpmsg_ioctl_s begin_packed_struct struct hostfs_rpmsg_fstat_s { struct hostfs_rpmsg_header_s header; - int32_t fd; - uint32_t reserved; - struct stat buf; + union + { +struct statbuf; +uint32_t reserved[16]; + }; + + union + { +int32_tfd; +char pathname[0]; + }; } end_packed_struct; begin_packed_struct struct hostfs_rpmsg_ftruncate_s @@ -169,17 +177,6 @@ begin_packed_struct struct hostfs_rpmsg_mkdir_s #define hostfs_rpmsg_rmdir_s hostfs_rpmsg_opendir_s #define hostfs_rpmsg_rename_s hostfs_rpmsg_opendir_s - -begin_packed_struct struct hostfs_rpmsg_stat_s -{ - struct hostfs_rpmsg_header_s header; - union - { -struct statbuf; -uint32_t reserved[16]; - }; - - char pathname[0]; -} end_packed_struct; +#define hostfs_rpmsg_stat_s hostfs_rpmsg_fstat_s #endif /* __FS_HOSTFS_HOSTFS_RPMSG_H */
[incubator-nuttx] branch master updated: stm32f7: Remove references to BOARD_ENABLE_USBOTG_HSULPI. Prefer Kconfig option instead.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 99a9d75 stm32f7: Remove references to BOARD_ENABLE_USBOTG_HSULPI. Prefer Kconfig option instead. 99a9d75 is described below commit 99a9d75cdd3245ed13697bf9bfa4aa6079dd8c51 Author: Anthony Merlino AuthorDate: Mon Apr 12 19:17:26 2021 -0400 stm32f7: Remove references to BOARD_ENABLE_USBOTG_HSULPI. Prefer Kconfig option instead. --- arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c | 4 +++- arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c | 5 +++-- arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c index d724d4f..589488e 100644 --- a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c @@ -211,7 +211,9 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS -#if defined(CONFIG_STM32F7_INTERNAL_ULPI) || defined(CONFIG_STM32F7_EXTERNAL_ULPI) +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN); diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c index 8643801..e288291 100644 --- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c @@ -215,12 +215,13 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS - #if defined(CONFIG_STM32F7_INTERNAL_ULPI) || defined(CONFIG_STM32F7_EXTERNAL_ULPI) +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || \ + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN); #else - /* Enable only clocking for USB OTG HS */ regval |= RCC_AHB1ENR_OTGHSEN; diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c index ed1bc93..32f2a62 100644 --- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c @@ -221,7 +221,9 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS -#ifdef BOARD_ENABLE_USBOTG_HSULPI +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || \ + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);
[incubator-nuttx] branch master updated: lirc: fix bug about lirc_raw_event
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 018cf26 lirc: fix bug about lirc_raw_event 018cf26 is described below commit 018cf266059e30472b741d645c6250ac3a09dcb8 Author: Jiuzhu Dong AuthorDate: Fri Apr 9 11:23:15 2021 +0800 lirc: fix bug about lirc_raw_event N/A Change-Id: If00d0a7e4e4f9a0d9119b6a170cffd993f23f71a Signed-off-by: Jiuzhu Dong --- drivers/rc/lirc_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c index 9d169ed..a7ce5cf 100644 --- a/drivers/rc/lirc_dev.c +++ b/drivers/rc/lirc_dev.c @@ -944,9 +944,10 @@ void lirc_raw_event(FAR struct lirc_lowerhalf_s *lower, } } - leave_critical_section(flags); upper->gap = false; } + + leave_critical_section(flags); } sample = ev.pulse ? LIRC_PULSE(ev.duration) : LIRC_SPACE(ev.duration);
[incubator-nuttx] branch master updated: include/termios: left shift of 1 by 31 places cannot be represented in type 'int'
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new f2e268d include/termios: left shift of 1 by 31 places cannot be represented in type 'int' f2e268d is described below commit f2e268d1bcb8612eb3f00cb55b9624aa61dbc3bd Author: Jiuzhu Dong AuthorDate: Thu May 6 21:55:43 2021 +0800 include/termios: left shift of 1 by 31 places cannot be represented in type 'int' N/A cu_main.c:172:22: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' by asan Change-Id: I224345bddb11523db0c4a91c16617a3200fad034 Signed-off-by: Jiuzhu Dong --- include/termios.h | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/termios.h b/include/termios.h index cecfd2c..f2fb090 100644 --- a/include/termios.h +++ b/include/termios.h @@ -85,19 +85,19 @@ /* Control Modes (c_cflag in the termios structure) */ -#define CSIZE (3 << 4) /* Bits 4-5: Character size: */ -# define CS5 (0 << 4) /* 5 bits */ -# define CS6 (1 << 4) /* 6 bits */ -# define CS7 (2 << 4) /* 7 bits */ -# define CS8 (3 << 4) /* 8 bits */ -#define CSTOPB(1 << 6) /* Bit 6: Send two stop bits, else one */ -#define CREAD (1 << 7) /* Bit 7: Enable receiver */ -#define PARENB(1 << 8) /* Bit 8: Parity enable */ -#define PARODD(1 << 9) /* Bit 9: Odd parity, else even */ -#define HUPCL (1 << 10) /* Bit 10: Hang up on last close */ -#define CLOCAL(1 << 11) /* Bit 11: Ignore modem status lines */ -#define CCTS_OFLOW (1 << 29)/* Bit 29: CTS flow control of output */ -#define CRTS_IFLOW (1 << 31)/* Bit 31: RTS flow control of input */ +#define CSIZE (3 << 4)/* Bits 4-5: Character size: */ +# define CS5 (0 << 4)/* 5 bits */ +# define CS6 (1 << 4)/* 6 bits */ +# define CS7 (2 << 4)/* 7 bits */ +# define CS8 (3 << 4)/* 8 bits */ +#define CSTOPB(1 << 6)/* Bit 6: Send two stop bits, else one */ +#define CREAD (1 << 7)/* Bit 7: Enable receiver */ +#define PARENB(1 << 8)/* Bit 8: Parity enable */ +#define PARODD(1 << 9)/* Bit 9: Odd parity, else even */ +#define HUPCL (1 << 10) /* Bit 10: Hang up on last close */ +#define CLOCAL(1 << 11) /* Bit 11: Ignore modem status lines */ +#define CCTS_OFLOW (1 << 29) /* Bit 29: CTS flow control of output */ +#define CRTS_IFLOW (1u << 31) /* Bit 31: RTS flow control of input */ #define CRTSCTS (CCTS_OFLOW | CRTS_IFLOW) /* Local Modes (c_lflag in the termios structure) */
[incubator-nuttx] branch master updated: binfmt/elf: Don't close filfd in the fail path
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 85c1354 binfmt/elf: Don't close filfd in the fail path 85c1354 is described below commit 85c1354043c66221d0e7b819c44a66e05f0102ad Author: Xiang Xiao AuthorDate: Fri May 7 21:48:02 2021 +0800 binfmt/elf: Don't close filfd in the fail path to avoid close the same handle twice because the caller also call elf_uninit in this case Signed-off-by: Xiang Xiao Change-Id: Iddcbae9587d11d3b5b06e876d4a037ac0d11992e --- binfmt/libelf/libelf_init.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c index 7f4ae3c..6658aa0 100644 --- a/binfmt/libelf/libelf_init.c +++ b/binfmt/libelf/libelf_init.c @@ -161,7 +161,6 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo) if (ret < 0) { berr("Failed to read ELF header: %d\n", ret); - nx_close(loadinfo->filfd); return ret; } @@ -181,7 +180,6 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo) */ berr("Bad ELF header: %d\n", ret); - nx_close(loadinfo->filfd); return ret; }
[incubator-nuttx] branch master updated (4befbdf -> e1ff0c4)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 4befbdf docker: add ninja-build add e1ff0c4 libc: Implement openpty function No new revisions were added by this update. Summary of changes: .../src/lc823450/lc823450_wdt.h => include/pty.h | 31 ++-- libs/libc/stdlib/Make.defs | 3 + libs/libc/stdlib/lib_openpty.c | 159 + 3 files changed, 176 insertions(+), 17 deletions(-) copy arch/arm/src/lc823450/lc823450_wdt.h => include/pty.h (74%) create mode 100644 libs/libc/stdlib/lib_openpty.c
[incubator-nuttx] branch master updated: docker: add ninja-build
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 4befbdf docker: add ninja-build 4befbdf is described below commit 4befbdfa4ba22dfd8fd9875db49842854cc258a1 Author: Matias N AuthorDate: Wed May 12 13:01:37 2021 -0300 docker: add ninja-build --- tools/ci/docker/linux/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index b43eac8..4df92c3 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -203,6 +203,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q libxext-dev libxext-dev:i386 \ linux-libc-dev:i386 \ linux-headers-generic \ + ninja-build \ python3 \ python3-pip \ python-is-python3 \
svn commit: r47490 - in /release/incubator/nuttx: 10.0.0/ 9.0.0/ 9.1.0/
Author: btashton Date: Fri Apr 30 04:42:09 2021 New Revision: 47490 Log: NuttX: Archive 9.0.0, 9.1.0 and 10.0.0 releases Removed: release/incubator/nuttx/10.0.0/ release/incubator/nuttx/9.0.0/ release/incubator/nuttx/9.1.0/
[incubator-nuttx-website] branch archive updated (76f5bb5 -> 9b1df15)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch archive in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git. discard 76f5bb5 Update old Apache NuttX release links to archive add 9b1df15 Update old Apache NuttX release links to archive This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (76f5bb5) \ N -- N -- N refs/heads/archive (9b1df15) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: _releases/9.1.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[incubator-nuttx-website] 01/01: Update old Apache NuttX release links to archive
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch archive in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git commit 76f5bb513c6a8cb84570e302993c491c7c9f2ccf Author: Brennan Ashton AuthorDate: Thu Apr 29 21:35:02 2021 -0700 Update old Apache NuttX release links to archive --- _releases/10.0.0.md | 4 ++-- _releases/9.0.0.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_releases/10.0.0.md b/_releases/10.0.0.md index cd2473a..cdf6bb1 100644 --- a/_releases/10.0.0.md +++ b/_releases/10.0.0.md @@ -7,8 +7,8 @@ date: 2020-12-03 summary: > Release v10.0.0 -artifact-root: "https://downloads.apache.org/incubator/nuttx/10.0.0; -checksum-root: "https://downloads.apache.org/incubator/nuttx/10.0.0; +artifact-root: "https://archive.apache.org/dist/incubator/nuttx/10.0.0; +checksum-root: "https://archive.apache.org/dist/incubator/nuttx/10.0.0; key-file: "https://downloads.apache.org/incubator/nuttx/KEYS; source-os-dist: diff --git a/_releases/9.0.0.md b/_releases/9.0.0.md index 20b02ff..0a05b37 100644 --- a/_releases/9.0.0.md +++ b/_releases/9.0.0.md @@ -7,8 +7,8 @@ date: 2020-05-11 summary: > Release v9.0.0 -artifact-root: "https://downloads.apache.org/incubator/nuttx/9.0.0; -checksum-root: "https://downloads.apache.org/incubator/nuttx/9.0.0; +artifact-root: "https://archive.apache.org/dist/incubator/nuttx/9.0.0; +checksum-root: "https://archive.apache.org/dist/incubator/nuttx/9.0.0; key-file: "https://downloads.apache.org/incubator/nuttx/KEYS; source-os-dist:
[incubator-nuttx-website] branch archive created (now 76f5bb5)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch archive in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git. at 76f5bb5 Update old Apache NuttX release links to archive This branch includes the following new commits: new 76f5bb5 Update old Apache NuttX release links to archive The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-nuttx] branch master updated (238fa3b -> f446758)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 238fa3b CI: fix docker image name add f446758 CI: ensure docker is rebuilt on corresponding workflow changes No new revisions were added by this update. Summary of changes: .github/workflows/docker_linux.yml | 2 ++ 1 file changed, 2 insertions(+)
[incubator-nuttx] branch master updated (3fef111 -> 238fa3b)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 3fef111 docker: add cmake add 238fa3b CI: fix docker image name No new revisions were added by this update. Summary of changes: .github/workflows/docker_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[incubator-nuttx] branch master updated (fecdd27 -> 3fef111)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from fecdd27 esp32 & esp32c3: Update Wi-Fi BT and Wi-Fi libraries to fix some issues add 3fef111 docker: add cmake No new revisions were added by this update. Summary of changes: tools/ci/docker/linux/Dockerfile | 1 + 1 file changed, 1 insertion(+)
[incubator-nuttx-website] branch master updated: contributors.yml: Add Gustavo Henrique Nihei.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new d7e0482 contributors.yml: Add Gustavo Henrique Nihei. d7e0482 is described below commit d7e0482dfe46b581ceed012309c52de3f59e2a49 Author: Abdelatif Guettouche AuthorDate: Thu Apr 22 13:16:57 2021 +0100 contributors.yml: Add Gustavo Henrique Nihei. --- _data/contributors.yml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/_data/contributors.yml b/_data/contributors.yml index f4efa3c..07c2675 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -84,6 +84,12 @@ role: PPMC, Committer org: +- name: Gustavo Henrique Nihei + apacheId: gustavonihei + githubId: gustavonihei + role: Committer + org: + - name: Haitao Liu apacheId: liuhaitao githubId: liuguo09
[incubator-nuttx-apps] annotated tag nuttx-10.0.1 updated (fcdaba9 -> 136e7e0)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to annotated tag nuttx-10.0.1 in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git. *** WARNING: tag nuttx-10.0.1 was modified! *** from fcdaba9 (commit) to 136e7e0 (tag) tagging fcdaba9254efc355ecad812a01d8f3f774122954 (commit) replaces nuttx-9.1.0-RC0 by Brennan Ashton on Sat Dec 5 21:41:50 2020 -0800 - Log - nuttx-10.0.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEZsSDKhZezJNUiVogl1DtfmkrmeIFAl/Mbx4ACgkQl1Dtfmkr meJ5nQ//SL2SMc8LdOS2gOr6SD2RGJ1K+F+MQgcM0tootd54msLTx4R1IGDCX/O6 8yigS1L66ojRHAcXXS7EmBWAgA1xn/5XsrDBEgHvlsPZrz6r0c7mbA0tuamK4UJx 8kJqpz+zOkNPCTOK5R6Qk/Zu8qdDkgkF/hoYzW8HrNUqj+9pNHPROUNGE8OTyQ+m R6MTK8qQ9K0s+Q7WPam+WCvw+Af8e5tjg5p7cJIxahMyM7Tuzhs+dZNO3boB74fX TK/S0YQKfPYOgZiX8eF88jPoHGXSTOYsn0IcsBvO6QXiiMlODH2sY8K1r87mcf2l LB5ziYXlqgCm3/K9BoR3EkMOvbeKIOIQwCv9YWSIhkzLOHK4cSCFAvq9yhwPnduL 1IEv4pCwkQdyVo2XXWzQFQvtFYgcDC5w5TYAcrJcQxzbeblHGGAtT2iGsOtRbFEl TyS0vGkgVVpjV0XBq8CRYUATnf9NQXRzQ48S3HLyl9Ovgy/5FrPpIGBYdhu5BGQ7 C/4VaLl3bJ5bkEh6OSkEuCjqF1mCe7RQOVTTIJA65wUtcQv5UyYeGnAStQim9q2L D/zFJHF7VB5YUnqk+UlZdKhVkgN+hJ2+19et9VV648wsXKiWiIIiUbU4Pcj0bgqt 2SV1w5dVcj/6RuY3G4kuxLyxUarL1rmw66Dpd0PNR3xRploCZfU= =c09T -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[incubator-nuttx-apps] annotated tag nuttx-9.1.1 updated (4fac1c1 -> 3daaaf7)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to annotated tag nuttx-9.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git. *** WARNING: tag nuttx-9.1.1 was modified! *** from 4fac1c1 (commit) to 3daaaf7 (tag) tagging 4fac1c185c01adfa84f04618af9be7b9c4b884f5 (commit) replaces nuttx-9.1.0-RC1 by Brennan Ashton on Wed Apr 21 22:16:24 2021 -0700 - Log - nuttx-9.1.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEZsSDKhZezJNUiVogl1DtfmkrmeIFAmCBBqgACgkQl1Dtfmkr meJngA/+Ng9i3TZbGbRFibHa/StDbbn4WNhv83acn/ZAtkLLheltrjRpXlpCuLO3 AxBpY+dqZQgtc6YkVwc56Vk2ZwNVDkL3dpvm2TTd9lRQ9oJcUy0ZIRfLnri8xXou UV1qZtkIaFm/PI7y+VPZUz3agjvm3Znq+QMPK/wPIKmXQOVZ/pnKHmxu9CPTG6dA azBA7FW+5N9bESZfhXLUIZnfq8OMpfso3NXBm3YtKM7BP2wQfFvoBO2+y8kzt+2q DrgzL8me96MjDwgQP8oAH9hfQROfgnoZiU46chX9LI4RJ0TGFNGFcAKnv7/7up1p CDR2mHildNVRekM6v0P//zXv1WWpu6KH+LN6owH4GL27dBqPwfoyN4VpdrtV0Nq1 gNUk2km2Y8sOAHf2K5hea4wMS38CWve2Ks3JfPhpuY4jvR62bqO3TNNbq9+UjjQ9 xo3wE5v++cBFwAgUK2UkYlKP/AKe30LL5DjIS3USBORNtG41Dsp6BOkfv29260+9 97Q82/o8i/6ps91V5a6jOTMyC3BPfxEsiT+hbdpLi5fIuJs+ZhgXSoUZID2+B1y7 Z7mmR/BJhDQG4vNvdOnIvway7bBQg3T0KHwJm45++IuFNzWX0RVT25MC1tNfWsBb 2NpN7o2WCNBDeniqnCFfiQYb5FrA/glnfw/iPKDbXj2JrTwLDtM= =a/X/ -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[incubator-nuttx] annotated tag nuttx-9.1.1 updated (561cbbc -> 2e9dd3f)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to annotated tag nuttx-9.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. *** WARNING: tag nuttx-9.1.1 was modified! *** from 561cbbc (commit) to 2e9dd3f (tag) tagging 561cbbca96a749e4d2e9ec2ea672f257dc5348aa (commit) replaces nuttx-9.1.0 by Brennan Ashton on Wed Apr 21 22:14:02 2021 -0700 - Log - nuttx-9.1.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEZsSDKhZezJNUiVogl1DtfmkrmeIFAmCBBhoACgkQl1Dtfmkr meIcqg/9H2vp/WL935CxueFOsaDU30pzD7vOY3qqJb80MqDK6MPWo+0yiSXTmGtg g2NJiEI2yWr0ECaJ2jgbRSrOz4ekrdFJkTbrI7RNuYjPmjjQF2Xt7vU/f+RtFQ1T jiTrRFe9FpaqAEXukFcJTbfbD8ChHIdGbDjT23KokiWGxMA3KCcMjNmUDMQyo7Ri B5UdnmZY0kXZFvMF4RLqdCV3b59JEbAOHXcyn2kR0Do8U9BQW7zjrqYwcaXkzAcx 9oQGPfVQ3KsrexNflO1uoUNTpZt9oI9tJDyL7opnlJOGL5HWBLKPDyUdTLBZUVjk mOXsI6SGErwrRNvS1jNJyimIr9EG3QZZKx1XL8MBAU2Xn1DESCwSMqN49Dua+I8I k8lJRDkix0CDRGKOzLg/U4K3FydTmVfP4AjSzGmVh6EJ7UChn08nA5lE8ybCk+Nc mehdfgFL+2n4U5szSFIrdumkdRd0RDu27iUjY6TIUnUcJw1fTkCMZ0EFyaopupJX NWlCJfjLPeahlTt6PVhW6TAbVQeEi4+D+IJ7MxAHs3Pb/iLwfGUlGWm8GZq4U8f9 AGfSd/tPC+ssSEs091Y0Ln5PsdtFhIBx9ArEsLwZRxizYzzoz8WeBXcEhy3q1pfI u9reZdrPrdsPXP9wvFqJKLDWFBaRhPUvYibphIOR9j+LqZ6YcGk= =Y8Ky -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[incubator-nuttx] branch releases/10.1 updated: documentation: Add release notes for 10.1.0 release
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch releases/10.1 in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/releases/10.1 by this push: new f380c91 documentation: Add release notes for 10.1.0 release f380c91 is described below commit f380c919f04d5ee88e0a83f5632cc83af503664f Author: Brennan Ashton AuthorDate: Sat Apr 17 22:50:57 2021 -0700 documentation: Add release notes for 10.1.0 release --- ReleaseNotes | 961 +++ 1 file changed, 961 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index b473d9d..a9701da 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -28386,3 +28386,964 @@ See * [PR-1439](https://github.com/apache/incubator-nuttx/pull/1439), git commit #[5efa93ec26fd8a3fd85b24a2008bb743f96027fb](https://github.com/apache/incubator-nuttx/commit/5efa93ec26fd8a3fd85b24a2008bb743f96027fb) in the main NuttX repository. + +NuttX-10.1.0 Release Notes + + +# What's New In This Release + +## Highlights + +* Better separation between kernel and userspace. +* Heap and stack management improvements. +* More closely follow POSIX and Linux interfaces. +* Symmetric Multi-Processing (SMP) performance improvements and bug fixes. +* Networking improvements and bug fixes. +* Added support for many microcontrollers and boards, and improved support for many existing ones. +* Many added and improved drivers. +* Build system improvements to deliver faster builds. +* Thousands of NuttX files converted to Apache 2.0 License with permission of their authors. +* Improved listing of 3rd party licenses used in NuttX (see LICENSE, NOTICE, and DISCLAIMER-WIP files). + +## Major Changes to Core OS + +### New Features +* [#2324](https://github.com/apache/incubator-nuttx/pull/2324) audio: libsamplerate: add initial audio Sample Rate Converter +* [#2820](https://github.com/apache/incubator-nuttx/pull/2820) arch, boards, drivers, include, sched, wireless: Change spinlock APIs. +* [#2885](https://github.com/apache/incubator-nuttx/pull/2885) Ensure the kernel component don't call userspace API + +### Bug Fixes +* [#1852](https://github.com/apache/incubator-nuttx/pull/1852) sysconf: add _SC_PAGESIZE sysconf support +* [#1922](https://github.com/apache/incubator-nuttx/pull/1922) sched: nxtask_start should call entry point directly for kernel thread +* [#1994](https://github.com/apache/incubator-nuttx/pull/1994) libc: Don't fclose and fopen file in freopen +* [#2005](https://github.com/apache/incubator-nuttx/pull/2005) Fix note_syscall_leave_s to avoid unaligned access +* [#2043](https://github.com/apache/incubator-nuttx/pull/2043) sched: Add SCHED_INSTRUMENTATION_HIRES support +* [#2044](https://github.com/apache/incubator-nuttx/pull/2044) sched: Add note_syscall args support +* [#2071](https://github.com/apache/incubator-nuttx/pull/2071) pollnotify: we should send poll events before semaphore incrementes. +* [#2076](https://github.com/apache/incubator-nuttx/pull/2076) libc: math: Make this friendly with libcxx +* [#2111](https://github.com/apache/incubator-nuttx/pull/2111) LIBCXX related fixes +* [#2147](https://github.com/apache/incubator-nuttx/pull/2147) sched: Use nx_close() inside OS +* [#2176](https://github.com/apache/incubator-nuttx/pull/2176) syscall/syscall.csv: Increase number of arguments for prctl() +* [#2204](https://github.com/apache/incubator-nuttx/pull/2204) sched: irq: Fix enter_critical_section() in an irq handler for SMP +* [#2218](https://github.com/apache/incubator-nuttx/pull/2218) sched: signal.h: fix compile failed when open TTY_SIGINT +* [#2229](https://github.com/apache/incubator-nuttx/pull/2229) sched/sched/sched_waitid.c: Allow WNOHANG +* [#2236](https://github.com/apache/incubator-nuttx/pull/2236) sched/task/task_exithook.c: Remove a redundant assignment +* [#2243](https://github.com/apache/incubator-nuttx/pull/2243) libcxx: Update [0001-libcxx-Port-to-NuttX-https-nuttx.apache.org](http://0001-libcxx-Port-to-NuttX-https-nuttx.apache.org)-RTOS.patch +* [#2255](https://github.com/apache/incubator-nuttx/pull/2255) sys/epoll: sync the epoll define with linux +* [#2256](https://github.com/apache/incubator-nuttx/pull/2256) unistd/sched_sporadic: correct the disable value +* [#2261](https://github.com/apache/incubator-nuttx/pull/2261) sched/timer: add support of CLOCK_MONOTONIC +* [#2262](https://github.com/apache/incubator-nuttx/pull/2262) sched/init: init the default home directory to environment +* [#2285](https://github.com/apache/incubator-nuttx/pull/2285) libc/stdlib: Fix range check in strtoul(l) +* [#2326](https://github.com/apache/incubator-nuttx/pull/2326) libc: Enhance getopt function +* [#2407](https://github.com/apache/incubator-nuttx/pull/2407) libc: machine: arch: Support armv8-m relocation +* [#2418](https://github.com/apache/incubator-nuttx
[incubator-nuttx-apps] branch master updated: examples/lvgldemo: Make input options depend on enabled drivers
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new 852aa8a examples/lvgldemo: Make input options depend on enabled drivers 852aa8a is described below commit 852aa8a51162f361e220242a6fbd48dec800bbd3 Author: Gustavo Henrique Nihei AuthorDate: Mon Apr 5 18:13:09 2021 -0300 examples/lvgldemo: Make input options depend on enabled drivers --- examples/lvgldemo/Kconfig | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/examples/lvgldemo/Kconfig b/examples/lvgldemo/Kconfig index 8ccf76b..5e0e40f 100644 --- a/examples/lvgldemo/Kconfig +++ b/examples/lvgldemo/Kconfig @@ -11,13 +11,6 @@ menuconfig EXAMPLES_LVGLDEMO if EXAMPLES_LVGLDEMO -config EXAMPLES_LVGLDEMO_CALIBRATE - bool "Calibrate touchscreen" - default y - ---help--- - Calibrate touchscreen before demo start, but some touchscreen - don't need it, like capacitive touchscreen. - config EXAMPLES_LVGLDEMO_BUFF_SIZE int "Display buffer size (in line)" default 20 @@ -80,6 +73,19 @@ config EXAMPLES_LVGLDEMO_STACKSIZE int "lvgldemo stack size" default 16384 +comment "Input configuration options" + depends on INPUT_TOUCHSCREEN || INPUT_MOUSE + +config EXAMPLES_LVGLDEMO_CALIBRATE + bool "Calibrate touchscreen" + default y + depends on INPUT_TOUCHSCREEN || INPUT_MOUSE + ---help--- + Calibrate touchscreen before demo start, but some touchscreen + don't need it, like capacitive touchscreen. + +if INPUT_TOUCHSCREEN + config EXAMPLES_LGVLDEMO_MINOR int "Touchscreen minor device number" default 0 @@ -95,11 +101,14 @@ config EXAMPLES_LGVLDEMO_DEVPATH The path to the touchscreen device. This must be consistent with EXAMPLES_LGVLDEMO_MINOR. Default: "/dev/input0" +endif # INPUT_TOUCHSCREEN + config EXAMPLES_LGVLDEMO_MOUSE bool "Mouse interface" default n + depends on INPUT_MOUSE ---help--- The LittleVGL demo can also be configured to work with a mouse driver by setting this option. -endif +endif # EXAMPLES_LVGLDEMO
[incubator-nuttx] branch master updated: Lint Python code with flake8 and isort
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 15932fa Lint Python code with flake8 and isort 15932fa is described below commit 15932fa9eaf67a04ffb8f7b88ae2096e4b5b79f9 Author: Christian Clauss AuthorDate: Fri Apr 9 18:35:47 2021 +0200 Lint Python code with flake8 and isort --- .github/linters/setup.cfg | 9 + .github/workflows/lint.yml | 10 -- Documentation/conf.py | 2 +- tools/discover.py | 3 +-- tools/flash_writer.py | 34 -- tools/ide_exporter.py | 9 + tools/licensing/apachize.py | 6 +++--- tools/licensing/check.py| 11 ++- tools/lwl/ocdconsole.py | 27 +++ tools/parsecallstack.py | 2 +- 10 files changed, 65 insertions(+), 48 deletions(-) diff --git a/.github/linters/setup.cfg b/.github/linters/setup.cfg new file mode 100644 index 000..9c18e21 --- /dev/null +++ b/.github/linters/setup.cfg @@ -0,0 +1,9 @@ +[flake8] +ignore = W503,W605 +max-complexity = 27 +max-line-length = 125 +show-source = True +statistics = True + +[isort] +profile = black diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 135dca5..3997672 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,9 +10,15 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: YAML Lint + - run: mkdir super-linter.report + - name: Lint uses: github/super-linter@v3 env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_ALL_CODEBASE: false - VALIDATE_YAML: true VALIDATE_PYTHON_BLACK: true + VALIDATE_PYTHON_FLAKE8: true + PYTHON_FLAKE8_CONFIG_FILE: setup.cfg + VALIDATE_PYTHON_ISORT: true + PYTHON_ISORT_CONFIG_FILE: setup.cfg + VALIDATE_YAML: true diff --git a/Documentation/conf.py b/Documentation/conf.py index d101774..d485278 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -75,7 +75,7 @@ templates_path = ["_templates"] exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # list of documentation versions to offer (besides latest). this will be -# overriden by command line option but we can provide a sane default +# overridden by command line option but we can provide a sane default # this way html_context = dict() diff --git a/tools/discover.py b/tools/discover.py index b7c8193..140ca01 100755 --- a/tools/discover.py +++ b/tools/discover.py @@ -20,8 +20,7 @@ import array -import time -from socket import * +from socket import AF_INET, SO_BROADCAST, SOCK_DGRAM, SOL_SOCKET, socket, timeout PORT = 96 diff --git a/tools/flash_writer.py b/tools/flash_writer.py index ac5c35e..e77184b 100755 --- a/tools/flash_writer.py +++ b/tools/flash_writer.py @@ -16,18 +16,15 @@ # License for the specific language governing permissions and limitations # under the License. -import time -import sys -import os -import struct -import glob -import fnmatch -import errno -import telnetlib import argparse -import shutil -import subprocess +import errno +import os import re +import subprocess +import sys +import telnetlib +import time + import xmodem import_serial_module = True @@ -44,7 +41,7 @@ else: try: import serial -except: +except ImportError: import_serial_module = False # supported environment various @@ -57,6 +54,7 @@ PROTOCOL_TELNET = 1 MAX_DOT_COUNT = 70 + # configure parameters and default value class ConfigArgs: PROTOCOL_TYPE = None @@ -216,12 +214,12 @@ class ConfigArgsLoader: ConfigArgs.PKGUPD_NAME = args.pkgupd_name # Get serial port or telnet server ip etc -if args.serial_protocol == True: +if args.serial_protocol is True: ConfigArgs.PROTOCOL_TYPE = PROTOCOL_SERIAL -elif args.telnet_protocol == True: +elif args.telnet_protocol is True: ConfigArgs.PROTOCOL_TYPE = PROTOCOL_TELNET -if ConfigArgs.PROTOCOL_TYPE == None: +if ConfigArgs.PROTOCOL_TYPE is None: proto = os.environ.get("CXD56_PROTOCOL") if proto is not None: if "s" in proto: @@ -229,7 +227,7 @@ class ConfigArgsLoader: elif "t" in proto: ConfigArgs.PROTOCOL_TYPE = PROTOCOL_TELNET -if ConfigArgs.PROTOCOL_TYPE == None: +if ConfigArgs.PROTOCOL_TYPE is None: ConfigArgs.PROTOCOL_TYPE = PROTOCOL_SERIAL if ConfigArgs.PROTOCOL_TYPE == PROTOCOL_SERIAL: @@ -582,7 +580,7 @@ def main(): try: c
[incubator-nuttx] branch master updated (1fab9ad -> 9097244)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 1fab9ad Add black linter for python add 9097244 build: Makefile should reference CONFIG_HOST_xxx No new revisions were added by this update. Summary of changes: arch/sim/src/Makefile| 8 boards/arm/c5471/c5471evm/scripts/Make.defs | 2 +- boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs | 2 +- boards/arm/lpc214x/zp214xpa/scripts/Make.defs| 2 +- boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs | 2 +- boards/arm/str71x/olimex-strp711/scripts/Make.defs | 2 +- boards/sim/sim/sim/scripts/Make.defs | 2 -- boards/x86/qemu/qemu-i486/scripts/Make.defs | 4 +--- boards/x86_64/intel64/qemu-intel64/scripts/Make.defs | 4 +--- tools/Config.mk | 8 +++- 10 files changed, 14 insertions(+), 22 deletions(-)
[incubator-nuttx] branch master updated (e91a737 -> 3cdc0b7)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from e91a737 arch/arm: Remove .cpu directive from assemble file add 3cdc0b7 libc: Add additional checks to malloc realloc and memalign No new revisions were added by this update. Summary of changes: mm/mm_heap/mm_malloc.c | 8 +++- mm/mm_heap/mm_memalign.c | 35 +-- mm/mm_heap/mm_realloc.c | 7 +++ 3 files changed, 43 insertions(+), 7 deletions(-)
[incubator-nuttx] branch py-style updated (d048814 -> 6bcc81d)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. discard d048814 Add black linter for python add 6bcc81d Add black linter for python This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d048814) \ N -- N -- N refs/heads/py-style (6bcc81d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/cancel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-nuttx] branch master updated (b7ad0b3 -> e91a737)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from b7ad0b3 arch/armv6-m: Remove cpsid and cpsie from exception_common add e91a737 arch/arm: Remove .cpu directive from assemble file No new revisions were added by this update. Summary of changes: arch/arm/src/armv6-m/arm_exception.S | 2 -- arch/arm/src/armv6-m/arm_fullcontextrestore.S | 1 - arch/arm/src/armv6-m/arm_saveusercontext.S| 1 - arch/arm/src/armv6-m/arm_signal_handler.S | 1 - arch/arm/src/armv6-m/arm_switchcontext.S | 1 - arch/arm/src/armv6-m/vfork.S | 1 - arch/arm/src/armv7-m/gnu/arm_signal_handler.S | 1 - arch/arm/src/armv7-r/arm_fpuconfig.S | 6 -- arch/arm/src/armv7-r/arm_fullcontextrestore.S | 5 - arch/arm/src/armv7-r/arm_head.S | 6 -- arch/arm/src/armv7-r/arm_restorefpu.S | 6 -- arch/arm/src/armv7-r/arm_saveusercontext.S| 5 - arch/arm/src/armv7-r/arm_signal_handler.S | 5 - arch/arm/src/armv8-m/arm_signal_handler.S | 1 - 14 files changed, 42 deletions(-)
[incubator-nuttx] branch master updated (3cf070e -> b7ad0b3)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 3cf070e arch/armv8-m: Merge ite instruction to the previous one add b7ad0b3 arch/armv6-m: Remove cpsid and cpsie from exception_common No new revisions were added by this update. Summary of changes: arch/arm/src/armv6-m/arm_exception.S | 7 --- 1 file changed, 7 deletions(-)
[incubator-nuttx] branch master updated (d62ae03 -> 3cf070e)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from d62ae03 arch: Move setjmp/longjmp to libc/machine add 3cf070e arch/armv8-m: Merge ite instruction to the previous one No new revisions were added by this update. Summary of changes: arch/arm/src/armv8-m/arm_exception.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[incubator-nuttx] 10/10: Add black linter for python
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit d0488146dc638e1e3fde5a6398cec8a9ce4a9d23 Author: Brennan Ashton AuthorDate: Sun Apr 4 17:13:32 2021 -0700 Add black linter for python --- .github/workflows/lint.yml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9cd105e..396337a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,15 +1,15 @@ -name: ❄️ Lint +name: Lint on: [pull_request] jobs: - yamllint: -name: YAML + lint: +name: Lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: 粒 YAML Lint + - name: YAML Lint uses: github/super-linter@v3 env: VALIDATE_YAML: true - FILTER_REGEX_INCLUDE: .*\.github/.* + VALIDATE_PYTHON_BLACK: true
[incubator-nuttx] 06/10: lint tools/parsecallstack.py
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 0b2d2e7b1e4e1f67a95a92634f3deda325ee1c15 Author: Brennan Ashton AuthorDate: Sun Apr 4 17:06:30 2021 -0700 lint tools/parsecallstack.py --- tools/parsecallstack.py | 45 ++--- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/tools/parsecallstack.py b/tools/parsecallstack.py index bbddce0..821e215 100755 --- a/tools/parsecallstack.py +++ b/tools/parsecallstack.py @@ -20,9 +20,11 @@ import os import argparse + def parse_args(): -parser = argparse.ArgumentParser(""" +parser = argparse.ArgumentParser( +""" parsecallstack.py -c CPUTYPE -f FILENAME\n\ This file can get the call stack when you get the log with the register values from R0 to R15, together with the stack dump.\n @@ -30,24 +32,34 @@ def parse_args(): in Trace32, load the symbol according to the indication, the call stack will pop up.\n Trace32 software is available at: https://www.lauterbach.com -""") - -parser.add_argument("-f", "--filename", action = "store", -help = "log file with registers and stack information") -parser.add_argument("-c", "--cputype", action = "store", -help = '''It supports ARM family CPU such as: +""" +) + +parser.add_argument( +"-f", +"--filename", +action="store", +help="log file with registers and stack information", +) +parser.add_argument( +"-c", +"--cputype", +action="store", +help='''It supports ARM family CPU such as: "CortexM0" "CortexM1" "CortexM3" "CortexM4" "CortexM7" "CortexM23" "CortexM33" "CortexM35P" -"CortexR5" "CortexR7" "CortexA5" "CortexA7"''') +"CortexR5" "CortexR7" "CortexA5" "CortexA7"''', +) return parser.parse_args() + def get_regs(filename): reglist = [] -with open(filename, mode='r') as fl: +with open(filename, mode="r") as fl: for line in fl: -lst = line.strip('\n').split(' ') +lst = line.strip("\n").split(" ") if "R0:" in lst: reglist = lst[-8:] if "R8:" in lst: @@ -55,28 +67,30 @@ def get_regs(filename): return reglist + def get_stackvalue(filename): stackvalue = [] first = 1 -with open(filename, mode='r') as fl: +with open(filename, mode="r") as fl: for line in fl: -lst = line.strip('\n').split(' ') +lst = line.strip("\n").split(" ") if "up_stackdump:" in lst: if first == 1: first += 1 # strip ":" of sp -sp = lst[-9].strip(':') +sp = lst[-9].strip(":") # The first item is the sp to restore the stack. stackvalue.append(sp) stackvalue += lst[-8:] return stackvalue + def generate_cmm(cpu, regs, stackvalue): -filename = os.path.join(os.getcwd(), 'callstack.cmm') -with open(filename, mode='w') as fl: +filename = os.path.join(os.getcwd(), "callstack.cmm") +with open(filename, mode="w") as fl: # Select the CPU and symbol. fl.write("SYStem.CPU %d\n" % cpu) fl.write("SYS.M UP\n") @@ -100,6 +114,7 @@ def generate_cmm(cpu, regs, stackvalue): fl.write("data.view %%sYmbol.long %x\n" % sp) fl.write("frame.view /Locals /Caller\n") + if __name__ == "__main__": args = parse_args() regs = get_regs(args.filename)
[incubator-nuttx] 08/10: lint Documentation/
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit ea9aaa3919b61db9654e9048073a16aba2f7254a Author: Brennan Ashton AuthorDate: Sun Apr 4 17:10:08 2021 -0700 lint Documentation/ --- Documentation/conf.py | 52 ++- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/Documentation/conf.py b/Documentation/conf.py index fef4b07..d101774 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -37,10 +37,10 @@ # -- Project information - -project = 'NuttX' -copyright = '2020, The Apache Software Foundation' -author = 'NuttX community' -version = release = 'latest' +project = "NuttX" +copyright = "2020, The Apache Software Foundation" +author = "NuttX community" +version = release = "latest" # -- General configuration --- @@ -51,12 +51,12 @@ version = release = 'latest' extensions = [ "sphinx_rtd_theme", "m2r2", -'sphinx.ext.autosectionlabel', -'sphinx.ext.todo', -'sphinx_tabs.tabs' +"sphinx.ext.autosectionlabel", +"sphinx.ext.todo", +"sphinx_tabs.tabs", ] -source_suffix = [ '.rst', '.md' ] +source_suffix = [".rst", ".md"] todo_include_todos = True @@ -67,19 +67,19 @@ highlight_language = "none" primary_domain = None # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # list of documentation versions to offer (besides latest). this will be # overriden by command line option but we can provide a sane default # this way html_context = dict() -html_context['nuttx_versions'] = 'latest' +html_context["nuttx_versions"] = "latest" # TODO: append other options using releases detected from git (or maybe just # a few hand-selected ones, or maybe just a "stable" option) @@ -89,41 +89,33 @@ html_context['nuttx_versions'] = 'latest' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'sphinx_rtd_theme' +html_theme = "sphinx_rtd_theme" html_show_sphinx = False -html_theme_options = { -'navigation_depth': 5 -} +html_theme_options = {"navigation_depth": 5} # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] -html_css_files = [ -'custom.css' -] +html_css_files = ["custom.css"] html_show_license = True -html_logo = '_static/NuttX.png' -html_favicon = '_static/favicon.ico' +html_logo = "_static/NuttX.png" +html_favicon = "_static/favicon.ico" -today_fmt = '%d %B %y at %H:%M' +today_fmt = "%d %B %y at %H:%M" -c_id_attributes = [ - 'FAR', - 'CODE', - 'noreturn_function' -] +c_id_attributes = ["FAR", "CODE", "noreturn_function"] # This is required to allow running linkcheck with sphinx-tabs -sphinx_tabs_valid_builders = ['linkcheck'] +sphinx_tabs_valid_builders = ["linkcheck"] # There are some sites where the linkchecker cannot handle anchors linkcheck_ignore = [ - 'https://github.com/pyenv/pyenv#installation', - 'http://openocd.zylin.com/#/c/4103/', +"https://github.com/pyenv/pyenv#installation;, +"http://openocd.zylin.com/#/c/4103/;, ]
[incubator-nuttx] 05/10: lint tools/ide_exporter.py
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 825d0c6f2b7468549c4b46dd40022ef715287e50 Author: Brennan Ashton AuthorDate: Sun Apr 4 17:04:54 2021 -0700 lint tools/ide_exporter.py --- tools/ide_exporter.py | 556 -- 1 file changed, 309 insertions(+), 247 deletions(-) diff --git a/tools/ide_exporter.py b/tools/ide_exporter.py index 543164a..c0886d7 100755 --- a/tools/ide_exporter.py +++ b/tools/ide_exporter.py @@ -37,7 +37,6 @@ # -from __future__ import print_function import os import subprocess import re @@ -73,80 +72,110 @@ optional arguments: -d, --dumpDump project structure tree """ -IAR = 'iar' -UVISION_GCC = 'uvision_gcc' -UVISION_ARMCC = 'uvision_armcc' +IAR = "iar" +UVISION_GCC = "uvision_gcc" +UVISION_ARMCC = "uvision_armcc" -COMPILE_PREFIX_LIST = ('CC: ', 'AS: ', 'CXX:') -LIB_PREFIX_LIST = ('AR: ') -LINK_PREFIX_LIST = ('LD: ') -MAKE_ENTER_DIR = 'Entering directory' +COMPILE_PREFIX_LIST = ("CC: ", "AS: ", "CXX:") +LIB_PREFIX_LIST = "AR: " +LINK_PREFIX_LIST = "LD: " +MAKE_ENTER_DIR = "Entering directory" PREFIX_LEN = 4 -IAR_EXT_REMAP = {r'gnu/(\w+)\.S$' : r'iar/\g<1>.S'} -ARMCC_EXT_REMAP = {r'gnu/(\w+)\.S$' : r'armcc/\g<1>.S', - r'(\w+)\.a$': r'\g<1>.lib'} +IAR_EXT_REMAP = {r"gnu/(\w+)\.S$": r"iar/\g<1>.S"} +ARMCC_EXT_REMAP = {r"gnu/(\w+)\.S$": r"armcc/\g<1>.S", r"(\w+)\.a$": r"\g<1>.lib"} UVISION_GCC_EXT_REMAP = {} # file ext to FileTye in uVision project -UVISION_FILE_TYPE_MAP = {'.c': '1', '.S' : '1', '.cxx' : '8', '.lib' : '4', '.a' : '4'} +UVISION_FILE_TYPE_MAP = {".c": "1", ".S": "1", ".cxx": "8", ".lib": "4", ".a": "4"} # tags convention: tag[0] = root_tags, create if doesn't exist # tag[1] = (sub_tag,) tag without text, create new # tag[2] = (leaf_tag,) with text, create new -IAR_PRJ_SETTINGS = {'group_tags' : ('', ('group',), ('name', )), -'file_tags' :('', ('file',), ('name', )), -'rel_base' : '$PROJ_DIR$/', -'cleared_nodes' : ('group', 'file', ), -'include_pnodes' : (".//*[name='CCIncludePath2']", ".//*[name='AUserIncludes']"), -'include_tag' : 'state', -'output_path' : {'exe' : 'Obj', 'obj' : 'Obj', 'lst' : 'Lst'}, -'ext_remap' : IAR_EXT_REMAP,} - -IAR_WSP_SETTINGS = {'group_tags': ('',), -'file_tags':('', ('project', ), ('path',)), -'rel_base':'$WS_DIR$/', -'cleared_nodes': ('project', )} - - -UVISION_ARMCC_PRJ_SETTINGS = {'root_group':'', - 'group_tags': ('.//Targets/Target/Groups', ('Group', ), ('GroupName', )), - 'file_tags':('Files', ('File', ), ('FileName', 'FileType', 'FilePath', )), - 'rel_base':'', - 'cleared_nodes': ('.//Group', ), - 'include_pnodes' : ".//VariousControls/IncludePath", - 'output_path' : {'exe' : 'Obj', 'obj' : 'Obj', 'lst' : 'Lst'}, - 'ext_remap' : ARMCC_EXT_REMAP, - 'uv_file_type' : UVISION_FILE_TYPE_MAP} - -UVISION_GCC_PRJ_SETTINGS = {'root_group':'', -'group_tags': ('.//Targets/Target/Groups', ('Group', ), ('GroupName', )), -'file_tags':('Files', ('File', ), ('FileName', 'FileType', 'FilePath', )), -'rel_base':'', -'cleared_nodes': ('.//Group', ), -'include_pnodes' : ".//VariousControls/IncludePath", -'saved_tags' : ('.//FileOption', ), -'output_path' : {'exe' : 'Obj', 'obj' : 'Obj', 'lst' : 'Lst'}, -'ext_remap' : UVISION_GCC_EXT_REMAP, -'uv_file_type' : UVISION_FILE_TYPE_MAP, -'c_misc' : ('.//Carm', '-fno-builtin -Wall -Wstrict-prototypes -Wshadow -Wundef -g'), -'cxx_misc' : ('.//Carm', '-fno-builtin -fno-exceptions -fcheck-new -fno-rtti -Wall -Wshadow -Wundef -g'), -'ld_misc' : ('.//LDarm', '--entry=__start -lgcc'), -'cxx_def' : ('.//Carm', ''),} -
[incubator-nuttx] branch py-style created (now d048814)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. at d048814 Add black linter for python This branch includes the following new commits: new 3dc86ac Remove fork of python xmodem that is an active project new f964606 xmlrpc_test.py port to py3 and format new 2634d30 Port tools/discover.py to py3 and lint new a6d83d8 Lint tools/flash_writer.py new 825d0c6 lint tools/ide_exporter.py new 0b2d2e7 lint tools/parsecallstack.py new 4da6b1d lint licensing new ea9aaa3 lint Documentation/ new de723ad lint tools/lwl/ocdconsole.py new d048814 Add black linter for python The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-nuttx] 04/10: Lint tools/flash_writer.py
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit a6d83d8e8e64a8477bf182336ff4524a54a1069c Author: Brennan Ashton AuthorDate: Sun Apr 4 16:57:31 2021 -0700 Lint tools/flash_writer.py --- tools/flash_writer.py | 1101 +++-- 1 file changed, 602 insertions(+), 499 deletions(-) diff --git a/tools/flash_writer.py b/tools/flash_writer.py index 0fa7280..4f89555 100755 --- a/tools/flash_writer.py +++ b/tools/flash_writer.py @@ -35,17 +35,17 @@ import_serial_module = True # When SDK release, please set SDK_RELEASE as True. SDK_RELEASE = False -if SDK_RELEASE : - PRINT_RAW_COMMAND = False - REBOOT_AT_END = True -else : - PRINT_RAW_COMMAND = True - REBOOT_AT_END = True +if SDK_RELEASE: +PRINT_RAW_COMMAND = False +REBOOT_AT_END = True +else: +PRINT_RAW_COMMAND = True +REBOOT_AT_END = True try: - import serial +import serial except: - import_serial_module = False +import_serial_module = False # supported environment various # CXD56_PORT @@ -59,508 +59,611 @@ MAX_DOT_COUNT = 70 # configure parameters and default value class ConfigArgs: - PROTOCOL_TYPE = None - SERIAL_PORT = "COM1" - SERVER_PORT = 4569 - SERVER_IP = "localhost" - EOL = bytes([10]) - WAIT_RESET = True - AUTO_RESET = False - DTR_RESET = False - XMODEM_BAUD = 0 - NO_SET_BOOTABLE = False - PACKAGE_NAME = [] - FILE_NAME = [] - ERASE_NAME = [] - PKGSYS_NAME = [] - PKGAPP_NAME = [] - PKGUPD_NAME = [] +PROTOCOL_TYPE = None +SERIAL_PORT = "COM1" +SERVER_PORT = 4569 +SERVER_IP = "localhost" +EOL = bytes([10]) +WAIT_RESET = True +AUTO_RESET = False +DTR_RESET = False +XMODEM_BAUD = 0 +NO_SET_BOOTABLE = False +PACKAGE_NAME = [] +FILE_NAME = [] +ERASE_NAME = [] +PKGSYS_NAME = [] +PKGAPP_NAME = [] +PKGUPD_NAME = [] + ROM_MSG = [b"Welcome to nash"] XMDM_MSG = "Waiting for XMODEM (CRC or 1K) transfer. Ctrl-X to cancel." -class ConfigArgsLoader(): - def __init__(self): - self.parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter) - self.parser.add_argument("package_name", help="the name of the package to install", nargs='*') - self.parser.add_argument("-f", "--file", dest="file_name", help="save file", action='append') - self.parser.add_argument("-e", "--erase", dest="erase_name", help="erase file", action='append') - - self.parser.add_argument("-S", "--sys", dest="pkgsys_name", help="the name of the system package to install", action='append') - self.parser.add_argument("-A", "--app", dest="pkgapp_name", help="the name of the application package to install", action='append') - self.parser.add_argument("-U", "--upd", dest="pkgupd_name", help="the name of the updater package to install", action='append') - - self.parser.add_argument("-a", "--auto-reset", dest="auto_reset", - action="store_true", default=None, - help="try to auto reset develop board if possible") - self.parser.add_argument("-d", "--dtr-reset", dest="dtr_reset", - action="store_true", default=None, - help="try to auto reset develop board if possible") - self.parser.add_argument("-n", "--no-set-bootable", dest="no_set_bootable", - action="store_true", default=None, - help="not to set bootable") - - group = self.parser.add_argument_group() - group.add_argument("-i", "--server-ip", dest="server_ip", - help="the ip address connected to the telnet server") - group.add_argument("-p", "--server-port", dest="server_port", type=int, - help=&q
[incubator-nuttx] 01/10: Remove fork of python xmodem that is an active project
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 3dc86acbea31f74f83ffc27ee6861ac549c9f2ad Author: Brennan Ashton AuthorDate: Sun Apr 4 16:47:55 2021 -0700 Remove fork of python xmodem that is an active project --- tools/README.txt | 3 +- tools/xmodem.py | 590 --- 2 files changed, 2 insertions(+), 591 deletions(-) diff --git a/tools/README.txt b/tools/README.txt index 92fb20e..42b4fa1 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -502,7 +502,8 @@ flash_writer.py --- This flash writer is using the xmodem for firmware transfer on - boards based on cxd56 chip (Ex. Spresense) + boards based on cxd56 chip (Ex. Spresense). This tool depends on + the xmodem package (https://pypi.org/project/xmodem/). for flashing the .spk image to the board please use: tools/flash_writer.py -s -c /dev/ttyUSB0 -d -b 115200 -n nuttx.spk diff --git a/tools/xmodem.py b/tools/xmodem.py deleted file mode 100644 index 60fcc95..000 --- a/tools/xmodem.py +++ /dev/null @@ -1,590 +0,0 @@ -''' -=== - XMODEM file transfer protocol -=== - -.. $Id$ - -This is a literal implementation of XMODEM.TXT_, XMODEM1K.TXT_ and -XMODMCRC.TXT_, support for YMODEM and ZMODEM is pending. YMODEM should -be fairly easy to implement as it is a hack on top of the XMODEM -protocol using sequence bytes ``0x00`` for sending file names (and some -meta data). - -.. _XMODEM.TXT: doc/XMODEM.TXT -.. _XMODEM1K.TXT: doc/XMODEM1K.TXT -.. _XMODMCRC.TXT: doc/XMODMCRC.TXT - -Data flow example including error recovery -== - -Here is a sample of the data flow, sending a 3-block message. -It includes the two most common line hits - a garbaged block, -and an ``ACK`` reply getting garbaged. ``CRC`` or ``CSUM`` represents -the checksum bytes. - -XMODEM 128 byte blocks --- - -:: - -SENDER RECEIVER - -<-- NAK -SOH 01 FE Data[128] CSUM--> -<-- ACK -SOH 02 FD Data[128] CSUM--> -<-- ACK -SOH 03 FC Data[128] CSUM--> -<-- ACK -SOH 04 FB Data[128] CSUM--> -<-- ACK -SOH 05 FA Data[100] CPMEOF[28] CSUM --> -<-- ACK -EOT --> -<-- ACK - -XMODEM-1k blocks, CRC mode --- - -:: - -SENDER RECEIVER - -<-- C -STX 01 FE Data[1024] CRC CRC--> -<-- ACK -STX 02 FD Data[1024] CRC CRC--> -<-- ACK -STX 03 FC Data[1000] CPMEOF[24] CRC CRC --> -<-- ACK -EOT --> -<-- ACK - -Mixed 1024 and 128 byte Blocks --- - -:: - -SENDER RECEIVER - -<-- C -STX 01 FE Data[1024] CRC CRC--> -<-- ACK -STX 02 FD Data[1024] CRC CRC--> -<-- ACK -SOH 03 FC Data[128] CRC CRC --> -<-- ACK -SOH 04 FB Data[100] CPMEOF[28] CRC CRC --> -<-- ACK -EOT --> -<-- ACK - -YMODEM Batch Transmission Session (1 file) --- - -:: - -SENDER RECEIVER -<-- C (command:rb) -SOH 00 FF foo.c NUL[123] CRC CRC--> -<-- ACK -<-- C -SOH 01 FE Data[128] CRC CRC --> -<-- ACK -SOH 02 FC Data[128] CRC CRC --> -<-- ACK -SOH 03 FB Data[100] CPMEOF[28] CRC CRC --> -<-- ACK -EOT --> -
[incubator-nuttx] 07/10: lint licensing
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 4da6b1df7d25ed60f19606207aa91ab3da296f62 Author: Brennan Ashton AuthorDate: Sun Apr 4 17:09:12 2021 -0700 lint licensing --- tools/licensing/apachize.py | 24 -- tools/licensing/check.py| 204 ++-- 2 files changed, 136 insertions(+), 92 deletions(-) diff --git a/tools/licensing/apachize.py b/tools/licensing/apachize.py index 7c26e63..a86a6ce 100755 --- a/tools/licensing/apachize.py +++ b/tools/licensing/apachize.py @@ -25,22 +25,30 @@ apache = r""" * /""" + def apachize(path, header): -relpath = os.path.relpath(path, os.environ['TOPDIR']) -header = re.sub('PATH', relpath, header) +relpath = os.path.relpath(path, os.environ["TOPDIR"]) +header = re.sub("PATH", relpath, header) with open(path) as f: s = f.read() -s = re.sub('(?i)/\*\*\*.+?(?:Copyright).+?\*\*\*+/', header, s, 1, re.DOTALL) +s = re.sub("(?i)/\*\*\*.+?(?:Copyright).+?\*\*\*+/", header, s, 1, re.DOTALL) print(s) -if (len(sys.argv) != 2): -print("Usage: ./apachize.py ", file = sys.stderr) -print("This will replace the license header of the passed file to that of Apache 2.0 and print it to stdout", file = sys.sterr) + +if len(sys.argv) != 2: +print("Usage: ./apachize.py ", file=sys.stderr) +print( +"This will replace the license header of the passed file to that of Apache 2.0 and print it to stdout", +file=sys.sterr, +) sys.exit(2) -if (not 'TOPDIR' in os.environ): -print("Please define the TOPDIR environment variable to the full path to nuttx/ root", file = sys.stderr) +if not "TOPDIR" in os.environ: +print( +"Please define the TOPDIR environment variable to the full path to nuttx/ root", +file=sys.stderr, +) sys.exit(2) apachize(sys.argv[1], apache) diff --git a/tools/licensing/check.py b/tools/licensing/check.py index 884d6fa..837c48b 100755 --- a/tools/licensing/check.py +++ b/tools/licensing/check.py @@ -34,146 +34,167 @@ author_mappings_json = None verbose_level = 0 color = True -def colored(s,c): + +def colored(s, c): if color: -return termcolor.colored(s,c) +return termcolor.colored(s, c) else: return s + def commit_attributions(c): -regex = re.compile('(?i)(?:by|from|author|Co-authored-by):? +(.+)') -return re.findall(regex, c['message']) + re.findall(regex,c['body']) +regex = re.compile("(?i)(?:by|from|author|Co-authored-by):? +(.+)") +return re.findall(regex, c["message"]) + re.findall(regex, c["body"]) + def get_headers(s): -return re.findall('(?i)/\*\*\*.+?(?:Copyright).+?\*\*\*+/', s, re.DOTALL) +return re.findall("(?i)/\*\*\*.+?(?:Copyright).+?\*\*\*+/", s, re.DOTALL) + def get_file(blob): try: -return subprocess.check_output(['git','cat-file','-p',blob], stderr=subprocess.DEVNULL).decode() +return subprocess.check_output( +["git", "cat-file", "-p", blob], stderr=subprocess.DEVNULL +).decode() except subprocess.CalledProcessError as err: return None + def header_authors(header): -results = re.findall('[Aa]uthors?: +(.+?) *(?:Redistribution)', header, re.DOTALL) -results = [re.split('\n[ *]+',result) for result in results] -results = sum(results,[]) # flatten -results = [re.sub('[Cc]opyright:?( ?.[Cc].)? *([12][0-9]{3}[,-]? ?)','',result) for result in results] -results = list(filter(lambda s: s != '', results)) # remove empty strings +results = re.findall("[Aa]uthors?: +(.+?) *(?:Redistribution)", header, re.DOTALL) +results = [re.split("\n[ *]+", result) for result in results] +results = sum(results, []) # flatten +results = [ +re.sub("[Cc]opyright:?( ?.[Cc].)? *([12][0-9]{3}[,-]? ?)", "", result) +for result in results +] +results = list(filter(lambda s: s != "", results)) # remove empty strings return results + # Search for an author name in Apache's committers/non-committers # database. It will return (apacheID,name) if there's a match or # None if not. apacheID might be None if there's no Apache ID # for author + def search_for_cla(name): -for k,v in committers_json['committers'].items(): -if (v == name): -return (k,v) +for k, v in committers_json["committers"].items(): +if v == name: +return (k, v) -if name in non_committers_json['non_committ
[incubator-nuttx] 03/10: Port tools/discover.py to py3 and lint
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit 2634d304e9a348b99f6ef133e7405608016c8ab9 Author: Brennan Ashton AuthorDate: Sun Apr 4 16:54:09 2021 -0700 Port tools/discover.py to py3 and lint --- tools/discover.py | 36 +--- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/discover.py b/tools/discover.py index 5a87f51..b7c8193 100755 --- a/tools/discover.py +++ b/tools/discover.py @@ -26,58 +26,64 @@ from socket import * PORT = 96 DISCOVER_PROTO_ID = 0x99 -DISCOVER_ALL = 0xff # 0xff means all devices +DISCOVER_ALL = 0xFF # 0xff means all devices DISCOVER_REQUEST = 0x01 DISCOVER_RESPONSE = 0x02 DISCOVER_REQUEST_SIZE = 4 DISCOVER_RESPONSE_SIZE = 35 + def check_sum(data): chksum = 0 for c in data[:-1]: chksum -= c -return (chksum & 0xff) == data[-1] +return (chksum & 0xFF) == data[-1] + def send_discover(socket): -cmd = array.array('B', [0] * DISCOVER_REQUEST_SIZE) -cmd[0] = DISCOVER_PROTO_ID # Tag for identification of the protocol +cmd = array.array("B", [0] * DISCOVER_REQUEST_SIZE) +cmd[0] = DISCOVER_PROTO_ID # Tag for identification of the protocol cmd[1] = DISCOVER_REQUEST # Request command cmd[2] = DISCOVER_ALL chksum = 0 for c in cmd[:3]: chksum -= c -cmd[3] = chksum & 0xff +cmd[3] = chksum & 0xFF + +socket.sendto(cmd, ("", PORT)) -socket.sendto(cmd, ('', PORT)) def read_responses(socket): res = [] -response = array.array('B', [0] * DISCOVER_RESPONSE_SIZE) +response = array.array("B", [0] * DISCOVER_RESPONSE_SIZE) try: while 1: size, src = socket.recvfrom_into(response) -if (size == DISCOVER_RESPONSE_SIZE +if ( +size == DISCOVER_RESPONSE_SIZE and response[0] == DISCOVER_PROTO_ID and response[1] == DISCOVER_RESPONSE -and check_sum(response)): +and check_sum(response) +): dev = {} -dev['addr'] = src[0] -dev['descr'] = response[2:-1].tostring().rstrip('\0') +dev["addr"] = src[0] +dev["descr"] = response[2:-1].tostring().rstrip("\0") res.append(dev) except timeout: return res -if __name__ == '__main__': -print 'Sending discover...' + +if __name__ == "__main__": +print("Sending discover...") s = socket(AF_INET, SOCK_DGRAM) -s.bind(('0.0.0.0', PORT)) +s.bind(("0.0.0.0", PORT)) s.setsockopt(SOL_SOCKET, SO_BROADCAST, 1) s.settimeout(1.0) send_discover(s) devices = read_responses(s) socket.close(s) -print devices +print(devices)
[incubator-nuttx] 09/10: lint tools/lwl/ocdconsole.py
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit de723ad82d15f159ea6ee928a92e666894c9c2e9 Author: Brennan Ashton AuthorDate: Sun Apr 4 17:10:52 2021 -0700 lint tools/lwl/ocdconsole.py --- tools/lwl/ocdconsole.py | 133 +--- 1 file changed, 80 insertions(+), 53 deletions(-) diff --git a/tools/lwl/ocdconsole.py b/tools/lwl/ocdconsole.py index 86c2030..cfabfcf 100755 --- a/tools/lwl/ocdconsole.py +++ b/tools/lwl/ocdconsole.py @@ -65,13 +65,13 @@ LWL_UPSENSESHIFT = 29 LWL_OCTVALSHIFT = 27 LWL_PORTSHIFT = 24 -LWL_PORTMASK = (7<=length): +if downwordaddr >= length: print("ERROR: Cannot find signature\r") exit(1) # We have the base address, so get the variables themselves # = -downwordaddr=baseaddr+downwordaddr+4 -upwordaddr=downwordaddr+4 -downword=LWL_ACTIVE +downwordaddr = baseaddr + downwordaddr + 4 +upwordaddr = downwordaddr + 4 +downword = LWL_ACTIVE # Now wake up the link...keep on trying if it goes down # = while True: ocd.writeVariable(downwordaddr, downword) upword = ocd.readVariable(upwordaddr) -if (upword_ACTIVE!=0): +if upword & LWL_ACTIVE != 0: print("==Link Activated\r") break -except (BrokenPipeError, ConnectionRefusedError, ConnectionResetError) as e: +except ( +BrokenPipeError, +ConnectionRefusedError, +ConnectionResetError, +) as e: raise e # Now run the comms loop until something fails @@ -228,32 +239,48 @@ if __name__ == "__main__": while True: ocd.writeVariable(downwordaddr, downword) upword = ocd.readVariable(upwordaddr) -if (upword_ACTIVE==0): +if upword & LWL_ACTIVE == 0: print("\r==Link Deactivated\r") break if kbhit(): charin = sys.stdin.read(1) -if (ord(charin)==3): +if ord(charin) == 3: sys.exit(0) -if (downword_DNSENSEBIT): -downword=(downword_UPSENSEBIT) +if downword & LWL_DNSENSEBIT: +downword = downword & LWL_UPSENSEBIT else: - downword=(downword_UPSENSEBIT)|LWL_DNSENSEBIT - downword|=(LWL_PORT_CONSOLE<>LWL_PORTSHIFT -if (incomingPort==LWL_PORT_CONSOLE): - incomingBytes=(upword_OCTVALMASK)>>LWL_OCTVALSHIFT -if (incomingBytes>=1): dooutput(upword&255); -if (incomingBytes>=2): dooutput((upword>>8)&255); -if (incomingBytes==3): dooutput((upword>>16)&255); - -if (downword_UPSENSEBIT): -downword = downword&~LWL_UPSENSEBIT +downword = ( +downword & LWL_UPSENSEBIT +) | LWL_DNSENSEBIT +downword |= ( +(LWL_PORT_CONSOLE << LWL_PORTSHIFT) +| (1 << LWL_OCTVALSHIFT) +| LWL_ACTIVE +| ord(charin) +) + +if (upword & LWL_UPSENSEBIT) != (downword & LWL_UPSENSEBIT): +incomingPort = (upword & LWL_PORTMASK) >> LWL_PORTSHIFT +if incomingPort == LWL_PORT_CONSOLE: +
[incubator-nuttx] 02/10: xmlrpc_test.py port to py3 and format
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch py-style in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit f964606e89eda6d078db5cdd5fb12a6ca4ea75c1 Author: Brennan Ashton AuthorDate: Sun Apr 4 16:50:38 2021 -0700 xmlrpc_test.py port to py3 and format --- tools/xmlrpc_test.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/xmlrpc_test.py b/tools/xmlrpc_test.py index ee23f71..ab3e218 100755 --- a/tools/xmlrpc_test.py +++ b/tools/xmlrpc_test.py @@ -20,14 +20,14 @@ import sys -import xmlrpclib +import xmlrpc.client -if __name__ == '__main__': +if __name__ == "__main__": if len(sys.argv) != 2: -print 'Usage: %s ' % sys.argv[0] +print("Usage: %s " % sys.argv[0]) quit(1) -server_url = 'http://%s/device' % sys.argv[1] -server = xmlrpclib.ServerProxy(server_url) +server_url = "http://%s/device; % sys.argv[1] +server = xmlrpc.client.ServerProxy(server_url) result = server.get_device_stats("username", "password", 0) -print result +print(result)
[incubator-nuttx] branch master updated (92c6105 -> d62ae03)
This is an automated email from the ASF dual-hosted git repository. btashton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git. from 92c6105 arch/stm32h7: Fix syntax error add d62ae03 arch: Move setjmp/longjmp to libc/machine No new revisions were added by this update. Summary of changes: arch/arm/src/cxd56xx/Make.defs | 6 -- arch/arm/src/efm32/Make.defs | 6 -- arch/arm/src/eoss3/Make.defs | 6 -- arch/arm/src/imxrt/Make.defs | 6 -- arch/arm/src/kinetis/Make.defs | 6 -- arch/arm/src/lc823450/Make.defs | 6 -- arch/arm/src/lpc17xx_40xx/Make.defs | 6 -- arch/arm/src/lpc43xx/Make.defs | 6 -- arch/arm/src/lpc54xx/Make.defs | 6 -- arch/arm/src/max326xx/Make.defs | 6 -- arch/arm/src/nrf52/Make.defs | 6 -- arch/arm/src/s32k1xx/s32k14x/Make.defs | 6 -- arch/arm/src/sam34/Make.defs | 6 -- arch/arm/src/samd5e5/Make.defs | 6 -- arch/arm/src/samv7/Make.defs | 6 -- arch/arm/src/stm32/Make.defs | 6 -- arch/arm/src/stm32f7/Make.defs | 6 -- arch/arm/src/stm32h7/Make.defs | 6 -- arch/arm/src/stm32l4/Make.defs | 6 -- arch/arm/src/stm32l5/Make.defs | 6 -- arch/arm/src/tiva/Make.defs | 6 -- arch/arm/src/xmc4/Make.defs | 6 -- arch/risc-v/src/esp32c3/Make.defs| 4 arch/risc-v/src/fe310/Make.defs | 4 arch/risc-v/src/k210/Make.defs | 4 arch/risc-v/src/litex/Make.defs | 4 libs/libc/machine/arm/armv7-m/Make.defs | 11 +-- .../libc/machine/arm/armv7-m/gnu/arch_setjmp.S | 2 +- libs/libc/machine/arm/armv8-m/Make.defs | 9 + .../libc/machine/arm/armv8-m/gnu/arch_setjmp.S | 2 +- libs/libc/machine/risc-v/Make.defs | 6 +- libs/libc/machine/{arm/armv6-m => risc-v/common}/Make.defs | 12 +++- .../libc/machine/risc-v/common/arch_setjmp.S | 2 +- 33 files changed, 29 insertions(+), 163 deletions(-) rename arch/arm/src/armv7-m/gnu/arm_setjmp.S => libs/libc/machine/arm/armv7-m/gnu/arch_setjmp.S (98%) rename arch/arm/src/armv8-m/arm_setjmp.S => libs/libc/machine/arm/armv8-m/gnu/arch_setjmp.S (98%) copy libs/libc/machine/{arm/armv6-m => risc-v/common}/Make.defs (84%) rename arch/risc-v/src/common/riscv_setjmp.S => libs/libc/machine/risc-v/common/arch_setjmp.S (97%)
[incubator-nuttx-website] branch master updated: contributors.yml: Add Duo Zhang.
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-website.git The following commit(s) were added to refs/heads/master by this push: new 706feb7 contributors.yml: Add Duo Zhang. 706feb7 is described below commit 706feb7a8f09ba9c0ea4111239db9d4c65cf9a00 Author: Ouss4 AuthorDate: Sun Apr 4 14:49:59 2021 +0200 contributors.yml: Add Duo Zhang. --- _data/contributors.yml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/_data/contributors.yml b/_data/contributors.yml index ec7b766..f4efa3c 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -66,6 +66,12 @@ role: PPMC, Committer org: +- name: Duo Zhang + apacheId: zhangduo + githubId: Apache9 + role: Mentor, IPMC, PPMC, Committer + org: + - name:Flavio Paiva Junqueira apacheId: fpj githubId: fpj
[incubator-nuttx-apps] branch master updated: system/nxplayer: Fix error: 'outstanding' undeclared
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new 52d853e system/nxplayer: Fix error: 'outstanding' undeclared 52d853e is described below commit 52d853e6423b2aa48aa739131df2d0d48c80ad9c Author: Xiang Xiao AuthorDate: Mon Mar 29 15:29:23 2021 +0800 system/nxplayer: Fix error: 'outstanding' undeclared Signed-off-by: Xiang Xiao --- system/nxplayer/nxplayer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c index bed..fad25a0 100644 --- a/system/nxplayer/nxplayer.c +++ b/system/nxplayer/nxplayer.c @@ -1106,8 +1106,8 @@ static void *nxplayer_playthread(pthread_addr_t pvarg) case AUDIO_MSG_COMPLETE: #ifdef CONFIG_DEBUG_FEATURES audinfo("Play complete. outstanding=%d\n", outstanding); -#endif DEBUGASSERT(outstanding == 0); +#endif running = false; break;
[incubator-nuttx] 04/04: misc: : Author Gregory Nutt: update licenses to Apache
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit e699b6f85f8c1b023b4bcabaf2cca14567fbea97 Author: Alin Jerpelea AuthorDate: Sun Mar 28 18:15:37 2021 +0200 misc: : Author Gregory Nutt: update licenses to Apache Gregory Nutt has submitted the SGA and we can migrate the licenses to Apache. Several files were missed in the past Signed-off-by: Alin Jerpelea --- boards/sim/sim/sim/src/sim_appinit.c| 39 +-- boards/sim/sim/sim/src/sim_gpio.c | 39 +-- boards/sim/sim/sim/src/sim_ioexpander.c | 39 +-- drivers/audio/cs43l22.h | 48 - drivers/audio/wm8904.h | 48 - libs/libc/unistd/lib_getegid.c | 43 ++--- 6 files changed, 84 insertions(+), 172 deletions(-) diff --git a/boards/sim/sim/sim/src/sim_appinit.c b/boards/sim/sim/sim/src/sim_appinit.c index ab1ed58..ad181be 100644 --- a/boards/sim/sim/sim/src/sim_appinit.c +++ b/boards/sim/sim/sim/src/sim_appinit.c @@ -1,35 +1,20 @@ / * boards/sim/sim/sim/src/sim_appinit.c * - * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - *used to endorse or promote products derived from this software - *without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * / diff --git a/boards/sim/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c index 06ce426..4cdb76a 100644 --- a/boards/sim/sim/sim/src/sim_gpio.c +++ b/boards/sim/sim/sim/src/sim_gpio.c @@ -1,35 +1,20 @@ / * boards/sim/sim/sim/src/sim_gpio.c * - * Copyright (C) 2016 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/license