From c5d613dc6a0deec13087a7ef82e18dfc3dc2e407 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 15 May 2013 16:33:49 -0600 Subject: [PATCH] Updated to hymini-stm32v configuration from Laurent Latil --- ChangeLog | 2 ++ configs/hymini-stm32v/nsh2/defconfig | 2 +- configs/hymini-stm32v/src/up_ssd1289.c | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index becafa9793..da9c66af4b 100644 --- a/ChangeLog +++ b/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/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index b39cb3a690..62793df979 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/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/configs/hymini-stm32v/src/up_ssd1289.c b/configs/hymini-stm32v/src/up_ssd1289.c index e70feddf5b..de925babd8 100644 --- a/configs/hymini-stm32v/src/up_ssd1289.c +++ b/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);