diff --git a/arch/arm/src/stm32/stm32_adc.h b/arch/arm/src/stm32/stm32_adc.h index 5b1d95fc0fb..e8c5b29773b 100644 --- a/arch/arm/src/stm32/stm32_adc.h +++ b/arch/arm/src/stm32/stm32_adc.h @@ -1863,6 +1863,12 @@ enum adc_io_cmds_e }; #elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) +/* On STM32F42xx and STM32F43xx devices,VBAT and temperature sensor are connected + * to the same ADC internal channel (ADC1_IN18). Only one conversion, either + * temperature sensor or VBAT, must be selected at a time. When both conversion are + * enabled simultaneously, only the VBAT conversion is performed. + */ + enum adc_io_cmds_e { IO_ENABLE_TEMPER_VOLT_CH = 0, diff --git a/configs/Kconfig b/configs/Kconfig index a5f298fa205..6e215cd2ed7 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -1339,12 +1339,13 @@ config ARCH_BOARD_STM32L476_MDK config ARCH_BOARD_STM32L_DISCOVERY bool "STMicro STM32L-Discovery board" - depends on ARCH_CHIP_STM32L152RB + depends on ARCH_CHIP_STM32L152RB || ARCH_CHIP_STM32L152RC select ARCH_HAVE_LEDS select ARCH_HAVE_BUTTONS select ARCH_HAVE_IRQBUTTONS ---help--- - STMicro STM32L-Discovery board based on the STMicro STM32L152RB MCU. + STMicro STM32L-Discovery board based on the STMicro STM32L152RBT6 or + STM32L1 MCUs. config ARCH_BOARD_STM32VL_DISCOVERY bool "STMicro STM32VL-Discovery board" diff --git a/configs/stm32ldiscovery/scripts/Make.defs b/configs/stm32ldiscovery/scripts/Make.defs index 3df6dddc1cb..3d684333c41 100644 --- a/configs/stm32ldiscovery/scripts/Make.defs +++ b/configs/stm32ldiscovery/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/stm32l1discovery/nsh/Make.defs # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2013, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -37,7 +37,12 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs -LDSCRIPT = ld.script +ifeq ($(CONFIG_ARCH_CHIP_STM32L152RB),y) + LDSCRIPT = stm32l152rb.ld +else +ifeq ($(CONFIG_ARCH_CHIP_STM32L152RC),y) + LDSCRIPT = stm32l152rc.ld +else ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/stm32ldiscovery/scripts/ld.script b/configs/stm32ldiscovery/scripts/stm32l152rb.ld similarity index 91% rename from configs/stm32ldiscovery/scripts/ld.script rename to configs/stm32ldiscovery/scripts/stm32l152rb.ld index 80d6fe42da1..2dcfec52107 100644 --- a/configs/stm32ldiscovery/scripts/ld.script +++ b/configs/stm32ldiscovery/scripts/stm32l152rb.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/stm32fldiscovery/scripts/ld.script + * configs/stm32fldiscovery/scripts/stm32l152rb.ld * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,15 +43,16 @@ MEMORY { - flash (rx) : ORIGIN = 0x08000000, LENGTH = 128K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 16K + flash (rx) : ORIGIN = 0x08000000, LENGTH = 128K + sram (rwx) : ORIGIN = 0x20000000, LENGTH = 16K } OUTPUT_ARCH(arm) ENTRY(_stext) SECTIONS { - .text : { + .text : + { _stext = ABSOLUTE(.); *(.vectors) *(.text .text.*) @@ -67,25 +68,29 @@ SECTIONS _etext = ABSOLUTE(.); } > flash - .init_section : { + .init_section : + { _sinit = ABSOLUTE(.); *(.init_array .init_array.*) _einit = ABSOLUTE(.); } > flash - .ARM.extab : { + .ARM.extab : + { *(.ARM.extab*) } > flash __exidx_start = ABSOLUTE(.); - .ARM.exidx : { + .ARM.exidx : + { *(.ARM.exidx*) } > flash __exidx_end = ABSOLUTE(.); _eronly = ABSOLUTE(.); - .data : { + .data : + { _sdata = ABSOLUTE(.); *(.data .data.*) *(.gnu.linkonce.d.*) @@ -93,7 +98,8 @@ SECTIONS _edata = ABSOLUTE(.); } > sram AT > flash - .bss : { + .bss : + { _sbss = ABSOLUTE(.); *(.bss .bss.*) *(.gnu.linkonce.b.*) @@ -102,6 +108,7 @@ SECTIONS } > sram /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } .stab.excl 0 : { *(.stab.excl) } diff --git a/configs/stm32ldiscovery/scripts/stm32l152rc.ld b/configs/stm32ldiscovery/scripts/stm32l152rc.ld new file mode 100644 index 00000000000..cd32d174349 --- /dev/null +++ b/configs/stm32ldiscovery/scripts/stm32l152rc.ld @@ -0,0 +1,124 @@ +/**************************************************************************** + * configs/stm32fldiscovery/scripts/stm32l152rc.ld + * + * Copyright (C) 2018 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 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. + * + ****************************************************************************/ + +/* The STM32L152RCT6 has 256KB of FLASH beginning at address 0x0800:0000 and + * 32Kb of SRAM at address 0x20000000. + * + * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 + * where the code expects to begin execution by jumping to the entry point in + * the 0x0800:0000 address range. + */ + +MEMORY +{ + flash (rx) : ORIGIN = 0x08000000, LENGTH = 256K + sram (rwx) : ORIGIN = 0x20000000, LENGTH = 32K +} + +OUTPUT_ARCH(arm) +ENTRY(_stext) +SECTIONS +{ + .text : + { + _stext = ABSOLUTE(.); + *(.vectors) + *(.text .text.*) + *(.fixup) + *(.gnu.warning) + *(.rodata .rodata.*) + *(.gnu.linkonce.t.*) + *(.glue_7) + *(.glue_7t) + *(.got) + *(.gcc_except_table) + *(.gnu.linkonce.r.*) + _etext = ABSOLUTE(.); + } > flash + + .init_section : + { + _sinit = ABSOLUTE(.); + *(.init_array .init_array.*) + _einit = ABSOLUTE(.); + } > flash + + .ARM.extab : + { + *(.ARM.extab*) + } > flash + + __exidx_start = ABSOLUTE(.); + .ARM.exidx : + { + *(.ARM.exidx*) + } > flash + __exidx_end = ABSOLUTE(.); + + _eronly = ABSOLUTE(.); + + .data : + { + _sdata = ABSOLUTE(.); + *(.data .data.*) + *(.gnu.linkonce.d.*) + CONSTRUCTORS + _edata = ABSOLUTE(.); + } > sram AT > flash + + .bss : + { + _sbss = ABSOLUTE(.); + *(.bss .bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + _ebss = ABSOLUTE(.); + } > sram + + /* Stabs debugging sections. */ + + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_info 0 : { *(.debug_info) } + .debug_line 0 : { *(.debug_line) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_aranges 0 : { *(.debug_aranges) } +} diff --git a/libnx/nxfonts/nxfonts_cache.c b/libnx/nxfonts/nxfonts_cache.c index 6276b91dc75..86a9248d956 100644 --- a/libnx/nxfonts/nxfonts_cache.c +++ b/libnx/nxfonts/nxfonts_cache.c @@ -39,6 +39,7 @@ #include +#include #include #include #include