Minor changes from review of last PR

This commit is contained in:
Gregory Nutt 2017-10-09 12:15:05 -06:00
parent 6c25f3d142
commit d0eb182c00
4 changed files with 116 additions and 229 deletions

View File

@ -2265,11 +2265,11 @@ config STM32_DAC1
if STM32_DAC1
config STM32_DAC1CH1
bool "DAC1CH1"
bool "DAC1CH1"
default n
config STM32_DAC1CH2
bool "DAC1CH2"
bool "DAC1CH2"
default n
endif #STM32_DAC1
@ -2283,7 +2283,7 @@ config STM32_DAC2
if STM32_DAC2
config STM32_DAC2CH1
bool "DAC2CH1"
bool "DAC2CH1"
default n
endif #STM32_DAC2
@ -2311,8 +2311,8 @@ config STM32_HASH
depends on STM32_STM32F207 || STM32_STM32F4XXX
config HRTIM
bool "HRTIM"
default n
bool "HRTIM"
default n
config STM32_HRTIM1
bool "HRTIM1"
@ -5793,7 +5793,7 @@ menu "HRTIM Configuration"
if STM32_HRTIM1
config STM32_HRTIM_DISABLE_CHARDRV
bool "HRTIM Disable Character Driver"
bool "HRTIM Disable Character Driver"
default n
menuconfig STM32_HRTIM_ADC
@ -5803,483 +5803,483 @@ menuconfig STM32_HRTIM_ADC
if STM32_HRTIM_ADC
config STM32_HRTIM_ADC_TRG1
bool "HRTIM ADC Trigger 1"
bool "HRTIM ADC Trigger 1"
default n
config STM32_HRTIM_ADC_TRG2
bool "HRTIM ADC Trigger 2"
bool "HRTIM ADC Trigger 2"
default n
config STM32_HRTIM_ADC_TRG3
bool "HRTIM ADC Trigger 3"
bool "HRTIM ADC Trigger 3"
default n
config STM32_HRTIM_ADC_TRG4
bool "HRTIM ADC Trigger 4"
bool "HRTIM ADC Trigger 4"
default n
endif # STM32_HRTIM_ADC
config STM32_HRTIM_DAC
bool "HRTIM DAC Triggering"
bool "HRTIM DAC Triggering"
default n
config STM32_HRTIM_PWM
bool "HRTIM PWM Outputs"
bool "HRTIM PWM Outputs"
default n
config STM32_HRTIM_CAP
bool "HRTIM Capture"
bool "HRTIM Capture"
default n
config STM32_HRTIM_INTERRUPTS
bool "HRTIM Interrupts"
bool "HRTIM Interrupts"
default n
config STM32_HRTIM_BURST
bool "HRTIM Burst Mode"
bool "HRTIM Burst Mode"
depends on STM32_HRTIM_PWM
default n
config STM32_HRTIM_DEADTIME
bool "HRTIM Dead-time"
bool "HRTIM Dead-time"
depends on STM32_HRTIM_PWM
default n
config STM32_HRTIM_DMA
bool "HRTIM DMA"
bool "HRTIM DMA"
default n
config STM32_HRTIM_DMABURST
bool "HRTIM DMA Burst"
bool "HRTIM DMA Burst"
default n
config STM32_HRTIM_CHOPPER
bool "HRTIM Chopper"
bool "HRTIM Chopper"
depends on STM32_HRTIM_PWM
default n
config STM32_HRTIM_AUTODELAY
bool "HRTIM Autodelay"
bool "HRTIM Autodelay"
depends on STM32_HRTIM_PWM
default n
menuconfig STM32_HRTIM_EVENTS
bool "HRTIM Events Configuration"
bool "HRTIM Events Configuration"
default n
if STM32_HRTIM_EVENTS
config STM32_HRTIM_EEV1
bool "HRTIM EEV1"
bool "HRTIM EEV1"
default n
config STM32_HRTIM_EEV2
bool "HRTIM EEV2"
bool "HRTIM EEV2"
default n
config STM32_HRTIM_EEV3
bool "HRTIM EEV3"
bool "HRTIM EEV3"
default n
config STM32_HRTIM_EEV4
bool "HRTIM EEV4"
bool "HRTIM EEV4"
default n
config STM32_HRTIM_EEV5
bool "HRTIM EEV5"
bool "HRTIM EEV5"
default n
config STM32_HRTIM_EEV6
bool "HRTIM EEV6"
bool "HRTIM EEV6"
default n
config STM32_HRTIM_EEV7
bool "HRTIM EEV7"
bool "HRTIM EEV7"
default n
config STM32_HRTIM_EEV8
bool "HRTIM EEV8"
bool "HRTIM EEV8"
default n
config STM32_HRTIM_EEV9
bool "HRTIM EEV9"
bool "HRTIM EEV9"
default n
config STM32_HRTIM_EEV10
bool "HRTIM EEV10"
bool "HRTIM EEV10"
default n
endif # STM32_HRTIM_EVENTS
menuconfig STM32_HRTIM_FAULTS
bool "HRTIM Faults Configuration"
default n
default n
if STM32_HRTIM_FAULTS
config STM32_HRTIM_FAULT1
bool "HRTIM Fault 1"
bool "HRTIM Fault 1"
default n
config STM32_HRTIM_FAULT2
bool "HRTIM Fault 2"
bool "HRTIM Fault 2"
default n
config STM32_HRTIM_FAULT3
bool "HRTIM Fault 3"
bool "HRTIM Fault 3"
default n
config STM32_HRTIM_FAULT4
bool "HRTIM Fault 4"
bool "HRTIM Fault 4"
default n
endif # STM32_HRTIM_FAULTS
config STM32_HRTIM_CLK_FROM_PLL
bool "HRTIM Clock from PLL"
bool "HRTIM Clock from PLL"
default n
menu "HRTIM Master Configuration"
depends on STM32_HRTIM_MASTER
depends on STM32_HRTIM_MASTER
config STM32_HRTIM_MASTER_DAC
bool "HRTIM Master DAC Triggering"
bool "HRTIM Master DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_MASTER_DMA
bool "HRTIM MASTER DMA"
bool "HRTIM MASTER DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_MASTER_IRQ
bool "HRTIM MASTER Interrupts"
bool "HRTIM MASTER Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
endmenu # "HRTIM Master Configuration"
menu "HRTIM Timer A Configuration"
depends on STM32_HRTIM_TIMA
depends on STM32_HRTIM_TIMA
config STM32_HRTIM_TIMA_CAP
bool "HRTIM TIMA Capture"
bool "HRTIM TIMA Capture"
default n
depends on STM32_HRTIM_CAPTURE
config STM32_HRTIM_TIMA_DAC
bool "HRTIM TIMA DAC Triggering"
bool "HRTIM TIMA DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_TIMA_DMA
bool "HRTIM TIMA DMA"
bool "HRTIM TIMA DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_TIMA_IRQ
bool "HRTIM TIMA Interrupts"
bool "HRTIM TIMA Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
config STM32_HRTIM_TIMA_PWM
bool "HRTIM TIMA PWM Outputs"
bool "HRTIM TIMA PWM Outputs"
default n
depends on STM32_HRTIM_PWM
config STM32_HRTIM_TIMA_PWM_CH1
bool "HRTIM TIMA PWM Output 1"
bool "HRTIM TIMA PWM Output 1"
default n
depends on STM32_HRTIM_TIMA_PWM
config STM32_HRTIM_TIMA_PWM_CH2
bool "HRTIM TIMA PWM Output 2"
bool "HRTIM TIMA PWM Output 2"
default n
depends on STM32_HRTIM_TIMA_PWM
config STM32_HRTIM_TIMA_BURST
bool "HRTIM TIMA Burst"
bool "HRTIM TIMA Burst"
default n
depends on (STM32_HRTIM_BURST && STM32_HRTIM_TIMA_PWM)
config STM32_HRTIM_TIMA_BURST_CH1
bool "HRTIM TIMA Output 1 Burst Mode"
bool "HRTIM TIMA Output 1 Burst Mode"
default n
depends on (STM32_HRTIM_TIMA_BURST && STM32_HRTIM_TIMA_PWM_CH1)
config STM32_HRTIM_TIMA_BURST_CH2
bool "HRTIM TIMA Output 2 Burst Mode"
bool "HRTIM TIMA Output 2 Burst Mode"
default n
depends on (STM32_HRTIM_TIMA_BURST && STM32_HRTIM_TIMA_PWM_CH2)
config STM32_HRTIM_TIMA_CHOP
bool "HRTIM TIMA PWM Chopper"
bool "HRTIM TIMA PWM Chopper"
default n
depends on (STM32_HRTIM_CHOPPER && STM32_HRTIM_TIMA_PWM)
config STM32_HRTIM_TIMA_DT
bool "HRTIM TIMA PWM Dead-time"
bool "HRTIM TIMA PWM Dead-time"
default n
depends on (STM32_HRTIM_DEADTIME && STM32_HRTIM_TIMA_PWM)
endmenu # "HRTIM Timer A Configuration"
menu "HRTIM Timer B Configuration"
depends on STM32_HRTIM_TIMB
depends on STM32_HRTIM_TIMB
config STM32_HRTIM_TIMB_CAP
bool "HRTIM TIMB Capture"
bool "HRTIM TIMB Capture"
default n
depends on STM32_HRTIM_CAPTURE
config STM32_HRTIM_TIMB_DAC
bool "HRTIM TIMB DAC Triggering"
bool "HRTIM TIMB DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_TIMB_DMA
bool "HRTIM TIMB DMA"
bool "HRTIM TIMB DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_TIMB_IRQ
bool "HRTIM TIMB Interrupts"
bool "HRTIM TIMB Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
config STM32_HRTIM_TIMB_PWM
bool "HRTIM TIMB PWM Outputs"
bool "HRTIM TIMB PWM Outputs"
default n
depends on STM32_HRTIM_PWM
config STM32_HRTIM_TIMB_PWM_CH1
bool "HRTIM TIMB PWM Output 1"
bool "HRTIM TIMB PWM Output 1"
default n
depends on STM32_HRTIM_TIMB_PWM
config STM32_HRTIM_TIMB_PWM_CH2
bool "HRTIM TIMB PWM Output 2"
bool "HRTIM TIMB PWM Output 2"
default n
depends on STM32_HRTIM_TIMB_PWM
config STM32_HRTIM_TIMB_BURST
bool "HRTIM TIMB Burst"
bool "HRTIM TIMB Burst"
default n
depends on (STM32_HRTIM_BURST && STM32_HRTIM_TIMB_PWM)
config STM32_HRTIM_TIMB_BURST_CH1
bool "HRTIM TIMB Output 1 Burst Mode"
bool "HRTIM TIMB Output 1 Burst Mode"
default n
depends on (STM32_HRTIM_TIMB_BURST && STM32_HRTIM_TIMB_PWM_CH1)
config STM32_HRTIM_TIMB_BURST_CH2
bool "HRTIM TIMB Output 2 Burst Mode"
bool "HRTIM TIMB Output 2 Burst Mode"
default n
depends on (STM32_HRTIM_TIMB_BURST && STM32_HRTIM_TIMB_PWM_CH2)
config STM32_HRTIM_TIMB_CHOP
bool "HRTIM TIMB PWM Chopper"
bool "HRTIM TIMB PWM Chopper"
default n
depends on (STM32_HRTIM_CHOPPER && STM32_HRTIM_TIMB_PWM)
config STM32_HRTIM_TIMB_DT
bool "HRTIM TIMB PWM Dead-time"
bool "HRTIM TIMB PWM Dead-time"
default n
depends on (STM32_HRTIM_DEADTIME && STM32_HRTIM_TIMB_PWM)
endmenu # "HRTIM Timer B Configuration"
menu "HRTIM Timer C Configuration"
depends on STM32_HRTIM_TIMC
depends on STM32_HRTIM_TIMC
config STM32_HRTIM_TIMC_CAP
bool "HRTIM TIMC Capture"
bool "HRTIM TIMC Capture"
default n
depends on STM32_HRTIM_CAPTURE
config STM32_HRTIM_TIMC_DAC
bool "HRTIM TIMC DAC Triggering"
bool "HRTIM TIMC DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_TIMC_DMA
bool "HRTIM TIMC DMA"
bool "HRTIM TIMC DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_TIMC_IRQ
bool "HRTIM TIMC Interrupts"
bool "HRTIM TIMC Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
config STM32_HRTIM_TIMC_PWM
bool "HRTIM TIMC PWM Outputs"
bool "HRTIM TIMC PWM Outputs"
default n
depends on STM32_HRTIM_PWM
config STM32_HRTIM_TIMC_PWM_CH1
bool "HRTIM TIMC PWM Output 1"
bool "HRTIM TIMC PWM Output 1"
default n
depends on STM32_HRTIM_TIMC_PWM
config STM32_HRTIM_TIMC_PWM_CH2
bool "HRTIM TIMC PWM Output 2"
bool "HRTIM TIMC PWM Output 2"
default n
depends on STM32_HRTIM_TIMC_PWM
config STM32_HRTIM_TIMC_BURST
bool "HRTIM TIMC Burst"
bool "HRTIM TIMC Burst"
default n
depends on (STM32_HRTIM_BURST && STM32_HRTIM_TIMC_PWM)
config STM32_HRTIM_TIMC_BURST_CH1
bool "HRTIM TIMC Output 1 Burst Mode"
bool "HRTIM TIMC Output 1 Burst Mode"
default n
depends on (STM32_HRTIM_TIMC_BURST && STM32_HRTIM_TIMC_PWM_CH1)
config STM32_HRTIM_TIMC_BURST_CH2
bool "HRTIM TIMC Output 2 Burst Mode"
bool "HRTIM TIMC Output 2 Burst Mode"
default n
depends on (STM32_HRTIM_TIMC_BURST && STM32_HRTIM_TIMC_PWM_CH2)
config STM32_HRTIM_TIMC_CHOP
bool "HRTIM TIMC PWM Chopper"
bool "HRTIM TIMC PWM Chopper"
default n
depends on (STM32_HRTIM_CHOPPER && STM32_HRTIM_TIMC_PWM)
config STM32_HRTIM_TIMC_DT
bool "HRTIM TIMC PWM Dead-time"
bool "HRTIM TIMC PWM Dead-time"
default n
depends on (STM32_HRTIM_DEADTIME && STM32_HRTIM_TIMC_PWM)
endmenu # "HRTIM Timer C Configuration"
menu "HRTIM Timer D Configuration"
depends on STM32_HRTIM_TIMD
depends on STM32_HRTIM_TIMD
config STM32_HRTIM_TIMD_CAP
bool "HRTIM TIMD Capture"
bool "HRTIM TIMD Capture"
default n
depends on STM32_HRTIM_CAPTURE
config STM32_HRTIM_TIMD_DAC
bool "HRTIM TIMD DAC Triggering"
bool "HRTIM TIMD DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_TIMD_DMA
bool "HRTIM TIMD DMA"
bool "HRTIM TIMD DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_TIMD_IRQ
bool "HRTIM TIMD Interrupts"
bool "HRTIM TIMD Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
config STM32_HRTIM_TIMD_PWM
bool "HRTIM TIMD PWM Outputs"
bool "HRTIM TIMD PWM Outputs"
default n
depends on STM32_HRTIM_PWM
config STM32_HRTIM_TIMD_PWM_CH1
bool "HRTIM TIMD PWM Output 1"
bool "HRTIM TIMD PWM Output 1"
default n
depends on STM32_HRTIM_TIMD_PWM
config STM32_HRTIM_TIMD_PWM_CH2
bool "HRTIM TIMD PWM Output 2"
bool "HRTIM TIMD PWM Output 2"
default n
depends on STM32_HRTIM_TIMD_PWM
config STM32_HRTIM_TIMD_BURST
bool "HRTIM TIMD Burst"
bool "HRTIM TIMD Burst"
default n
depends on (STM32_HRTIM_BURST && STM32_HRTIM_TIMD_PWM)
config STM32_HRTIM_TIMD_BURST_CH1
bool "HRTIM TIMD Output 1 Burst Mode"
bool "HRTIM TIMD Output 1 Burst Mode"
default n
depends on (STM32_HRTIM_TIMD_BURST && STM32_HRTIM_TIMD_PWM_CH1)
config STM32_HRTIM_TIMD_BURST_CH2
bool "HRTIM TIMD Output 2 Burst Mode"
bool "HRTIM TIMD Output 2 Burst Mode"
default n
depends on (STM32_HRTIM_TIMD_BURST && STM32_HRTIM_TIMD_PWM_CH2)
config STM32_HRTIM_TIMD_CHOP
bool "HRTIM TIMD PWM Chopper"
bool "HRTIM TIMD PWM Chopper"
default n
depends on (STM32_HRTIM_CHOPPER && STM32_HRTIM_TIMD_PWM)
config STM32_HRTIM_TIMD_DT
bool "HRTIM TIMD PWM Dead-time"
bool "HRTIM TIMD PWM Dead-time"
default n
depends on (STM32_HRTIM_DEADTIME && STM32_HRTIM_TIMD_PWM)
endmenu # "HRTIM Timer D Configuration"
menu "HRTIM Timer E Configuration"
depends on STM32_HRTIM_TIME
depends on STM32_HRTIM_TIME
config STM32_HRTIM_TIME_CAP
bool "HRTIM TIME Capture"
bool "HRTIM TIME Capture"
default n
depends on STM32_HRTIM_CAPTURE
config STM32_HRTIM_TIME_DAC
bool "HRTIM TIME DAC Triggering"
bool "HRTIM TIME DAC Triggering"
default n
depends on STM32_HRTIM_DAC
config STM32_HRTIM_TIME_DMA
bool "HRTIM TIME DMA"
bool "HRTIM TIME DMA"
default n
depends on STM32_HRTIM_DMA
config STM32_HRTIM_TIME_IRQ
bool "HRTIM TIME Interrupts"
bool "HRTIM TIME Interrupts"
default n
depends on STM32_HRTIM_INTERRUPTS
config STM32_HRTIM_TIME_PWM
bool "HRTIM TIME PWM Outputs"
bool "HRTIM TIME PWM Outputs"
default n
depends on STM32_HRTIM_PWM
config STM32_HRTIM_TIME_PWM_CH1
bool "HRTIM TIME PWM Output 1"
bool "HRTIM TIME PWM Output 1"
default n
depends on STM32_HRTIM_TIME_PWM
config STM32_HRTIM_TIME_PWM_CH2
bool "HRTIM TIME PWM Output 2"
bool "HRTIM TIME PWM Output 2"
default n
depends on STM32_HRTIM_TIME_PWM
config STM32_HRTIM_TIME_BURST
bool "HRTIM TIME Burst"
bool "HRTIM TIME Burst"
default n
depends on (STM32_HRTIM_BURST && STM32_HRTIM_TIME_PWM)
config STM32_HRTIM_TIME_BURST_CH1
bool "HRTIM TIME Output 1 Burst Mode"
bool "HRTIM TIME Output 1 Burst Mode"
default n
depends on (STM32_HRTIM_TIME_BURST && STM32_HRTIM_TIME_PWM_CH1)
config STM32_HRTIM_TIME_BURST_CH2
bool "HRTIM TIME Output 2 Burst Mode"
bool "HRTIM TIME Output 2 Burst Mode"
default n
depends on (STM32_HRTIM_TIME_BURST && STM32_HRTIM_TIME_PWM_CH2)
config STM32_HRTIM_TIME_CHOP
bool "HRTIM TIME PWM Chopper"
bool "HRTIM TIME PWM Chopper"
default n
depends on (STM32_HRTIM_CHOPPER && STM32_HRTIM_TIME_PWM)
config STM32_HRTIM_TIME_DT
bool "HRTIM TIME PWM Dead-time"
bool "HRTIM TIME PWM Dead-time"
default n
depends on (STM32_HRTIM_DEADTIME && STM32_HRTIM_TIME_PWM)
@ -6388,17 +6388,17 @@ config STM32_DAC1CH1_DMA_BUFFER_SIZE
default 256
config STM32_DAC1CH1_DMA_EXTERNAL
bool "DAC1CH1 DMA External Trigger"
bool "DAC1CH1 DMA External Trigger"
default n
if STM32_HRTIM_DAC
config STM32_DAC1CH1_HRTIM_TRG1
bool "DAC1CH1 HRTIM Trigger 1"
bool "DAC1CH1 HRTIM Trigger 1"
default n
config STM32_DAC1CH1_HRTIM_TRG2
bool "DAC1CH1 HRTIM Trigger 2"
bool "DAC1CH1 HRTIM Trigger 2"
default n
endif # STM32_HRTIM_DAC
@ -6432,17 +6432,17 @@ config STM32_DAC1CH2_DMA_BUFFER_SIZE
default 256
config STM32_DAC1CH2_DMA_EXTERNAL
bool "DAC1CH2 DMA External Trigger"
bool "DAC1CH2 DMA External Trigger"
default n
if STM32_HRTIM_DAC
config STM32_DAC1CH2_HRTIM_TRG1
bool "DAC1CH2 HRTIM Trigger 1"
bool "DAC1CH2 HRTIM Trigger 1"
default n
config STM32_DAC1CH2_HRTIM_TRG2
bool "DAC1CH2 HRTIM Trigger 2"
bool "DAC1CH2 HRTIM Trigger 2"
default n
endif # STM32_HRTIM_DAC
@ -6476,13 +6476,13 @@ config STM32_DAC2CH1_DMA_BUFFER_SIZE
default 256
config STM32_DAC2CH1_DMA_EXTERNAL
bool "DAC2CH1 DMA External Trigger"
bool "DAC2CH1 DMA External Trigger"
default n
if STM32_HRTIM_DAC
config STM32_DAC2CH1_HRTIM_TRG3
bool "DAC2CH1 HRTIM Trigger 3"
bool "DAC2CH1 HRTIM Trigger 3"
default n
endif # STM32_HRTIM_DAC

View File

@ -1,113 +0,0 @@
############################################################################
# configs/stm32f334-disco/powerled/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# 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.
#
############################################################################
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
ifeq ($(WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E
LD = $(CROSSDEV)ld
AR = $(ARCROSSDEV)ar rcs
NM = $(ARCROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHOPTIMIZATION = -g
endif
ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
ARCHCFLAGS = -fno-builtin
ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
ARCHWARNINGSXX = -Wall -Wshadow -Wundef
ARCHDEFINES =
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
NXFLATLDFLAGS1 = -r -d -warn-common
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
LDNXFLATFLAGS = -e main -s 2048
ASMEXT = .S
OBJEXT = .o
LIBEXT = .a
EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
LDFLAGS += -g
endif
HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS =

View File

@ -1,5 +1,5 @@
############################################################################
# configs/stm32f334-disco/nsh/Make.defs
# configs/stm32f334-disco/scripts/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -233,7 +233,7 @@ config PM_SLEEPENTER_COUNT
endif # PM
config DRIVERS_POWERLED
bool "High Power LED driver"
bool "High Power LED driver"
default n
---help---
Enables building of an powerled upper half driver.