diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-15 16:33:49 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-15 16:33:49 -0600 |
| commit | 1ca4adc13c09facc71524e80a0bb134c6921598c (patch) | |
| tree | 8405290c4a7c3facb26a8715b2563682245109ef | |
| parent | 6c769c468563f27a828aad0d0c697becf14ccf15 (diff) | |
| download | nuttx-1ca4adc13c09facc71524e80a0bb134c6921598c.tar.gz nuttx-1ca4adc13c09facc71524e80a0bb134c6921598c.tar.bz2 nuttx-1ca4adc13c09facc71524e80a0bb134c6921598c.zip | |
Updated to hymini-stm32v configuration from Laurent Latil
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/configs/hymini-stm32v/nsh2/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/hymini-stm32v/src/up_ssd1289.c | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index becafa979..da9c66af4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4715,3 +4715,5 @@ (Laurent Latil, 2013-5-14). * arch/arm/src/stm32/chip/stm32f10xx_dma.h: Fix some bad DMA register definitions. From Laurent Latil (2013-5-15). + * configs/hymini-stm32v: Enable SDIO in nsh2 configuration; remove + warning from src/up_ssd1289.c. From Laurent Latil (2013-5-15). diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index b39cb3a69..62793df97 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -843,7 +843,7 @@ CONFIG_NSH_CONSOLE=y # # CONFIG_NSH_USBDEV_TRACE is not set # CONFIG_NSH_CONDEV is not set -# CONFIG_NSH_ARCHINIT is not set +CONFIG_NSH_ARCHINIT=y # # NxWidgets/NxWM diff --git a/nuttx/configs/hymini-stm32v/src/up_ssd1289.c b/nuttx/configs/hymini-stm32v/src/up_ssd1289.c index e70feddf5..de925babd 100644 --- a/nuttx/configs/hymini-stm32v/src/up_ssd1289.c +++ b/nuttx/configs/hymini-stm32v/src/up_ssd1289.c @@ -292,7 +292,6 @@ static void init_lcd_backlight(void) { uint16_t ccmr; uint16_t ccer; - uint16_t cr2; /* Configure PB5 as TIM3 CH2 output */ @@ -329,10 +328,6 @@ static void init_lcd_backlight(void) ccer &= ~ATIM_CCER_CC2E; putreg16(ccer, STM32_TIM3_CCER); - /* Get the TIM3 CR2 register value */ - - cr2 = getreg16(STM32_TIM3_CR2); - /* Select the Output Compare Mode Bits */ ccmr = getreg16(STM32_TIM3_CCMR1); |