From 692b087d07d68d2a249f5739ae170f54513a42f0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 5 Dec 2013 10:37:55 -0600 Subject: [PATCH] LM: Don't initialize .data if running in SRAM. Global missing intialize type. SAMA5 NAND: Fix for read nand in smaller chunks --- ChangeLog | 7 +- Documentation/NXGraphicsSubsystem.html | 2 +- Documentation/NuttxPortingGuide.html | 8 +- Documentation/NuttxUserGuide.html | 2 +- arch/8051/src/up_initialstate.c | 2 +- arch/arm/src/common/up_initialize.c | 2 +- arch/arm/src/kinetis/kinetis_start.c | 2 +- arch/arm/src/kl/kl_start.c | 2 +- arch/arm/src/lm/lm_start.c | 4 +- arch/arm/src/lpc17xx/lpc17_start.c | 2 +- arch/arm/src/lpc17xx/lpc17_usbhost.c | 2 +- arch/arm/src/lpc17xx/lpc17_usbhost.h | 2 +- arch/arm/src/lpc31xx/lpc31_ehci.c | 2 +- arch/arm/src/lpc31xx/lpc31_internal.h | 2 +- arch/arm/src/lpc43xx/lpc43_start.c | 2 +- arch/arm/src/nuc1xx/nuc_start.c | 2 +- arch/arm/src/sam34/sam_start.c | 2 +- arch/arm/src/sama5/sam_ehci.c | 2 +- arch/arm/src/sama5/sam_irq.c | 2 +- arch/arm/src/sama5/sam_nand.c | 157 +++++---------------- arch/arm/src/sama5/sam_ohci.c | 2 +- arch/arm/src/sama5/sam_pmecc.c | 4 +- arch/arm/src/sama5/sam_rtc.c | 2 +- arch/arm/src/sama5/sam_ssc.c | 2 +- arch/arm/src/sama5/sam_usbhost.h | 4 +- arch/arm/src/sama5/sam_wdt.c | 2 +- arch/arm/src/stm32/stm32_iwdg.c | 2 +- arch/arm/src/stm32/stm32_otgfs.h | 2 +- arch/arm/src/stm32/stm32_otgfshost.c | 2 +- arch/arm/src/stm32/stm32_pminitialize.c | 2 +- arch/arm/src/stm32/stm32_rtcc.c | 2 +- arch/arm/src/stm32/stm32_rtcounter.c | 2 +- arch/arm/src/stm32/stm32_start.c | 2 +- arch/arm/src/stm32/stm32_wdg.h | 4 +- arch/arm/src/stm32/stm32_wwdg.c | 2 +- arch/arm/src/str71x/str71x_decodeirq.c | 2 +- arch/arm/src/str71x/str71x_head.S | 2 +- arch/avr/src/at32uc3/at32uc3_internal.h | 2 +- arch/avr/src/at32uc3/at32uc3_lowconsole.c | 2 +- arch/avr/src/at90usb/at90usb_internal.h | 2 +- arch/avr/src/at90usb/at90usb_lowconsole.c | 2 +- arch/avr/src/atmega/atmega_internal.h | 2 +- arch/avr/src/atmega/atmega_lowconsole.c | 2 +- arch/mips/src/pic32mx/pic32mx-lowconsole.c | 2 +- arch/mips/src/pic32mx/pic32mx-usbdev.c | 2 +- arch/rgmp/src/nuttx.c | 2 +- arch/x86/src/qemu/qemu_internal.h | 2 +- arch/z80/src/ez80/ez80_startup.asm | 2 +- configs/lm3s6432-s2e/nsh/defconfig | 2 +- configs/lm3s6432-s2e/ostest/defconfig | 2 +- configs/lm3s8962-ek/nsh/defconfig | 2 +- configs/lm3s8962-ek/nx/defconfig | 2 +- configs/lm3s8962-ek/ostest/defconfig | 2 +- configs/lpcxpresso-lpc1768/README.txt | 2 +- configs/mikroe-stm32f4/src/up_pm.c | 2 +- configs/mirtoo/README.txt | 2 +- configs/sama5d3x-ek/README.txt | 4 +- configs/sama5d3x-ek/src/sam_at24.c | 2 +- configs/sama5d3x-ek/src/sam_at25.c | 2 +- configs/sama5d3x-ek/src/sam_nandflash.c | 2 +- configs/shenzhou/src/up_ili93xx.c | 2 +- configs/sim/README.txt | 2 +- configs/stm3210e-eval/src/up_pm.c | 2 +- configs/stm32f4discovery/src/up_pm.c | 2 +- configs/twr-k60n512/README.txt | 2 +- configs/zkit-arm-1769/README.txt | 2 +- drivers/power/max1704x.c | 2 +- drivers/power/pm_initialize.c | 2 +- drivers/usbhost/usbhost_storage.c | 2 +- fs/fs_syslog.c | 2 +- include/nuttx/power/battery.h | 2 +- include/nuttx/power/pm.h | 2 +- include/nuttx/rtc.h | 4 +- libc/misc/lib_init.c | 2 +- libc/spawn/lib_psfa_destroy.c | 2 +- sched/pthread_once.c | 2 +- sched/sig_internal.h | 2 +- 77 files changed, 127 insertions(+), 205 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b54b6192f..046370d62b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -630,7 +630,7 @@ wrong by 64 bytes (Kevin Franzen). * eZ80Acclaim!: Corrected some stack handling errors during interrupt handling context save and restore (Kevin Franzen). - * eZ80Acclaim!: Corrected vector intialization logic (Kevin Franzen). + * eZ80Acclaim!: Corrected vector initializeation logic (Kevin Franzen). * eZ80Acclaim!: Corrected overflow problem in the calculation of UART baud rate divisor, the system timer divisor, and the EMAC poll timer. * eZ80Acclaim!: Fixed GPIO pin configuration get serial output @@ -4639,7 +4639,7 @@ 6.28 2013-06-14 Gregory Nutt * arch/arm/src/lpc17xx/lpc17_i2c.c: Interrupts were not being - re-enabled in the I2C intialization function (2013-4-30). + re-enabled in the I2C initializeation function (2013-4-30). * net/sendto.c: Added skeleton of implementation of send timeouts for UDP. However, this functionality really does not make sense, so it is disabled in the code (2013-4-30). @@ -6160,4 +6160,7 @@ * drivers/mtd/mtd_nand.c: Fix a typo in calculation of page number (2013-12-02). * drivers/mtd/README.txt: New README file (2013-12-04). + * arch/arm/src/lm/lm_start.c: Don't initialize .data if not running + from FLASH (2013-12-05). + diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 48e4e376e4..4f7833acdb 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -356,7 +356,7 @@

1NXMU and NXSU are interchangeable other than (1) certain start-up - and intialization APIs (as described below), and (2) timing. With NXSU, NX APIs + and initializeation APIs (as described below), and (2) timing. With NXSU, NX APIs execute immediately; with NXMU, NX APIs defer and serialize the operations and, hence, introduce different timing and potential race conditions that you would not experience with NXSU. diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 65f4820bf0..89f9ff35f4 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -2257,7 +2257,7 @@ else

  • up_rtc_time(). Get the current time in seconds. This is similar to the standard time() function. This interface is only required if the low-resolution RTC/counter hardware implementation selected. - It is only used by the RTOS during intialization to set up the system time when CONFIG_RTC is set + It is only used by the RTOS during initializeation to set up the system time when CONFIG_RTC is set but neither CONFIG_RTC_HIRES nor CONFIG_RTC_DATETIME are set.
  • up_rtc_gettime(). @@ -3511,7 +3511,7 @@ extern void up_ledoff(int led);

    1. - Each USB host class driver includes an intialization entry point that is called from the + Each USB host class driver includes an initializeation entry point that is called from the application at initialization time. This driver calls usbhost_registerclass() during this initialization in order to makes itself available in the event the device that it supports is connected.

      @@ -3599,7 +3599,7 @@ extern void up_ledoff(int led);

      1. - Each USB device class driver includes an intialization entry point that is called from the + Each USB device class driver includes an initializeation entry point that is called from the application at initialization time.

        @@ -4134,7 +4134,7 @@ void pm_initialize(void);

        Description: This function is called by MCU-specific one-time at power on reset in order to initialize the power management capabilities. -This function must be called very early in the intialization sequence before any other device drivers are initialize (since they may attempt to register with the power management subsystem). +This function must be called very early in the initializeation sequence before any other device drivers are initialize (since they may attempt to register with the power management subsystem).

        Input Parameters: None diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html index bedc07226c..621c65c939 100644 --- a/Documentation/NuttxUserGuide.html +++ b/Documentation/NuttxUserGuide.html @@ -1000,7 +1000,7 @@ int posix_spawn_file_actions_destroy(FAR posix_spawn_file_actions_t *file_action

        Description: - The posix_spawn_file_actions_destroy() function destroys the object referenced by file_actions which was previously intialized by posix_spawn_file_actions_init(), returning any resources obtained at the time of initialization to the system for subsequent reuse. + The posix_spawn_file_actions_destroy() function destroys the object referenced by file_actions which was previously initializeed by posix_spawn_file_actions_init(), returning any resources obtained at the time of initialization to the system for subsequent reuse. A posix_spawn_file_actions_t may be reinitialized after having been destroyed, but must not be reused after destruction, unless it has been reinitialized.

        diff --git a/arch/8051/src/up_initialstate.c b/arch/8051/src/up_initialstate.c index 1defe9f552..d0d568981f 100644 --- a/arch/8051/src/up_initialstate.c +++ b/arch/8051/src/up_initialstate.c @@ -106,7 +106,7 @@ void up_initial_state(FAR struct tcb_s *tcb) frame[FRAME_IE] = 0x80; /* Save the number of bytes in the frame (which will be used - * to intialize the stack pointer when the task is started). + * to initialize the stack pointer when the task is started). */ tcb->xcp.nbytes = FRAME_SIZE; diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 8a1311d591..67a034983d 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -127,7 +127,7 @@ void up_initialize(void) up_irqinitialize(); /* Initialize the power management subsystem. This MCU-specific function - * must be called *very* early in the intialization sequence *before* any + * must be called *very* early in the initialization sequence *before* any * other device drivers are initialized (since they may attempt to register * with the power management subsystem). */ diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index 9748f1fc3c..6a309ab838 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -100,7 +100,7 @@ void __start(void) *dest++ = 0; } - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c index 940d7240ec..3daa3ef331 100644 --- a/arch/arm/src/kl/kl_start.c +++ b/arch/arm/src/kl/kl_start.c @@ -137,7 +137,7 @@ void __start(void) } showprogress('B'); - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/lm/lm_start.c b/arch/arm/src/lm/lm_start.c index 5ab07684cc..7000191933 100644 --- a/arch/arm/src/lm/lm_start.c +++ b/arch/arm/src/lm/lm_start.c @@ -119,7 +119,8 @@ void __start(void) } showprogress('B'); - /* Move the intialized data section from his temporary holding spot in +#ifdef CONFIG_BOOT_RUNFROMFLASH + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. @@ -130,6 +131,7 @@ void __start(void) *dest++ = *src++; } showprogress('C'); +#endif /* Perform early serial initialization */ diff --git a/arch/arm/src/lpc17xx/lpc17_start.c b/arch/arm/src/lpc17xx/lpc17_start.c index f5af4c913b..256d035abe 100644 --- a/arch/arm/src/lpc17xx/lpc17_start.c +++ b/arch/arm/src/lpc17xx/lpc17_start.c @@ -213,7 +213,7 @@ void __start(void) showprogress('B'); - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index 5980a8d2a5..5dbe115f2b 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -2509,7 +2509,7 @@ static inline void lpc17_ep0init(struct lpc17_usbhost_s *priv) * * Input Parameters: * controller -- If the device supports more than USB host controller, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initialized. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.h b/arch/arm/src/lpc17xx/lpc17_usbhost.h index 43f7b66f30..c5056a9ee3 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.h +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.h @@ -77,7 +77,7 @@ extern "C" * * Input Parameters: * controller -- If the device supports more than USB host controller, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initializeed. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index f19dd2fa8a..e41485b4dd 100755 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -4160,7 +4160,7 @@ static int lpc31_reset(void) * * Input Parameters: * controller -- If the device supports more than one EHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initialized. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/lpc31xx/lpc31_internal.h b/arch/arm/src/lpc31xx/lpc31_internal.h index bd79adc2fa..6b784cd6de 100644 --- a/arch/arm/src/lpc31xx/lpc31_internal.h +++ b/arch/arm/src/lpc31xx/lpc31_internal.h @@ -248,7 +248,7 @@ void lpc31_usbsuspend(FAR struct usbdev_s *dev, bool resume); * * Input Parameters: * controller -- If the device supports more than one EHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initializeed. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c index 8dc9f66b93..fc96ab14a2 100644 --- a/arch/arm/src/lpc43xx/lpc43_start.c +++ b/arch/arm/src/lpc43xx/lpc43_start.c @@ -309,7 +309,7 @@ void __start(void) } showprogress('B'); - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c index 442fecb202..4d5b9c3028 100644 --- a/arch/arm/src/nuc1xx/nuc_start.c +++ b/arch/arm/src/nuc1xx/nuc_start.c @@ -131,7 +131,7 @@ void __start(void) } showprogress('B'); - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c index 6324617f3f..0e1ead7668 100644 --- a/arch/arm/src/sam34/sam_start.c +++ b/arch/arm/src/sam34/sam_start.c @@ -112,7 +112,7 @@ void __start(void) *dest++ = 0; } - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index b53e0c7987..5f608cf780 100755 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/arch/arm/src/sama5/sam_ehci.c @@ -4000,7 +4000,7 @@ static int sam_reset(void) * * Input Parameters: * controller -- If the device supports more than one EHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initialized. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c index e00affb402..b92ee62619 100644 --- a/arch/arm/src/sama5/sam_irq.c +++ b/arch/arm/src/sama5/sam_irq.c @@ -213,7 +213,7 @@ void up_irqinitialize(void) int i; /* The following operations need to be atomic, but since this function is - * called early in the intialization sequence, we expect to have exclusive + * called early in the initialization sequence, we expect to have exclusive * access to the AIC. */ diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c index b2bf7f391b..e41a7b8c61 100644 --- a/arch/arm/src/sama5/sam_nand.c +++ b/arch/arm/src/sama5/sam_nand.c @@ -221,11 +221,8 @@ static int nand_dma_write(struct sam_nandcs_s *priv, static int nand_nfcsram_read(uintptr_t src, uint8_t *dest, size_t buflen); -static int nand_smc_read8(uintptr_t src, uint8_t *dest, size_t buflen); -static int nand_smc_read16(uintptr_t src, uint8_t *dest, - size_t buflen); -static int nand_read(struct sam_nandcs_s *priv, bool nfcsram, - uint8_t *buffer, size_t buflen); +static int nand_read(struct sam_nandcs_s *priv, uint8_t *buffer, + uint16_t buflen, uint16_t offset); #ifdef CONFIG_SAMA5_HAVE_PMECC static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block, @@ -1480,83 +1477,26 @@ static int nand_nfcsram_read(uintptr_t src, uint8_t *dest, size_t buflen) return OK; } -/**************************************************************************** - * Name: nand_smc_read8 - * - * Description: - * Read 8-bit data from NAND using the NAND data address (without DMA) - * - * Input Parameters: - * src - NAND data source address - * dest - Buffer that will receive the data from the read - * buflen - The number of bytes to transfer - * - * Returned Value - * OK always - * - ****************************************************************************/ - -static int nand_smc_read8(uintptr_t src, uint8_t *dest, size_t buflen) -{ - volatile uint8_t *src8 = (volatile uint8_t *)src; - - for (; buflen > 0; buflen--) - { - *dest++ = *src8; - } - - return OK; -} - -/**************************************************************************** - * Name: nand_smc_read16 - * - * Description: - * Read 16-bit data from NAND using the NAND data address (without DMA) - * - * Input Parameters: - * src - NAND data source address - * dest - Buffer that will receive the data from the read - * buflen - The number of bytes to transfer - * - * Returned Value - * OK always - * - ****************************************************************************/ - -static int nand_smc_read16(uintptr_t src, uint8_t *dest, size_t buflen) -{ - volatile uint16_t *src16 = (volatile uint16_t *)src; - uint16_t *dest16 = (uint16_t *)dest; - - DEBUGASSERT(((uintptr_t)dest & 1) == 0); - - for (; buflen > 1; buflen -= sizeof(uint16_t)) - { - *dest16++ = *src16; - } - - return OK; -} - /**************************************************************************** * Name: nand_read * * Description: - * Read data from NAND using the appropriate method + * Read data from NAND using the NFC SRAM * * Input Parameters: * priv - Lower-half, private NAND FLASH device state - * nfcsram - True: Use NFC Host SRAM * buffer - Buffer that provides the data for the write + * buflen - The amount of data to read into the buffer + * offset - If reading from NFC SRAM, this is the offset into + * the SRAM. * * Returned Value * OK on success; a negated errno value on failure. * ****************************************************************************/ -static int nand_read(struct sam_nandcs_s *priv, bool nfcsram, - uint8_t *buffer, size_t buflen) +static int nand_read(struct sam_nandcs_s *priv, uint8_t *buffer, + uint16_t buflen, uint16_t offset) { uintptr_t src; #ifdef CONFIG_SAMA5_NAND_DMA @@ -1565,48 +1505,32 @@ static int nand_read(struct sam_nandcs_s *priv, bool nfcsram, int buswidth; int ret; - fvdbg("nfcsram=%d buffer=%p buflen=%d\n", nfcsram, buffer, (int)buflen); + fvdbg("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset); + + /* Get the data source: NFC SRAM (perhaps with an offset) + * NOTE: We could use the address priv->raw.dataaddr if we want to + * bypass NFC SRAM. + */ + + src = NFCSRAM_BASE + offset; /* Get the buswidth */ buswidth = nandmodel_getbuswidth(&priv->raw.model); - /* Pick the data source: The NFC SRAM or the NAND data address */ - - if (nfcsram) - { - /* Source is NFC SRAM */ - - src = NFCSRAM_BASE; - -#ifdef CONFIG_SAMA5_NAND_DMA - /* Select NFC SRAM DMA */ - - dmaflags = (buswidth == 16 ? NFCSRAM_DMA_FLAGS16 : NFCSRAM_DMA_FLAGS8); -#endif - } - else - { - /* Source is NFC NAND */ - - src = priv->raw.dataaddr; - -#ifdef CONFIG_SAMA5_NAND_DMA - /* Select NAND DMA */ - - dmaflags = (buswidth == 16 ? NAND_DMA_FLAGS16 : NAND_DMA_FLAGS8); -#endif - } - #ifdef CONFIG_SAMA5_NAND_DMA /* Then perform the transfer via memory-to-memory DMA or not, depending * on if we have a DMA channel assigned and if the transfer is - * sufficiently large. Small DMAs (e.g., for spare data) are not peformed + * sufficiently large. Small DMAs (e.g., for spare data) are not performed * because the DMA context switch can take more time that the DMA itself. */ if (priv->dma && buflen > CONFIG_SAMA5_NAND_DMA_THRESHOLD) { + /* Select NFC SRAM DMA */ + + dmaflags = (buswidth == 16 ? NFCSRAM_DMA_FLAGS16 : NFCSRAM_DMA_FLAGS8); + /* Transfer using DMA */ ret = nand_dma_read(priv, src, (uintptr_t)buffer, buflen, dmaflags); @@ -1616,23 +1540,9 @@ static int nand_read(struct sam_nandcs_s *priv, bool nfcsram, /* Transfer without DMA */ - if (nfcsram) { ret = nand_nfcsram_read(src, buffer, buflen); } - else - { - /* Check the data bus width of the NAND FLASH */ - - if (buswidth == 16) - { - ret = nand_smc_read16(src, buffer, buflen); - } - else - { - ret = nand_smc_read8(src, buffer, buflen); - } - } nand_dump("NAND Read", buffer, buflen); return ret; @@ -1724,9 +1634,11 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block, regval |= HSMC_PMECCFG_AUTO_ENABLE; } - regval |= HSMC_PMECCTRL_DATA; nand_putreg(SAM_HSMC_PMECCFG, regval); + /* Start the data phase and perform the transfer */ + + nand_putreg(SAM_HSMC_PMECCTRL, HSMC_PMECCTRL_DATA); nand_nfc_cleale(priv, HSMC_ALE_COL_EN | HSMC_ALE_ROW_EN | HSMC_CLE_VCMD2_EN | HSMC_CLE_DATA_EN, COMMAND_READ_1, COMMAND_READ_2, 0, rowaddr); @@ -1739,18 +1651,20 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block, nand_putreg(SAM_HSMC_PMECCTRL, HSMC_PMECCTRL_DATA); - /* Read the data area */ + /* Read the data area into the caller provided buffer (pagesize bytes) */ - ret = nand_read(priv, true, (uint8_t *)data, pagesize); + ret = nand_read(priv, (uint8_t *)data, pagesize, 0); if (ret < 0) { fdbg("ERROR: nand_read for data region failed: %d\n", ret); return ret; } - /* Read the spare area into priv->raw.spare */ + /* Read the spare area into priv->raw.spare. The data to be read lies at + * offset pagesize in NFC SRAM. + */ - ret = nand_read(priv, true, priv->raw.spare, priv->raw.model.sparesize); + ret = nand_read(priv, priv->raw.spare, priv->raw.model.sparesize, pagesize); if (ret < 0) { fdbg("ERROR: nand_read for spare region failed: %d\n", ret); @@ -2044,7 +1958,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block, if (data) { - ret = nand_read(priv, true, (uint8_t *)data, pagesize); + ret = nand_read(priv, (uint8_t *)data, pagesize, 0); if (ret < 0) { fdbg("ERROR: nand_read for data region failed: %d\n", ret); @@ -2052,11 +1966,14 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block, } } - /* Read the spare area if so requested */ + /* Read the spare area if so requested. Read NFS SRAM from offset 0 in any + * case because the coladdr was appropiately set above for the case where + * there is no data. + */ if (spare) { - ret = nand_read(priv, true, (uint8_t *)spare, sparesize); + ret = nand_read(priv, (uint8_t *)spare, sparesize, 0); if (ret < 0) { fdbg("ERROR: nand_read for spare region failed: %d\n", ret); @@ -3018,7 +2935,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs) } /* Initialize the NAND hardware for this CS */ - /* Perform board-specific SMC intialization for this CS. This should include: + /* Perform board-specific SMC initialization for this CS. This should include: * * 1. Enabling of clocking to the HSMC * 2. Configuration of timing for the HSMC NAND CS diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index b72774da03..84f9ac601d 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -3089,7 +3089,7 @@ static void sam_disconnect(FAR struct usbhost_driver_s *drvr) * * Input Parameters: * controller -- If the device supports more than one OHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initialized. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/sama5/sam_pmecc.c b/arch/arm/src/sama5/sam_pmecc.c index 627cb6cce0..80612863a9 100644 --- a/arch/arm/src/sama5/sam_pmecc.c +++ b/arch/arm/src/sama5/sam_pmecc.c @@ -924,9 +924,9 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize) correctability512 = nsectors512 * g_correctability[bcherr512]; correctability1K = nsectors1k * g_correctability[bcherr1k]; - /* Use 1K sectors unless we can do better with 512B sectors */ + /* Use 512B sectors unless we can do better with 1K sectors */ - if (correctability512 > correctability1K) + if (correctability512 >= correctability1K) { g_pmecc.sector1k = false; g_pmecc.nsectors = nsectors512; diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c index 990b80f8c6..e9221898d2 100644 --- a/arch/arm/src/sama5/sam_rtc.c +++ b/arch/arm/src/sama5/sam_rtc.c @@ -380,7 +380,7 @@ int up_rtcinitialize(void) * Get the current date and time from the date/time RTC. This interface * is only supported by the date/time RTC hardware implementation. * It is used to replace the system timer. It is only used by the RTOS during - * intialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME + * initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME * are selected (and CONFIG_RTC_HIRES is not). * * NOTE: Some date/time RTC hardware is capability of sub-second accuracy. That diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index f578a8dee8..f4fa4d3a44 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -879,7 +879,7 @@ static void ssc_buf_free(struct sam_ssc_s *priv, struct sam_buffer_s *bfcontaine * None * * Assumptions: - * Called early in SSC intialization so that there are no issues with + * Called early in SSC initialization so that there are no issues with * concurrency. * ****************************************************************************/ diff --git a/arch/arm/src/sama5/sam_usbhost.h b/arch/arm/src/sama5/sam_usbhost.h index 79e4c6c850..3f6d6424c2 100644 --- a/arch/arm/src/sama5/sam_usbhost.h +++ b/arch/arm/src/sama5/sam_usbhost.h @@ -230,7 +230,7 @@ extern "C" * * Input Parameters: * controller -- If the device supports more than one USB OHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initializeed. Normally, this * is just zero. * * Returned Value: @@ -274,7 +274,7 @@ int sam_ohci_tophalf(int irq, FAR void *context); * * Input Parameters: * controller -- If the device supports more than one EHCI interface, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initializeed. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c index e8e61b11da..8d8d10dcd8 100644 --- a/arch/arm/src/sama5/sam_wdt.c +++ b/arch/arm/src/sama5/sam_wdt.c @@ -649,7 +649,7 @@ static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, * Name: up_wdginitialize * * Description: - * Initialize the WDT watchdog time. The watchdog timer is intialized and + * Initialize the WDT watchdog time. The watchdog timer is initialized and * registered as 'devpath. The initial state of the watchdog time is * disabled. * diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c index 6b4bc5b650..e81f939498 100644 --- a/arch/arm/src/stm32/stm32_iwdg.c +++ b/arch/arm/src/stm32/stm32_iwdg.c @@ -641,7 +641,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, * Name: stm32_iwdginitialize * * Description: - * Initialize the IWDG watchdog time. The watchdog timer is intialized and + * Initialize the IWDG watchdog time. The watchdog timer is initialized and * registers as 'devpath. The initial state of the watchdog time is * disabled. * diff --git a/arch/arm/src/stm32/stm32_otgfs.h b/arch/arm/src/stm32/stm32_otgfs.h index d7452bc47d..658fe67a13 100644 --- a/arch/arm/src/stm32/stm32_otgfs.h +++ b/arch/arm/src/stm32/stm32_otgfs.h @@ -81,7 +81,7 @@ extern "C" * * Input Parameters: * controller -- If the device supports more than USB host controller, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initializeed. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c index 68cfe7fca1..7392db2c7b 100644 --- a/arch/arm/src/stm32/stm32_otgfshost.c +++ b/arch/arm/src/stm32/stm32_otgfshost.c @@ -4255,7 +4255,7 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv) * * Input Parameters: * controller -- If the device supports more than USB host controller, then - * this identifies which controller is being intialized. Normally, this + * this identifies which controller is being initialized. Normally, this * is just zero. * * Returned Value: diff --git a/arch/arm/src/stm32/stm32_pminitialize.c b/arch/arm/src/stm32/stm32_pminitialize.c index a1f44a7f41..e9b6d4780c 100644 --- a/arch/arm/src/stm32/stm32_pminitialize.c +++ b/arch/arm/src/stm32/stm32_pminitialize.c @@ -72,7 +72,7 @@ * Description: * This function is called by MCU-specific logic at power-on reset in * order to provide one-time initialization the power management subystem. - * This function must be called *very* early in the intialization sequence + * This function must be called *very* early in the initialization sequence * *before* any other device drivers are initialized (since they may * attempt to register with the power management subsystem). * diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c index e9e71a007c..63af2f3745 100644 --- a/arch/arm/src/stm32/stm32_rtcc.c +++ b/arch/arm/src/stm32/stm32_rtcc.c @@ -644,7 +644,7 @@ int up_rtcinitialize(void) * Get the current date and time from the date/time RTC. This interface * is only supported by the date/time RTC hardware implementation. * It is used to replace the system timer. It is only used by the RTOS during - * intialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME + * initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME * are selected (and CONFIG_RTC_HIRES is not). * * NOTE: Some date/time RTC hardware is capability of sub-second accuracy. That diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c index 251398c80a..0238582e40 100644 --- a/arch/arm/src/stm32/stm32_rtcounter.c +++ b/arch/arm/src/stm32/stm32_rtcounter.c @@ -413,7 +413,7 @@ int up_rtcinitialize(void) * Get the current time in seconds. This is similar to the standard time() * function. This interface is only required if the low-resolution RTC/counter * hardware implementation selected. It is only used by the RTOS during - * intialization to set up the system time when CONFIG_RTC is set but neither + * initialization to set up the system time when CONFIG_RTC is set but neither * CONFIG_RTC_HIRES nor CONFIG_RTC_DATETIME are set. * * Input Parameters: diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c index 95c1b0145b..689fcc2153 100644 --- a/arch/arm/src/stm32/stm32_start.c +++ b/arch/arm/src/stm32/stm32_start.c @@ -254,7 +254,7 @@ void __start(void) showprogress('B'); - /* Move the intialized data section from his temporary holding spot in + /* Move the initialized data section from his temporary holding spot in * FLASH into the correct place in SRAM. The correct place in SRAM is * give by _sdata and _edata. The temporary location is in FLASH at the * end of all of the other read-only data (.text, .rodata) at _eronly. diff --git a/arch/arm/src/stm32/stm32_wdg.h b/arch/arm/src/stm32/stm32_wdg.h index fbb8128b55..e90a669c13 100644 --- a/arch/arm/src/stm32/stm32_wdg.h +++ b/arch/arm/src/stm32/stm32_wdg.h @@ -69,7 +69,7 @@ extern "C" { * Name: stm32_iwdginitialize * * Description: - * Initialize the IWDG watchdog time. The watchdog timer is intialized and + * Initialize the IWDG watchdog time. The watchdog timer is initializeed and * registers as 'devpath. The initial state of the watchdog time is * disabled. * @@ -91,7 +91,7 @@ EXTERN void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq); * Name: stm32_wwdginitialize * * Description: - * Initialize the WWDG watchdog time. The watchdog timer is intialized and + * Initialize the WWDG watchdog time. The watchdog timer is initializeed and * registers as 'devpath. The initial state of the watchdog time is * disabled. * diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c index ed3721cfed..dc6967215a 100644 --- a/arch/arm/src/stm32/stm32_wwdg.c +++ b/arch/arm/src/stm32/stm32_wwdg.c @@ -742,7 +742,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, * Name: stm32_wwdginitialize * * Description: - * Initialize the WWDG watchdog time. The watchdog timer is intialized and + * Initialize the WWDG watchdog time. The watchdog timer is initialized and * registers as 'devpath. The initial state of the watchdog time is * disabled. * diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c index da7b5a48ee..e3d11454c6 100644 --- a/arch/arm/src/str71x/str71x_decodeirq.c +++ b/arch/arm/src/str71x/str71x_decodeirq.c @@ -80,7 +80,7 @@ * up_decodeirq() * * Description: - * Read the IRQ number from the IVR register. During intialization, the IVR + * Read the IRQ number from the IVR register. During initialization, the IVR * register was set to zero. Each SIR[n] register was programmed to contain * the IRQ number. At IRQ processing time (when this function run), the IVR * should contain the desired IRQ number. diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S index 710fd57a58..62951c98aa 100644 --- a/arch/arm/src/str71x/str71x_head.S +++ b/arch/arm/src/str71x/str71x_head.S @@ -336,7 +336,7 @@ eicloop: add \irqno, \irqno, #1 /* Continue to loop until all of the SIR registers have been - * intialized. + * initializeed. */ cmp \irqno, #STR71X_EIC_NCHANNELS diff --git a/arch/avr/src/at32uc3/at32uc3_internal.h b/arch/avr/src/at32uc3/at32uc3_internal.h index 57d52a2885..1601bd0631 100644 --- a/arch/avr/src/at32uc3/at32uc3_internal.h +++ b/arch/avr/src/at32uc3/at32uc3_internal.h @@ -210,7 +210,7 @@ void usart_configure(uintptr_t usart_base, uint32_t baud, unsigned int parity, * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console + * early in the initializeation sequence to configure the serial console * uart (only). * ****************************************************************************/ diff --git a/arch/avr/src/at32uc3/at32uc3_lowconsole.c b/arch/avr/src/at32uc3/at32uc3_lowconsole.c index 2fb04a1ca1..509d389afa 100644 --- a/arch/avr/src/at32uc3/at32uc3_lowconsole.c +++ b/arch/avr/src/at32uc3/at32uc3_lowconsole.c @@ -295,7 +295,7 @@ void usart_configure(uintptr_t usart_base, uint32_t baud, unsigned int parity, * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console uart + * early in the initialization sequence to configure the serial console uart * (only). * ******************************************************************************/ diff --git a/arch/avr/src/at90usb/at90usb_internal.h b/arch/avr/src/at90usb/at90usb_internal.h index 329f3ce4a6..8e4dfc0e6a 100644 --- a/arch/avr/src/at90usb/at90usb_internal.h +++ b/arch/avr/src/at90usb/at90usb_internal.h @@ -115,7 +115,7 @@ EXTERN void usart1_configure(void); * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console + * early in the initializeation sequence to configure the serial console * uart (only). * ****************************************************************************/ diff --git a/arch/avr/src/at90usb/at90usb_lowconsole.c b/arch/avr/src/at90usb/at90usb_lowconsole.c index d29f9a8325..64fd50fe10 100644 --- a/arch/avr/src/at90usb/at90usb_lowconsole.c +++ b/arch/avr/src/at90usb/at90usb_lowconsole.c @@ -254,7 +254,7 @@ void usart1_configure(void) * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console uart + * early in the initialization sequence to configure the serial console uart * (only). * ******************************************************************************/ diff --git a/arch/avr/src/atmega/atmega_internal.h b/arch/avr/src/atmega/atmega_internal.h index 4a51661a7a..007b424255 100644 --- a/arch/avr/src/atmega/atmega_internal.h +++ b/arch/avr/src/atmega/atmega_internal.h @@ -117,7 +117,7 @@ EXTERN void usart1_configure(void); * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console + * early in the initializeation sequence to configure the serial console * uart (only). * ****************************************************************************/ diff --git a/arch/avr/src/atmega/atmega_lowconsole.c b/arch/avr/src/atmega/atmega_lowconsole.c index 9a03c56a47..ccf56dc332 100644 --- a/arch/avr/src/atmega/atmega_lowconsole.c +++ b/arch/avr/src/atmega/atmega_lowconsole.c @@ -413,7 +413,7 @@ void usart1_configure(void) * * Description: * Initialize a console for debug output. This function is called very - * early in the intialization sequence to configure the serial console uart + * early in the initialization sequence to configure the serial console uart * (only). * ******************************************************************************/ diff --git a/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/arch/mips/src/pic32mx/pic32mx-lowconsole.c index ba1a012856..f7598988a6 100644 --- a/arch/mips/src/pic32mx/pic32mx-lowconsole.c +++ b/arch/mips/src/pic32mx/pic32mx-lowconsole.c @@ -321,7 +321,7 @@ void pic32mx_uartconfigure(uintptr_t uart_base, uint32_t baudrate, * * Description: * Initialize a low-level console for debug output. This function is called - * very early in the intialization sequence to configure the serial console + * very early in the initialization sequence to configure the serial console * UART (only). * ******************************************************************************/ diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c index ed90edac3a..748ab01a7c 100644 --- a/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -4283,7 +4283,7 @@ void up_usbinitialize(void) pic32mx_stateinit(priv); - /* Then perform a few one-time intialization operstions. First, initialize + /* Then perform a few one-time initialization operstions. First, initialize * the watchdog timer that is used to perform a delayed queue restart * after recovering from a stall. */ diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c index e963176210..a154ea34a9 100644 --- a/arch/rgmp/src/nuttx.c +++ b/arch/rgmp/src/nuttx.c @@ -84,7 +84,7 @@ void up_initialize(void) extern void vdev_init(void); extern void nuttx_arch_init(void); - // intialize the current_task to g_idletcb + // initialize the current_task to g_idletcb current_task = g_pidhash[PIDHASH(0)].tcb; // OS memory alloc system is ready diff --git a/arch/x86/src/qemu/qemu_internal.h b/arch/x86/src/qemu/qemu_internal.h index e324f9be83..a1a289f128 100644 --- a/arch/x86/src/qemu/qemu_internal.h +++ b/arch/x86/src/qemu/qemu_internal.h @@ -386,7 +386,7 @@ EXTERN void i486_dmadump(DMA_HANDLE handle, const struct i486_dmaregs_s *regs, * Description: * These are the various ISR/IRQ vector address exported from * qemu_vectors.S. These addresses need to have global scope so that they - * can be known to the interrupt intialization logic in qemu_irq.c. + * can be known to the interrupt initializeation logic in qemu_irq.c. * ****************************************************************************/ diff --git a/arch/z80/src/ez80/ez80_startup.asm b/arch/z80/src/ez80/ez80_startup.asm index d52795d637..af17398132 100644 --- a/arch/z80/src/ez80/ez80_startup.asm +++ b/arch/z80/src/ez80/ez80_startup.asm @@ -139,7 +139,7 @@ _ez80_datadone: ldir ; Copy the code section _ez80_codedone: - ; Perform board-specific intialization + ; Perform board-specific initializeation call _ez80_lowinit diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig index 31616a2cd8..d2ba2451b7 100644 --- a/configs/lm3s6432-s2e/nsh/defconfig +++ b/configs/lm3s6432-s2e/nsh/defconfig @@ -340,7 +340,7 @@ CONFIG_NSH_MMCSDMINOR=0 # # Stack and heap information # -CONFIG_BOOT_RUNFROMFLASH=n +CONFIG_BOOT_RUNFROMFLASH=y CONFIG_BOOT_COPYTORAM=n CONFIG_CUSTOM_STACK=n CONFIG_IDLETHREAD_STACKSIZE=1024 diff --git a/configs/lm3s6432-s2e/ostest/defconfig b/configs/lm3s6432-s2e/ostest/defconfig index 7921f6c45c..1fdec01a8a 100644 --- a/configs/lm3s6432-s2e/ostest/defconfig +++ b/configs/lm3s6432-s2e/ostest/defconfig @@ -337,7 +337,7 @@ CONFIG_NSH_MMCSDMINOR=0 # # Stack and heap information # -CONFIG_BOOT_RUNFROMFLASH=n +CONFIG_BOOT_RUNFROMFLASH=y CONFIG_BOOT_COPYTORAM=n CONFIG_CUSTOM_STACK=n CONFIG_IDLETHREAD_STACKSIZE=1024 diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig index 831fc138f9..8385722043 100755 --- a/configs/lm3s8962-ek/nsh/defconfig +++ b/configs/lm3s8962-ek/nsh/defconfig @@ -339,7 +339,7 @@ CONFIG_NSH_MMCSDMINOR=0 # # Stack and heap information # -CONFIG_BOOT_RUNFROMFLASH=n +CONFIG_BOOT_RUNFROMFLASH=y CONFIG_BOOT_COPYTORAM=n CONFIG_CUSTOM_STACK=n CONFIG_IDLETHREAD_STACKSIZE=1024 diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index 2cd6096e31..9410ba09e8 100755 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -406,7 +406,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y # # Stack and heap information # -CONFIG_BOOT_RUNFROMFLASH=n +CONFIG_BOOT_RUNFROMFLASH=y CONFIG_BOOT_COPYTORAM=n CONFIG_CUSTOM_STACK=n CONFIG_IDLETHREAD_STACKSIZE=1024 diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig index 6b72548dd6..f81ad23a74 100755 --- a/configs/lm3s8962-ek/ostest/defconfig +++ b/configs/lm3s8962-ek/ostest/defconfig @@ -336,7 +336,7 @@ CONFIG_NSH_MMCSDMINOR=0 # # Stack and heap information # -CONFIG_BOOT_RUNFROMFLASH=n +CONFIG_BOOT_RUNFROMFLASH=y CONFIG_BOOT_COPYTORAM=n CONFIG_CUSTOM_STACK=n CONFIG_IDLETHREAD_STACKSIZE=1024 diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt index 0dbabcc1cb..dd7a6d4959 100644 --- a/configs/lpcxpresso-lpc1768/README.txt +++ b/configs/lpcxpresso-lpc1768/README.txt @@ -516,7 +516,7 @@ LEDs - The LED is not illuminated until the LPCXpresso completes initialization. If the LED is stuck in the OFF state, this means that the LPCXpresso did not - complete intialization. + complete initializeation. - Each time the OS enters an interrupt (or a signal) it will turn the LED OFF and restores its previous stated upon return from the interrupt (or signal). diff --git a/configs/mikroe-stm32f4/src/up_pm.c b/configs/mikroe-stm32f4/src/up_pm.c index dc3985f6d3..ff9d5bd8f4 100644 --- a/configs/mikroe-stm32f4/src/up_pm.c +++ b/configs/mikroe-stm32f4/src/up_pm.c @@ -75,7 +75,7 @@ * Description: * This function is called by MCU-specific logic at power-on reset in * order to provide one-time initialization the power management subystem. - * This function must be called *very* early in the intialization sequence + * This function must be called *very* early in the initializeation sequence * *before* any other device drivers are initialized (since they may * attempt to register with the power management subsystem). * diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt index d7589764a1..e28246de2b 100644 --- a/configs/mirtoo/README.txt +++ b/configs/mirtoo/README.txt @@ -585,7 +585,7 @@ Analog Input When CONFIG_PIC32MX_ADC=y is defined, the Mirtoo boot up logic will automatically configure pin 18 (AN0) as an analog input (see configs/mirtoo/src/up_adc.c). - To intialize and use the PGA117, you to add logic something like the + To initializee and use the PGA117, you to add logic something like the following in your application code: #include diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index 7904a6c915..6a3743bab2 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -2629,7 +2629,7 @@ Configurations in the nsh configuration: 4. SDRAM is supported. .data and .bss is still retained in ISRAM, but - SDRAM is intialized and the SDRAM memory is included in the heap. + SDRAM is initializeed and the SDRAM memory is included in the heap. Relevant configuration settings are provided in the paragraph entitled "SDRAM Support" above. @@ -2762,7 +2762,7 @@ Configurations However, no built-in applications are selected in the base configuration. 5. This configuration has support for the FAT file system built in. However, - by default, there are no block drivers intialized. The FAT file system can + by default, there are no block drivers initializeed. The FAT file system can still be used to create RAM disks. 6. SDRAM support can be enabled by modifying your NuttX configuration as diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c index 7efe93f6a0..fe1722f07b 100644 --- a/configs/sama5d3x-ek/src/sam_at24.c +++ b/configs/sama5d3x-ek/src/sam_at24.c @@ -152,7 +152,7 @@ int sam_at24_automount(int minor) return ret; } #endif - /* Now we are intialized */ + /* Now we are initializeed */ initialized = true; } diff --git a/configs/sama5d3x-ek/src/sam_at25.c b/configs/sama5d3x-ek/src/sam_at25.c index 2be9a3bb1b..52ee4e14bc 100644 --- a/configs/sama5d3x-ek/src/sam_at25.c +++ b/configs/sama5d3x-ek/src/sam_at25.c @@ -129,7 +129,7 @@ int sam_at25_automount(int minor) return ret; } #endif - /* Now we are intialized */ + /* Now we are initializeed */ initialized = true; } diff --git a/configs/sama5d3x-ek/src/sam_nandflash.c b/configs/sama5d3x-ek/src/sam_nandflash.c index e8276dc2ab..a597f0d558 100644 --- a/configs/sama5d3x-ek/src/sam_nandflash.c +++ b/configs/sama5d3x-ek/src/sam_nandflash.c @@ -219,7 +219,7 @@ int sam_nand_automount(int minor) return ret; } #endif - /* Now we are intialized */ + /* Now we are initializeed */ initialized = true; } diff --git a/configs/shenzhou/src/up_ili93xx.c b/configs/shenzhou/src/up_ili93xx.c index 3a37b4f401..be56a6d666 100644 --- a/configs/shenzhou/src/up_ili93xx.c +++ b/configs/shenzhou/src/up_ili93xx.c @@ -1784,7 +1784,7 @@ static inline int stm32_lcdinitialize(FAR struct stm32_dev_s *priv) stm32_lcdoutput(priv); up_mdelay(10); - /* Intialize the LCD hardware */ + /* Initialize the LCD hardware */ #ifndef CONFIG_STM32_ILI9300_DISABLE if (id == ILI9300_ID) diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 1d49a3b151..00ad2dcdf2 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -452,7 +452,7 @@ nx11 2. You must first up_fbinitialize() before calling up_simtouchscreen() or you will get a crash. - 3. Call sim_tcuninintialize() when you are finished with the + 3. Call sim_tcunininitializee() when you are finished with the simulated touchscreen. 4. Enable CONFIG_DEBUG_INPUT=y for touchscreen debug output. diff --git a/configs/stm3210e-eval/src/up_pm.c b/configs/stm3210e-eval/src/up_pm.c index 3aa60bf5a9..29c5f12ff6 100644 --- a/configs/stm3210e-eval/src/up_pm.c +++ b/configs/stm3210e-eval/src/up_pm.c @@ -75,7 +75,7 @@ * Description: * This function is called by MCU-specific logic at power-on reset in * order to provide one-time initialization the power management subystem. - * This function must be called *very* early in the intialization sequence + * This function must be called *very* early in the initializeation sequence * *before* any other device drivers are initialized (since they may * attempt to register with the power management subsystem). * diff --git a/configs/stm32f4discovery/src/up_pm.c b/configs/stm32f4discovery/src/up_pm.c index 3ee0675cbe..c7bf35f29e 100644 --- a/configs/stm32f4discovery/src/up_pm.c +++ b/configs/stm32f4discovery/src/up_pm.c @@ -75,7 +75,7 @@ * Description: * This function is called by MCU-specific logic at power-on reset in * order to provide one-time initialization the power management subystem. - * This function must be called *very* early in the intialization sequence + * This function must be called *very* early in the initializeation sequence * *before* any other device drivers are initialized (since they may * attempt to register with the power management subsystem). * diff --git a/configs/twr-k60n512/README.txt b/configs/twr-k60n512/README.txt index 23c558fa86..1072dc4fce 100644 --- a/configs/twr-k60n512/README.txt +++ b/configs/twr-k60n512/README.txt @@ -725,4 +725,4 @@ Where is one of the following: CONFIG_SCHED_WORKQUEUE=y : Enable the NuttX workqueue - CONFIG_NSH_ARCHINIT=y : Provide NSH intialization logic + CONFIG_NSH_ARCHINIT=y : Provide NSH initializeation logic diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt index 37e1e5f646..a50e6d3af4 100644 --- a/configs/zkit-arm-1769/README.txt +++ b/configs/zkit-arm-1769/README.txt @@ -316,7 +316,7 @@ LEDs - The LED is not illuminated until the ZKit-ARM completes initialization. If the LED is stuck in the OFF state, this means that the ZKit-ARM did not - complete intialization. + complete initializeation. - Each time the OS enters an interrupt (or a signal) it will turn the LED OFF and restores its previous stated upon return from the interrupt (or signal). diff --git a/drivers/power/max1704x.c b/drivers/power/max1704x.c index ec50515e6e..8c48c6b5a1 100644 --- a/drivers/power/max1704x.c +++ b/drivers/power/max1704x.c @@ -516,7 +516,7 @@ static int max1704x_capacity(struct battery_dev_s *dev, b16_t *value) * frequency - The I2C frequency * * Returned Value: - * A pointer to the intialized lower-half driver instance. A NULL pointer + * A pointer to the initializeed lower-half driver instance. A NULL pointer * is returned on a failure to initialize the MAX1704x lower half. * ****************************************************************************/ diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c index 9401fba9e8..b4f7458779 100644 --- a/drivers/power/pm_initialize.c +++ b/drivers/power/pm_initialize.c @@ -85,7 +85,7 @@ struct pm_global_s g_pmglobals; * Description: * This function is called by MCU-specific one-time at power on reset in * order to initialize the power management capabilities. This function - * must be called *very* early in the intialization sequence *before* any + * must be called *very* early in the initializeation sequence *before* any * other device drivers are initialize (since they may attempt to register * with the power management subsystem). * diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c index e0d6622860..7c57371ee7 100644 --- a/drivers/usbhost/usbhost_storage.c +++ b/drivers/usbhost/usbhost_storage.c @@ -1605,7 +1605,7 @@ static FAR struct usbmsc_cbw_s *usbhost_cbwalloc(FAR struct usbhost_state_s *pri DEBUGASSERT(priv->tbuffer && priv->tbuflen >= sizeof(struct usbmsc_cbw_s)) - /* Intialize the CBW sructure */ + /* Initialize the CBW sructure */ cbw = (FAR struct usbmsc_cbw_s *)priv->tbuffer; memset(cbw, 0, sizeof(struct usbmsc_cbw_s)); diff --git a/fs/fs_syslog.c b/fs/fs_syslog.c index d9ad29e0fb..0e1a80ec87 100644 --- a/fs/fs_syslog.c +++ b/fs/fs_syslog.c @@ -445,7 +445,7 @@ int syslog_putc(int ch) { /* Try again to initialize the device. We may do this repeatedly * because the log device might be something that was not ready - * the first time that syslog_intialize() was called (such as a + * the first time that syslog_initializee() was called (such as a * USB serial device that has not yet been connected or a file in * an NFS mounted file system that has not yet been mounted). */ diff --git a/include/nuttx/power/battery.h b/include/nuttx/power/battery.h index 5c341789fc..43b5cb903e 100644 --- a/include/nuttx/power/battery.h +++ b/include/nuttx/power/battery.h @@ -195,7 +195,7 @@ EXTERN int battery_register(FAR const char *devpath, * frequency - The I2C frequency * * Returned Value: - * A pointer to the intialized battery driver instance. A NULL pointer + * A pointer to the initializeed battery driver instance. A NULL pointer * is returned on a failure to initialize the MAX1704x lower half. * ****************************************************************************/ diff --git a/include/nuttx/power/pm.h b/include/nuttx/power/pm.h index 9c0568b2dd..22f46cecc4 100644 --- a/include/nuttx/power/pm.h +++ b/include/nuttx/power/pm.h @@ -337,7 +337,7 @@ extern "C" { * Description: * This function is called by MCU-specific logic at power-on reset in * order to provide one-time initialization the power management subystem. - * This function must be called *very* early in the intialization sequence + * This function must be called *very* early in the initializeation sequence * *before* any other device drivers are initialized (since they may * attempt to register with the power management subsystem). * diff --git a/include/nuttx/rtc.h b/include/nuttx/rtc.h index 85dea1b4db..28ae845134 100644 --- a/include/nuttx/rtc.h +++ b/include/nuttx/rtc.h @@ -159,7 +159,7 @@ EXTERN int up_rtcinitialize(void); * Get the current time in seconds. This is similar to the standard time() * function. This interface is only required if the low-resolution RTC/counter * hardware implementation selected. It is only used by the RTOS during - * intialization to set up the system time when CONFIG_RTC is set but neither + * initializeation to set up the system time when CONFIG_RTC is set but neither * CONFIG_RTC_HIRES nor CONFIG_RTC_DATETIME are set. * * Input Parameters: @@ -201,7 +201,7 @@ EXTERN int up_rtc_gettime(FAR struct timespec *tp); * Get the current date and time from the date/time RTC. This interface * is only supported by the date/time RTC hardware implementation. * It is used to replace the system timer. It is only used by the RTOS during - * intialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME + * initializeation to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME * are selected (and CONFIG_RTC_HIRES is not). * * NOTE: Some date/time RTC hardware is capability of sub-second accuracy. That diff --git a/libc/misc/lib_init.c b/libc/misc/lib_init.c index b120b5084c..08c954c79f 100644 --- a/libc/misc/lib_init.c +++ b/libc/misc/lib_init.c @@ -83,7 +83,7 @@ void weak_const_function lib_initialize(void) #if CONFIG_NFILE_STREAMS > 0 /* The following function is called when a new task is allocated. It - * intializes the streamlist instance that is stored in the task group. + * initializees the streamlist instance that is stored in the task group. */ void lib_streaminit(FAR struct streamlist *list) diff --git a/libc/spawn/lib_psfa_destroy.c b/libc/spawn/lib_psfa_destroy.c index d80dbd9783..9bbc3d906f 100644 --- a/libc/spawn/lib_psfa_destroy.c +++ b/libc/spawn/lib_psfa_destroy.c @@ -56,7 +56,7 @@ * * Description: * The posix_spawn_file_actions_destroy() function destroys the object - * referenced by file_actions which was previously intialized by + * referenced by file_actions which was previously initializeed by * posix_spawn_file_actions_init(), returning any resources obtained at the * time of initialization to the system for subsequent reuse. A * posix_spawn_file_actions_t may be reinitialized after having been diff --git a/sched/pthread_once.c b/sched/pthread_once.c index 4133004729..46b37c5a5f 100644 --- a/sched/pthread_once.c +++ b/sched/pthread_once.c @@ -80,7 +80,7 @@ * * Parameters: * once_control - Determines if init_routine should be called. once_control - * should be declared and intialized as follows: + * should be declared and initializeed as follows: * * pthread_once_t once_control = PTHREAD_ONCE_INIT; * diff --git a/sched/sig_internal.h b/sched/sig_internal.h index e9a432092c..c9f74491e8 100644 --- a/sched/sig_internal.h +++ b/sched/sig_internal.h @@ -159,7 +159,7 @@ extern sq_queue_t g_sigpendingirqsignal; struct task_group_s; -/* sig_intialize.c */ +/* sig_initializee.c */ void weak_function sig_initialize(void); void sig_allocateactionblock(void);