diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cd39b69768..af7b8cee37 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -49,9 +49,7 @@ config ARCH_CHIP_DM320 config ARCH_CHIP_EFM32 bool "Energy Micro" - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_SPI_BITORDER - select ARMV7M_CMNVECTOR select ARCH_HAVE_FETCHADD ---help--- Energy Micro EFM32 microcontrollers (ARM Cortex-M). @@ -81,7 +79,6 @@ config ARCH_CHIP_IMX6 config ARCH_CHIP_IMXRT bool "NXP/Freescale iMX.RT" - select ARCH_HAVE_CMNVECTOR select ARCH_CORTEXM7 select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD @@ -90,7 +87,6 @@ config ARCH_CHIP_IMXRT select ARCH_HAVE_I2CRESET select ARCH_HAVE_SPI_CS_CONTROL select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- NXP i.MX RT (ARM Cortex-M7) architectures @@ -103,56 +99,46 @@ config ARCH_CHIP_KINETIS select ARCH_HAVE_FPU select ARCH_HAVE_FETCHADD select ARCH_HAVE_RAMFUNCS - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_I2CRESET - select ARMV7M_CMNVECTOR ---help--- Freescale Kinetis Architectures (ARM Cortex-M4) config ARCH_CHIP_KL bool "NXP/Freescale Kinetis L" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- Freescale Kinetis L Architectures (ARM Cortex-M0+) config ARCH_CHIP_LC823450 bool "ON Semiconductor LC823450" select ARCH_CORTEXM3 - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARCH_HAVE_HEAPCHECK select ARCH_HAVE_MULTICPU select ARCH_HAVE_I2CRESET select ARCH_GLOBAL_IRQDISABLE - select ARMV7M_CMNVECTOR ---help--- ON Semiconductor LC823450 architectures (ARM dual Cortex-M3) config ARCH_CHIP_LM bool "TI/Luminary Stellaris" - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR ---help--- TI/Luminary Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4) config ARCH_CHIP_LPC11XX bool "NXP LPC11xx" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- NXP LPC11xx architectures (ARM Cortex-M0) config ARCH_CHIP_LPC17XX bool "NXP LPC17xx" select ARCH_CORTEXM3 - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FETCHADD - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- NXP LPC17xx architectures (ARM Cortex-M3) @@ -181,8 +167,6 @@ config ARCH_CHIP_LPC31XX config ARCH_CHIP_LPC43XX bool "NXP LPC43XX" select ARCH_CORTEXM4 - select ARCH_HAVE_CMNVECTOR - select ARMV7M_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FPU @@ -193,8 +177,6 @@ config ARCH_CHIP_LPC43XX config ARCH_CHIP_LPC54XX bool "NXP LPC54XX" select ARCH_CORTEXM4 - select ARCH_HAVE_CMNVECTOR - select ARMV7M_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FPU @@ -213,8 +195,6 @@ config ARCH_CHIP_MOXART config ARCH_CHIP_NRF52 bool "Nordic NRF52" select ARCH_CORTEXM4 - select ARCH_HAVE_CMNVECTOR - select ARMV7M_CMNVECTOR #select ARCH_HAVE_MPU #select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FPU @@ -224,7 +204,6 @@ config ARCH_CHIP_NRF52 config ARCH_CHIP_NUC1XX bool "Nuvoton NUC100/120" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- Nuvoton NUC100/120 architectures (ARM Cortex-M0). @@ -245,32 +224,27 @@ config ARCH_CHIP_SAMA5 config ARCH_CHIP_SAMD bool "Atmel SAMD" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- Atmel SAMD (ARM Cortex-M0+) config ARCH_CHIP_SAML bool "Atmel SAML" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- Atmel SAML (ARM Cortex-M0+) config ARCH_CHIP_SAM34 bool "Atmel SAM3/SAM4" - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FETCHADD select ARCH_HAVE_RAMFUNCS - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- Atmel SAM3 (ARM Cortex-M3) and SAM4 (ARM Cortex-M4) architectures config ARCH_CHIP_SAMV7 bool "Atmel SAMV7" - select ARCH_HAVE_CMNVECTOR select ARCH_CORTEXM7 select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD @@ -279,14 +253,12 @@ config ARCH_CHIP_SAMV7 select ARCH_HAVE_I2CRESET select ARCH_HAVE_SPI_CS_CONTROL select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- Atmel SAMV7 (ARM Cortex-M7) architectures config ARCH_CHIP_STM32 bool "STMicro STM32 F1/F2/F3/F4/L1" - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD select ARCH_HAVE_I2CRESET @@ -303,13 +275,11 @@ config ARCH_CHIP_STM32 config ARCH_CHIP_STM32F0 bool "STMicro STM32 F0" select ARCH_CORTEXM0 - select ARCH_HAVE_CMNVECTOR ---help--- STMicro STM32 architectures (ARM Cortex-M0). config ARCH_CHIP_STM32F7 bool "STMicro STM32 F7" - select ARCH_HAVE_CMNVECTOR select ARCH_CORTEXM7 select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD @@ -317,21 +287,18 @@ config ARCH_CHIP_STM32F7 select ARCH_HAVE_HEAPCHECK select ARCH_HAVE_SPI_BITORDER select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- STMicro STM32 architectures (ARM Cortex-M7). config ARCH_CHIP_STM32H7 bool "STMicro STM32 H7" - select ARCH_HAVE_CMNVECTOR select ARCH_CORTEXM7 select ARCH_HAVE_MPU # select ARCH_HAVE_I2CRESET # select ARCH_HAVE_HEAPCHECK select ARCH_HAVE_SPI_BITORDER select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR # select ARMV7M_HAVE_STACKCHECK depends on EXPERIMENTAL # Remove when the port is stable ---help--- @@ -344,7 +311,6 @@ config ARCH_CHIP_STM32H7 config ARCH_CHIP_STM32L4 bool "STMicro STM32 L4" select ARCH_CORTEXM4 - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD select ARCH_HAVE_I2CRESET @@ -353,7 +319,6 @@ config ARCH_CHIP_STM32L4 select ARCH_HAVE_SPI_BITORDER select ARCH_HAVE_TICKLESS select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- STMicro STM32 architectures (ARM Cortex-M4). @@ -378,25 +343,21 @@ config ARCH_CHIP_TMS570 config ARCH_CHIP_TIVA bool "TI Tiva" - select ARCH_HAVE_CMNVECTOR select ARCH_HAVE_MPU select ARM_HAVE_MPU_UNIFIED select ARCH_HAVE_FPU select ARCH_HAVE_FETCHADD - select ARMV7M_CMNVECTOR ---help--- TI Tiva TM4C architectures (ARM Cortex-M4) config ARCH_CHIP_XMC4 bool "Infineon XMC4xxx" - select ARCH_HAVE_CMNVECTOR select ARCH_CORTEXM4 select ARCH_HAVE_MPU select ARCH_HAVE_FETCHADD select ARCH_HAVE_RAMFUNCS select ARCH_HAVE_I2CRESET select ARM_HAVE_MPU_UNIFIED - select ARMV7M_CMNVECTOR select ARMV7M_HAVE_STACKCHECK ---help--- Infineon XMC4xxx(ARM Cortex-M4) architectures @@ -491,6 +452,7 @@ config ARCH_CORTEXM3 default n select ARCH_HAVE_IRQPRIO select ARCH_HAVE_RAMVECTORS + select ARCH_HAVE_LAZYFPU select ARCH_HAVE_HIPRI_INTERRUPT select ARCH_HAVE_RESET @@ -503,6 +465,7 @@ config ARCH_CORTEXM4 default n select ARCH_HAVE_IRQPRIO select ARCH_HAVE_RAMVECTORS + select ARCH_HAVE_LAZYFPU select ARCH_HAVE_HIPRI_INTERRUPT select ARCH_HAVE_RESET @@ -512,6 +475,7 @@ config ARCH_CORTEXM7 select ARCH_HAVE_FPU select ARCH_HAVE_IRQPRIO select ARCH_HAVE_RAMVECTORS + select ARCH_HAVE_LAZYFPU select ARCH_HAVE_HIPRI_INTERRUPT select ARCH_HAVE_RESET select ARCH_HAVE_COHERENT_DCACHE if ELF || MODULE @@ -634,23 +598,13 @@ config ARMV7M_USEBASEPRI register, these hardfaults, will be avoided. For more details see http://www.nuttx.org/doku.php?id=wiki:nxinternal:svcall -config ARCH_HAVE_CMNVECTOR +config ARCH_HAVE_LAZYFPU bool -config ARMV7M_CMNVECTOR - bool "Use common ARMv7-M vectors" - default n - depends on ARCH_HAVE_CMNVECTOR - ---help--- - Some architectures use their own, built-in vector logic. Some use only - the common vector logic. Some can use either their own built-in vector - logic or the common vector logic. This applies only to ARMv7-M - architectures. - config ARMV7M_LAZYFPU bool "Lazy FPU storage" default n - depends on ARCH_HAVE_CMNVECTOR + depends on ARCH_HAVE_LAZYFPU ---help--- There are two forms of the common vector logic. There are pros and cons to each option: diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h index 68f0c07f72..14bbcab166 100644 --- a/arch/arm/include/armv7-m/irq.h +++ b/arch/arm/include/armv7-m/irq.h @@ -55,7 +55,7 @@ /* Included implementation-dependent register save structure layouts */ -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU # include #else # include diff --git a/arch/arm/include/stm32/stm32f10xxx_irq.h b/arch/arm/include/stm32/stm32f10xxx_irq.h index e56df1338e..5c7ecffe32 100644 --- a/arch/arm/include/stm32/stm32f10xxx_irq.h +++ b/arch/arm/include/stm32/stm32f10xxx_irq.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/include/stm32/stm32f10xxx_irq.h * - * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -129,7 +129,7 @@ # define STM32_IRQ_DMA2CH45 (75) /* 59: DMA2 Channel 4 and 5 global interrupt */ # define STM32_IRQ_DMA2CH5 (76) /* 60: DMA2 Channel 5 global interrupt */ -# define NR_VECTORS (77) +# define STM32_IRQ_NEXTINT (61) # define NR_IRQS (77) /* Connectivity Line Devices */ @@ -204,7 +204,7 @@ # define STM32_IRQ_CAN2SCE (82) /* 66: CAN2 SCE interrupt */ # define STM32_IRQ_OTGFS (83) /* 67: USB On The Go FS global interrupt */ -# define NR_VECTORS (84) +# define STM32_IRQ_NEXTINT (68) # define NR_IRQS (84) /* Medium and High Density Devices */ @@ -271,7 +271,7 @@ # define STM32_IRQ_DMA2CH3 (74) /* 58: DMA2 Channel 3 global interrupt */ # define STM32_IRQ_DMA2CH45 (75) /* 59: DMA2 Channel 4&5 global interrupt */ -# define NR_VECTORS (76) +# define STM32_IRQ_NEXTINT (60) # define NR_IRQS (76) /* Convenience definitions for interrupts with multiple functions */ diff --git a/arch/arm/include/stm32/stm32f20xxx_irq.h b/arch/arm/include/stm32/stm32f20xxx_irq.h index 1c5bc9480e..db9f2709ec 100644 --- a/arch/arm/include/stm32/stm32f20xxx_irq.h +++ b/arch/arm/include/stm32/stm32f20xxx_irq.h @@ -1,7 +1,7 @@ /**************************************************************************************************** * arch/arm/include/stm32/stm32f20xxx_irq.h * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -150,7 +150,7 @@ #define STM32_IRQ_HASH (STM32_IRQ_FIRST+80) /* 80: Hash and Rng global interrupt */ #define STM32_IRQ_RNG (STM32_IRQ_FIRST+80) /* 80: Hash and Rng global interrupt */ -#define NR_VECTORS (STM32_IRQ_FIRST+81) +#define STM32_IRQ_NEXTINT (81) #define NR_IRQS (STM32_IRQ_FIRST+81) /**************************************************************************************************** diff --git a/arch/arm/include/stm32/stm32f30xxx_irq.h b/arch/arm/include/stm32/stm32f30xxx_irq.h index f109c8b85d..a9fea7bd92 100644 --- a/arch/arm/include/stm32/stm32f30xxx_irq.h +++ b/arch/arm/include/stm32/stm32f30xxx_irq.h @@ -1,7 +1,7 @@ /**************************************************************************************************** * arch/arm/include/stm32/stm32f30xxx_irq.h * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -161,7 +161,7 @@ #define STM32_IRQ_RESERVED80 (STM32_IRQ_FIRST+80) /* 80: Reserved */ #define STM32_IRQ_FPU (STM32_IRQ_FIRST+81) /* 81: FPU global interrupt */ -#define NR_VECTORS (STM32_IRQ_FIRST+82) +#define STM32_IRQ_NEXTINT (82) #define NR_IRQS (STM32_IRQ_FIRST+82) /**************************************************************************************************** diff --git a/arch/arm/include/stm32/stm32f33xxx_irq.h b/arch/arm/include/stm32/stm32f33xxx_irq.h index 7170959ec9..51e54af2fa 100644 --- a/arch/arm/include/stm32/stm32f33xxx_irq.h +++ b/arch/arm/include/stm32/stm32f33xxx_irq.h @@ -1,7 +1,7 @@ /**************************************************************************************************** * arch/arm/include/stm32/stm32f33xxx_irq.h * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2017, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Modified for STM32F334 by Mateusz Szafoni * @@ -152,7 +152,7 @@ #define STM32_IRQ_RESERVED80 (STM32_IRQ_FIRST+80) /* 80: Reserved */ #define STM32_IRQ_FPU (STM32_IRQ_FIRST+81) /* 81: FPU global interrupt */ -#define NR_VECTORS (STM32_IRQ_FIRST+82) +#define STM32_IRQ_NEXTINT (82) #define NR_IRQS (STM32_IRQ_FIRST+82) /**************************************************************************************************** diff --git a/arch/arm/include/stm32/stm32f37xxx_irq.h b/arch/arm/include/stm32/stm32f37xxx_irq.h index 4f8a431bf9..d02f981470 100644 --- a/arch/arm/include/stm32/stm32f37xxx_irq.h +++ b/arch/arm/include/stm32/stm32f37xxx_irq.h @@ -1,7 +1,7 @@ /**************************************************************************************************** * arch/arm/include/stm32/stm32f37xxx_irq.h * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Modified for STM32F373 by Marten Svanfeldt * @@ -147,7 +147,7 @@ #define STM32_IRQ_RESERVED80 (STM32_IRQ_FIRST+80) /* 80: Reserved */ #define STM32_IRQ_FPU (STM32_IRQ_FIRST+81) /* 81: FPU global interrupt */ -#define NR_VECTORS (STM32_IRQ_FIRST+82) +#define STM32_IRQ_NEXTINT (82) #define NR_IRQS (STM32_IRQ_FIRST+82) /**************************************************************************************************** diff --git a/arch/arm/include/stm32/stm32f40xxx_irq.h b/arch/arm/include/stm32/stm32f40xxx_irq.h index 6f4c23c018..7af9745337 100644 --- a/arch/arm/include/stm32/stm32f40xxx_irq.h +++ b/arch/arm/include/stm32/stm32f40xxx_irq.h @@ -1,7 +1,7 @@ /**************************************************************************************************** * arch/arm/include/stm32/stm32f40xxx_irq.h * - * Copyright (C) 2009, 2014-2015, 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2014-2015, 2017-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. * Author: Gregory Nutt * David Sidrane @@ -321,22 +321,22 @@ #if defined(CONFIG_STM32_STM32F401) || defined(CONFIG_STM32_STM32F411) || \ defined(CONFIG_STM32_STM32F405) || defined(CONFIG_STM32_STM32F407) -# define NR_VECTORS (STM32_IRQ_FIRST+82) +# define STM32_IRQ_NEXTINT (82) # define NR_IRQS (STM32_IRQ_FIRST+82) #elif defined(CONFIG_STM32_STM32F410) -# define NR_VECTORS (STM32_IRQ_FIRST+98) +# define STM32_IRQ_NEXTINT (98) # define NR_IRQS (STM32_IRQ_FIRST+98) #elif defined(CONFIG_STM32_STM32F427) -# define NR_VECTORS (STM32_IRQ_FIRST+87) +# define STM32_IRQ_NEXTINT (87) # define NR_IRQS (STM32_IRQ_FIRST+87) #elif defined(CONFIG_STM32_STM32F429) -# define NR_VECTORS (STM32_IRQ_FIRST+91) +# define STM32_IRQ_NEXTINT (91) # define NR_IRQS (STM32_IRQ_FIRST+91) #elif defined(CONFIG_STM32_STM32F446) -# define NR_VECTORS (STM32_IRQ_FIRST+97) +# define STM32_IRQ_NEXTINT (97) # define NR_IRQS (STM32_IRQ_FIRST+97) #elif defined(CONFIG_STM32_STM32F469) -# define NR_VECTORS (STM32_IRQ_FIRST+93) +# define STM32_IRQ_NEXTINT (93) # define NR_IRQS (STM32_IRQ_FIRST+93) #endif diff --git a/arch/arm/include/stm32/stm32l15xxx_irq.h b/arch/arm/include/stm32/stm32l15xxx_irq.h index d0c1380c87..0c3a568324 100644 --- a/arch/arm/include/stm32/stm32l15xxx_irq.h +++ b/arch/arm/include/stm32/stm32l15xxx_irq.h @@ -2,7 +2,7 @@ * arch/arm/include/stm32/stm32l15xxx_irq.h * For STM32L100xx, STM32L151xx, STM32L152xx and STM32L162xx advanced ARM-based 32-bit MCUs * - * 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 @@ -108,7 +108,7 @@ # define STM32_IRQ_TIM6 (STM32_IRQ_FIRST+43) /* 43: TIM6 global interrupt */ # define STM32_IRQ_TIM7 (STM32_IRQ_FIRST+44) /* 44: TIM7 global interrupt */ -# define NR_VECTORS (STM32_IRQ_FIRST+45) +# define STM32_IRQ_NEXTINT (45) # define NR_IRQS (STM32_IRQ_FIRST+45) /* External interrupts (vectors >= 16) medium+ density devices */ @@ -171,7 +171,7 @@ # define STM32_IRQ_AES (STM32_IRQ_FIRST+52) /* 52: AES global interrupt */ # define STM32_IRQ_COMPACQ (STM32_IRQ_FIRST+53) /* 53: Comparator Channel Acquisition Interrupt */ -# define NR_VECTORS (STM32_IRQ_FIRST+54) +# define STM32_IRQ_NEXTINT (54) # define NR_IRQS (STM32_IRQ_FIRST+54) /* External interrupts (vectors >= 16) high density devices */ @@ -237,7 +237,7 @@ # define STM32_IRQ_AES (STM32_IRQ_FIRST+55) /* 55: AES global interrupt */ # define STM32_IRQ_COMPACQ (STM32_IRQ_FIRST+56) /* 56: Comparator Channel Acquisition Interrupt */ -# define NR_VECTORS (STM32_IRQ_FIRST+57) +# define STM32_IRQ_NEXTINT (57) # define NR_IRQS (STM32_IRQ_FIRST+57) #else # error "Unknown STM32L density" diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index a6a3490660..d6cc7f5f3c 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -174,10 +174,8 @@ VPATH += common VPATH += $(ARCH_SUBDIR) ifeq ($(CONFIG_ARCH_TOOLCHAIN_IAR),y) - VPATH += chip$(DELIM)iar VPATH += $(ARCH_SUBDIR)$(DELIM)iar else # ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) - VPATH += chip$(DELIM)gnu VPATH += $(ARCH_SUBDIR)$(DELIM)gnu endif diff --git a/arch/arm/src/armv7-m/exc_return.h b/arch/arm/src/armv7-m/exc_return.h index 928e2a97c9..f55826de1f 100644 --- a/arch/arm/src/armv7-m/exc_return.h +++ b/arch/arm/src/armv7-m/exc_return.h @@ -93,7 +93,7 @@ * state from the main stack. Execution uses MSP after return. */ -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) && defined(CONFIG_ARCH_FPU) +#if !defined(CONFIG_ARMV7M_LAZYFPU) && defined(CONFIG_ARCH_FPU) # define EXC_RETURN_PRIVTHR (EXC_RETURN_BASE | EXC_RETURN_THREAD_MODE) #else # define EXC_RETURN_PRIVTHR (EXC_RETURN_BASE | EXC_RETURN_STD_CONTEXT | \ @@ -104,7 +104,7 @@ * state from the process stack. Execution uses PSP after return. */ -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) && defined(CONFIG_ARCH_FPU) +#if !defined(CONFIG_ARMV7M_LAZYFPU) && defined(CONFIG_ARCH_FPU) # define EXC_RETURN_UNPRIVTHR (EXC_RETURN_BASE | EXC_RETURN_THREAD_MODE | \ EXC_RETURN_PROCESS_STACK) #else diff --git a/arch/arm/src/armv7-m/up_copyarmstate.c b/arch/arm/src/armv7-m/up_copyarmstate.c index 22e2f39003..52525950b7 100644 --- a/arch/arm/src/armv7-m/up_copyarmstate.c +++ b/arch/arm/src/armv7-m/up_copyarmstate.c @@ -45,8 +45,7 @@ #include "up_internal.h" -#if defined(CONFIG_ARCH_FPU) && \ - (!defined(CONFIG_ARMV7M_CMNVECTOR) || defined(CONFIG_ARMV7M_LAZYFPU)) +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) /**************************************************************************** * Public Functions @@ -103,4 +102,4 @@ void up_copyarmstate(uint32_t *dest, uint32_t *src) } } -#endif /* CONFIG_ARCH_FPU && (!CONFIG_ARMV7M_CMNVECTOR || CONFIG_ARMV7M_LAZYFPU) */ +#endif /* CONFIG_ARCH_FPU && CONFIG_ARMV7M_LAZYFPU */ diff --git a/arch/arm/src/armv7-m/up_initialstate.c b/arch/arm/src/armv7-m/up_initialstate.c index 37cb86cb46..498464761d 100644 --- a/arch/arm/src/armv7-m/up_initialstate.c +++ b/arch/arm/src/armv7-m/up_initialstate.c @@ -120,8 +120,7 @@ void up_initial_state(struct tcb_s *tcb) #endif #endif /* CONFIG_PIC */ -#if (defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU)) || \ - defined(CONFIG_BUILD_PROTECTED) +#if !defined(CONFIG_ARMV7M_LAZYFPU) || defined(CONFIG_BUILD_PROTECTED) /* All tasks start via a stub function in kernel space. So all * tasks must start in privileged thread mode. If CONFIG_BUILD_PROTECTED * is defined, then that stub function will switch to unprivileged @@ -130,15 +129,14 @@ void up_initial_state(struct tcb_s *tcb) xcp->regs[REG_EXC_RETURN] = EXC_RETURN_PRIVTHR; -#endif /* (CONFIG_ARMV7M_CMNVECTOR && !CONFIG_ARMV7M_LAZYFPU) || CONFIG_BUILD_PROTECTED */ +#endif /* !CONFIG_ARMV7M_LAZYFPU || CONFIG_BUILD_PROTECTED */ -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) && \ - defined(CONFIG_ARCH_FPU) +#if !defined(CONFIG_ARMV7M_LAZYFPU) && defined(CONFIG_ARCH_FPU) xcp->regs[REG_FPSCR] = 0; /* REVISIT: Initial FPSCR should be configurable */ xcp->regs[REG_FPReserved] = 0; -#endif /* CONFIG_ARMV7M_CMNVECTOR && !CONFIG_ARMV7M_LAZYFPU && CONFIG_ARCH_FPU */ +#endif /* !CONFIG_ARMV7M_LAZYFPU && CONFIG_ARCH_FPU */ /* Enable or disable interrupts, based on user configuration */ diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c index 5dc4d8c2c5..be91eff109 100644 --- a/arch/arm/src/armv7-m/up_svcall.c +++ b/arch/arm/src/armv7-m/up_svcall.c @@ -179,8 +179,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) { DEBUGASSERT(regs[REG_R1] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); -#if defined(CONFIG_ARCH_FPU) && \ - (!defined(CONFIG_ARMV7M_CMNVECTOR) || defined(CONFIG_ARMV7M_LAZYFPU)) +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) up_savefpu((uint32_t *)regs[REG_R1]); #endif } @@ -228,8 +227,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) { DEBUGASSERT(regs[REG_R1] != 0 && regs[REG_R2] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); -#if defined(CONFIG_ARCH_FPU) && \ - (!defined(CONFIG_ARMV7M_CMNVECTOR) || defined(CONFIG_ARMV7M_LAZYFPU)) +#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) up_savefpu((uint32_t *)regs[REG_R1]); #endif CURRENT_REGS = (uint32_t *)regs[REG_R2]; diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h index 31d264828d..49879dd9be 100644 --- a/arch/arm/src/common/up_internal.h +++ b/arch/arm/src/common/up_internal.h @@ -121,11 +121,9 @@ /* If the floating point unit is present and enabled, then save the * floating point registers as well as normal ARM registers. This only * applies if "lazy" floating point register save/restore is used - * (i.e., not CONFIG_ARMV7M_CMNVECTOR=y with CONFIG_ARMV7M_LAZYFPU=n). */ -# if defined(CONFIG_ARCH_FPU) && (!defined(CONFIG_ARMV7M_CMNVECTOR) || \ - defined(CONFIG_ARMV7M_LAZYFPU)) +# if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) # define up_savestate(regs) up_copyarmstate(regs, (uint32_t*)CURRENT_REGS) # else # define up_savestate(regs) up_copyfullstate(regs, (uint32_t*)CURRENT_REGS) diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs index 2e27e1d761..c8e7a102c3 100644 --- a/arch/arm/src/efm32/Make.defs +++ b/arch/arm/src/efm32/Make.defs @@ -50,14 +50,12 @@ CMN_CSRCS += up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c CMN_CSRCS += up_sigdeliver.c up_stackframe.c up_svcall.c up_systemreset.c CMN_CSRCS += up_udelay.c up_unblocktask.c up_usestack.c up_vfork.c -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c diff --git a/arch/arm/src/imxrt/Make.defs b/arch/arm/src/imxrt/Make.defs index be72815971..645d484164 100644 --- a/arch/arm/src/imxrt/Make.defs +++ b/arch/arm/src/imxrt/Make.defs @@ -85,11 +85,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif # Required i.MX RT files diff --git a/arch/arm/src/imxrt/imxrt_start.c b/arch/arm/src/imxrt/imxrt_start.c index 4ae6ca40c8..ef35e27bd3 100644 --- a/arch/arm/src/imxrt/imxrt_start.c +++ b/arch/arm/src/imxrt/imxrt_start.c @@ -132,7 +132,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void imxrt_fpuconfig(void) { diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index 92f6d3de5e..1e07721082 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -54,14 +54,12 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index d7499a295b..3b891928a7 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -172,7 +172,7 @@ static inline void kinetis_fpuconfig(void) setcontrol(regval); /* Ensure that FPCCR.LSPEN is disabled, so that we don't have to contend - * with the lazy FP context save behaviour. Clear FPCCR.ASPEN since we + * with the lazy FP context save behavior. Clear FPCCR.ASPEN since we * are going to turn on CONTROL.FPCA for all contexts. */ diff --git a/arch/arm/src/lc823450/Make.defs b/arch/arm/src/lc823450/Make.defs index 5c07c28d82..c13cb52fcb 100644 --- a/arch/arm/src/lc823450/Make.defs +++ b/arch/arm/src/lc823450/Make.defs @@ -56,10 +56,8 @@ CMN_CSRCS += up_allocateheap.c # CMN_CSRCS += up_dwt.c CMN_CSRCS += up_stackframe.c -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_ASRCS += up_exception.S CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c diff --git a/arch/arm/src/lpc17xx/Make.defs b/arch/arm/src/lpc17xx/Make.defs index e06d2760cf..683cfe1017 100644 --- a/arch/arm/src/lpc17xx/Make.defs +++ b/arch/arm/src/lpc17xx/Make.defs @@ -57,14 +57,12 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs index 744768142c..59132b2b1a 100644 --- a/arch/arm/src/lpc43xx/Make.defs +++ b/arch/arm/src/lpc43xx/Make.defs @@ -47,14 +47,12 @@ CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c up_stackframe.c CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c CMN_CSRCS += up_svcall.c up_vfork.c -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c @@ -74,11 +72,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif CHIP_ASRCS = diff --git a/arch/arm/src/lpc43xx/lpc43_config.h b/arch/arm/src/lpc43xx/lpc43_config.h index 2d62045acf..d6df508ee0 100644 --- a/arch/arm/src/lpc43xx/lpc43_config.h +++ b/arch/arm/src/lpc43xx/lpc43_config.h @@ -46,18 +46,6 @@ * Pre-processor Definitions ************************************************************************************/ -/* Required configuration settings */ - -/* There are two version of the FPU support built into the most NuttX Cortex-M4 ports. - * The current LPC43xx port support only one of these options, the "Non-Lazy Floating - * Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR must be defined - * in *all* LPC43xx configuration files. - */ - -#ifndef CONFIG_ARMV7M_CMNVECTOR -# error "CONFIG_ARMV7M_CMNVECTOR must be defined for the LPC43xx" -#endif - /* Are any UARTs enabled? */ #undef HAVE_UART diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c index 5b3103197d..48684eddd8 100644 --- a/arch/arm/src/lpc43xx/lpc43_start.c +++ b/arch/arm/src/lpc43xx/lpc43_start.c @@ -186,7 +186,7 @@ static inline void lpc43_enabuffering(void) ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void lpc43_fpuconfig(void) { diff --git a/arch/arm/src/lpc54xx/Make.defs b/arch/arm/src/lpc54xx/Make.defs index 0df41b51b8..6af78a314f 100644 --- a/arch/arm/src/lpc54xx/Make.defs +++ b/arch/arm/src/lpc54xx/Make.defs @@ -72,11 +72,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif CHIP_ASRCS = diff --git a/arch/arm/src/lpc54xx/lpc54_start.c b/arch/arm/src/lpc54xx/lpc54_start.c index a9eaad1cf1..2ff749b68a 100644 --- a/arch/arm/src/lpc54xx/lpc54_start.c +++ b/arch/arm/src/lpc54xx/lpc54_start.c @@ -120,7 +120,7 @@ static const struct pll_setup_s g_initial_pll_setup = ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void lpc54_fpuconfig(void) { uint32_t regval; diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs index 5f1a94f99f..f4b858ace9 100644 --- a/arch/arm/src/nrf52/Make.defs +++ b/arch/arm/src/nrf52/Make.defs @@ -72,11 +72,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif CHIP_ASRCS = diff --git a/arch/arm/src/nrf52/nrf52_start.c b/arch/arm/src/nrf52/nrf52_start.c index a440e03d90..bb9d5f068e 100644 --- a/arch/arm/src/nrf52/nrf52_start.c +++ b/arch/arm/src/nrf52/nrf52_start.c @@ -102,7 +102,7 @@ ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void nrf52_fpuconfig(void) { uint32_t regval; diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index 5c83a6f116..0f4613a1a1 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -62,14 +62,12 @@ endif # Configuration-dependent common files -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs index 59992530d4..9e59ca22cf 100644 --- a/arch/arm/src/samv7/Make.defs +++ b/arch/arm/src/samv7/Make.defs @@ -64,14 +64,12 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARMV7M_DCACHE),y) CMN_CSRCS += arch_enable_dcache.c arch_disable_dcache.c @@ -84,11 +82,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) diff --git a/arch/arm/src/samv7/sam_start.c b/arch/arm/src/samv7/sam_start.c index 0e540b0ca5..ad4522b802 100644 --- a/arch/arm/src/samv7/sam_start.c +++ b/arch/arm/src/samv7/sam_start.c @@ -142,7 +142,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void sam_fpuconfig(void) { diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs index 62b6b11559..71a27b6751 100644 --- a/arch/arm/src/stm32/Make.defs +++ b/arch/arm/src/stm32/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/stm32/Make.defs # -# Copyright (C) 2009, 2011-2016 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2011-2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -33,11 +33,7 @@ # ############################################################################ -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) HEAD_ASRC = -else -HEAD_ASRC = stm32_vectors.S -endif CMN_UASRCS = CMN_UCSRCS = @@ -58,14 +54,12 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c @@ -85,11 +79,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) @@ -122,10 +112,6 @@ ifeq ($(CONFIG_STM32_FREERUN),y) CHIP_CSRCS += stm32_freerun.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) -CHIP_ASRCS += stm32_vectors.S -endif - ifeq ($(CONFIG_BUILD_PROTECTED),y) CHIP_CSRCS += stm32_userspace.c stm32_mpuinit.c endif diff --git a/arch/arm/src/stm32/chip.h b/arch/arm/src/stm32/chip.h index 58ede7d4be..73edab1d06 100644 --- a/arch/arm/src/stm32/chip.h +++ b/arch/arm/src/stm32/chip.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/stm32/chip.h * - * Copyright (C) 2009, 2011-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2014, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,10 @@ #include +/* Include the chip interrupt definition file */ + +#include + /* Include the chip pin configuration file */ /* STM32L EnergyLite Line ***********************************************************/ @@ -140,30 +144,6 @@ # error "No pinmap file for this STM32 chip" #endif -/* If the common ARMv7-M vector handling logic is used, then include the - * required vector definitions as well. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR -# if defined(CONFIG_STM32_STM32L15XX) -# include "chip/stm32l15xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F10XX) -# include "chip/stm32f10xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F20XX) -# include "chip/stm32f20xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F30XX) -# include "chip/stm32f30xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F33XX) -# include "chip/stm32f33xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F37XX) -# include "chip/stm32f37xxx_vectors.h" -# elif defined(CONFIG_STM32_STM32F4XXX) -# include "chip/stm32f40xxx_vectors.h" -# else -# error "No vector file for this STM32 family" -# endif -#endif - /* Include the chip memory map. */ #include "chip/stm32_memorymap.h" @@ -172,5 +152,12 @@ * Pre-processor Definitions ************************************************************************************/ +/* Provide the required number of peripheral interrupt vector definitions as well. + * The definition STM32_IRQ_NEXTINT simply comes from the chip-specific IRQ header + * file included by arch/stm32/irq.h. + */ + +#define ARMV7M_PERIPHERAL_INTERRUPTS STM32_IRQ_NEXTINT + #endif /* __ARCH_ARM_SRC_STM32_CHIP_H */ diff --git a/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h deleted file mode 100644 index 0af150638a..0000000000 --- a/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h +++ /dev/null @@ -1,284 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f10xxx_vectors.h - * - * Copyright (C) 2011 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies ach STM32F10xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f10xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -#if defined(CONFIG_STM32_VALUELINE) - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -# ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 61 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 61 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* Vector 16+0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* Vector 16+1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* Vector 16+2: Tamper interrupt */ -VECTOR(stm32_rtc, STM32_IRQ_RTC) /* Vector 16+3: RTC Wakeup through EXTI line interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* Vector 16+4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* Vector 16+5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* Vector 16+6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* Vector 16+7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* Vector 16+8: EXTI Line 2 interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* Vector 16+9: EXTI Line 3 interrupt */ -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* Vector 16+10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* Vector 16+11: DMA1 Channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* Vector 16+12: DMA1 Channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* Vector 16+13: DMA1 Channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* Vector 16+14: DMA1 Channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* Vector 16+15: DMA1 Channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* Vector 16+16: DMA1 Channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* Vector 16+17: DMA1 Channel 7 global interrupt */ -VECTOR(stm32_adc1, STM32_IRQ_ADC1) /* Vector 16+18: ADC1 global interrupt */ -UNUSED(STM32_IRQ_RESERVED0) /* Vector 16+19: Reserved 0 */ -UNUSED(STM32_IRQ_RESERVED1) /* Vector 16+20: Reserved 1 */ -UNUSED(STM32_IRQ_RESERVED2) /* Vector 16+21: Reserved 2 */ -UNUSED(STM32_IRQ_RESERVED3) /* Vector 16+22: Reserved 3 */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* Vector 16+23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* Vector 16+24: TIM1 Break interrupt; TIM15 global interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* Vector 16+25: TIM1 Update interrupt; TIM16 global interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* Vector 16+26: TIM1 Trigger and Commutation interrupts; TIM17 global interrupt */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* Vector 16+27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* Vector 16+28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* Vector 16+29: TIM3 global interrupt */ -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* Vector 16+30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* Vector 16+31: I2C1 event interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* Vector 16+32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* Vector 16+33: I2C2 event interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* Vector 16+34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* Vector 16+35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* Vector 16+36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* Vector 16+37: USART1 global interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* Vector 16+38: USART2 global interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* Vector 16+39: USART3 global interrupt */ -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* Vector 16+40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalr, STM32_IRQ_RTCALR) /* Vector 16+41: RTC alarms (A and B) through EXTI line interrupt */ -VECTOR(stm32_cec, STM32_IRQ_CEC) /* Vector 16+42: CEC global interrupt */ -VECTOR(stm32_tim12, STM32_IRQ_TIM12) /* Vector 16+43: TIM12 global interrupt */ -VECTOR(stm32_tim13, STM32_IRQ_TIM13) /* Vector 16+44: TIM13 global interrupt */ -VECTOR(stm32_tim14, STM32_IRQ_TIM14) /* Vector 16+45: TIM14 global interrupt */ -UNUSED(STM32_IRQ_RESERVED4) /* Vector 16+46: Reserved 4 */ -UNUSED(STM32_IRQ_RESERVED5) /* Vector 16+47: Reserved 5 */ -VECTOR(stm32_fsmc, STM32_IRQ_FSMC) /* Vector 16+48: FSMC global interrupt */ -UNUSED(STM32_IRQ_RESERVED6) /* Vector 16+49: Reserved 6 */ -VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* Vector 16+51: SPI3 global interrupt */ -VECTOR(stm32_uart4, STM32_IRQ_UART4) /* Vector 16+52: USART2 global interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */ -VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* Vector 16+56: DMA2 Channel 1 global interrupt */ -VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* Vector 16+57: DMA2 Channel 2 global interrupt */ -VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* Vector 16+58: DMA2 Channel 3 global interrupt */ -VECTOR(stm32_dma2ch45, STM32_IRQ_DMA2CH45) /* Vector 16+59: DMA2 Channel 4 and 5 global interrupt */ -VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* Vector 16+60: DMA2 Channel 5 global interrupt */ - -# endif /* CONFIG_ARMV7M_CMNVECTOR */ - -#elif defined(CONFIG_STM32_CONNECTIVITYLINE) - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 68 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 68 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* Vector 16+0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* Vector 16+1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* Vector 16+2: Tamper interrupt */ -VECTOR(stm32_rtc, STM32_IRQ_RTC) /* Vector 16+3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* Vector 16+4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* Vector 16+5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* Vector 16+6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* Vector 16+7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* Vector 16+8: EXTI Line 2 interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* Vector 16+9: EXTI Line 3 interrupt */ -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* Vector 16+10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* Vector 16+11: DMA1 Channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* Vector 16+12: DMA1 Channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* Vector 16+13: DMA1 Channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* Vector 16+14: DMA1 Channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* Vector 16+15: DMA1 Channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* Vector 16+16: DMA1 Channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* Vector 16+17: DMA1 Channel 7 global interrupt */ -VECTOR(stm32_adc12, STM32_IRQ_ADC12) /* Vector 16+18: ADC1 and ADC2 global interrupt */ -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* Vector 16+19: CAN1 TX interrupts */ -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* Vector 16+20: CAN1 RX0 interrupts */ -VECTOR(stm32_can1rx, STM32_IRQ_CAN1RX1) /* Vector 16+21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* Vector 16+22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* Vector 16+23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* Vector 16+24: TIM1 Break interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* Vector 16+25: TIM1 Update interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* Vector 16+27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* Vector 16+28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* Vector 16+29: TIM3 global interrupt */ -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* Vector 16+30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* Vector 16+31: I2C1 event interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* Vector 16+32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* Vector 16+33: I2C2 event interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* Vector 16+34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* Vector 16+35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* Vector 16+36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* Vector 16+37: USART1 global interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* Vector 16+38: USART2 global interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* Vector 16+39: USART3 global interrupt */ -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* Vector 16+40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalr, STM32_IRQ_RTCALRM) /* Vector 16+41: RTC alarm through EXTI line interrupt */ -VECTOR(stm32_otgfswkup, STM32_IRQ_OTGFSWKUP) /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ -UNUSED(STM32_IRQ_RESERVED0) /* Vector 16+43: Reserved 0 */ -UNUSED(STM32_IRQ_RESERVED1) /* Vector 16+44: Reserved 1 */ -UNUSED(STM32_IRQ_RESERVED2) /* Vector 16+55: Reserved 2 */ -UNUSED(STM32_IRQ_RESERVED3) /* Vector 16+46: Reserved 3 */ -UNUSED(STM32_IRQ_RESERVED4) /* Vector 16+47: Reserved 4 */ -UNUSED(STM32_IRQ_RESERVED5) /* Vector 16+48: Reserved 5 */ -UNUSED(STM32_IRQ_RESERVED6) /* Vector 16+49: Reserved 6 */ -VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3 ) /* Vector 16+51: SPI3 global interrupt */ -VECTOR(stm32_uart4 , STM32_IRQ_UART4) /* Vector 16+52: UART4 global interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */ -VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* Vector 16+56: DMA2 Channel 1 global interrupt */ -VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* Vector 16+57: DMA2 Channel 2 global interrupt */ -VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* Vector 16+58: DMA2 Channel 3 global interrupt */ -VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4) /* Vector 16+59: DMA2 Channel 4 global interrupt */ -VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* Vector 16+60: DMA2 Channel 5 global interrupt */ -VECTOR(stm32_eth, STM32_IRQ_ETH) /* Vector 16+61: Ethernet global interrupt */ -VECTOR(stm32_ethwkup, STM32_IRQ_ETHWKUP) /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ -VECTOR(stm32_can2tx, STM32_IRQ_CAN2TX) /* Vector 16+63: CAN2 TX interrupts */ -VECTOR(stm32_can2rx0, STM32_IRQ_CAN2RX0) /* Vector 16+64: CAN2 RX0 interrupts */ -VECTOR(stm32_can2rx1, STM32_IRQ_CAN2RX1) /* Vector 16+65: CAN2 RX1 interrupt */ -VECTOR(stm32_can2sce, STM32_IRQ_CAN2SCE) /* Vector 16+66: CAN2 SCE interrupt */ -VECTOR(stm32_otgfs, STM32_IRQ_OTGFS) /* Vector 16+67: USB On The Go FS global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ -#else /* CONFIG_STM32_CONNECTIVITYLINE */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 60 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 60 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* Vector 16+0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* Vector 16+1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* Vector 16+2: Tamper interrupt */ -VECTOR(stm32_rtc, STM32_IRQ_RTC) /* Vector 16+3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* Vector 16+4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* Vector 16+5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* Vector 16+6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* Vector 16+7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* Vector 16+8: EXTI Line 2 interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* Vector 16+9: EXTI Line 3 interrupt */ -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* Vector 16+10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* Vector 16+11: DMA1 Channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* Vector 16+12: DMA1 Channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* Vector 16+13: DMA1 Channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* Vector 16+14: DMA1 Channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* Vector 16+15: DMA1 Channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* Vector 16+16: DMA1 Channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* Vector 16+17: DMA1 Channel 7 global interrupt */ -VECTOR(stm32_adc12, STM32_IRQ_ADC12) /* Vector 16+18: ADC1 and ADC2 global interrupt */ -VECTOR(stm32_usbhpcantx, STM32_IRQ_USBHPCANTX) /* Vector 16+19: USB High Priority or CAN TX interrupts*/ -VECTOR(stm32_usblpcanrx0, STM32_IRQ_USBLPCANRX0) /* Vector 16+20: USB Low Priority or CAN RX0 interrupts*/ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* Vector 16+21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* Vector 16+22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* Vector 16+23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* Vector 16+24: TIM1 Break interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* Vector 16+25: TIM1 Update interrupt */ -VECTOR(stm32_tim1rtgcom, STM32_IRQ_TIM1TRGCOM) /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* Vector 16+27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* Vector 16+28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* Vector 16+29: TIM3 global interrupt */ -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* Vector 16+30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* Vector 16+31: I2C1 event interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* Vector 16+32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* Vector 16+33: I2C2 event interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* Vector 16+34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* Vector 16+35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* Vector 16+36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* Vector 16+37: USART1 global interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* Vector 16+38: USART2 global interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* Vector 16+39: USART3 global interrupt */ -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* Vector 16+40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalr, STM32_IRQ_RTCALRM) /* Vector 16+41: RTC alarm through EXTI line interrupt */ -VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP) /* Vector 16+42: USB wakeup from suspend through EXTI line interrupt*/ -VECTOR(stm32_tim8brk, STM32_IRQ_TIM8BRK) /* Vector 16+43: TIM8 Break interrupt */ -VECTOR(stm32_tim8up, STM32_IRQ_TIM8UP) /* Vector 16+44: TIM8 Update interrupt */ -VECTOR(stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM) /* Vector 16+45: TIM8 Trigger and Commutation interrupts */ -VECTOR(stm32_tim8cc, STM32_IRQ_TIM8CC) /* Vector 16+46: TIM8 Capture Compare interrupt */ -VECTOR(stm32_adc3, STM32_IRQ_ADC3) /* Vector 16+47: ADC3 global interrupt */ -VECTOR(stm32_fsmc, STM32_IRQ_FSMC) /* Vector 16+48: FSMC global interrupt */ -VECTOR(stm32_sdio, STM32_IRQ_SDIO) /* Vector 16+49: SDIO global interrupt */ -VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* Vector 16+51: SPI3 global interrupt */ -VECTOR(stm32_uart4, STM32_IRQ_UART4) /* Vector 16+52: UART4 global interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */ -VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* Vector 16+56: DMA2 Channel 1 global interrupt */ -VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* Vector 16+57: DMA2 Channel 2 global interrupt */ -VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* Vector 16+58: DMA2 Channel 3 global interrupt */ -VECTOR(stm32_dma2ch45, STM32_IRQ_DMA2CH45) /* Vector 16+59: DMA2 Channel 4&5 global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ -#endif /* CONFIG_STM32_CONNECTIVITYLINE */ diff --git a/arch/arm/src/stm32/chip/stm32f20xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f20xxx_vectors.h deleted file mode 100644 index 1fac7a3927..0000000000 --- a/arch/arm/src/stm32/chip/stm32f20xxx_vectors.h +++ /dev/null @@ -1,141 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f20xxx_vectors.h - * - * Copyright (C) 2012 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ - -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies ach STM32F20xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f20xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 82 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 82 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* Vector 16+0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* Vector 16+1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* Vector 16+2: Tamper and time stamp interrupts */ -VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* Vector 16+3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* Vector 16+4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* Vector 16+5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* Vector 16+6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* Vector 16+7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* Vector 16+8: EXTI Line 2 interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* Vector 16+9: EXTI Line 3 interrupt */ -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* Vector 16+10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1s0, STM32_IRQ_DMA1S0) /* Vector 16+11: DMA1 Stream 0 global interrupt */ -VECTOR(stm32_dma1s1, STM32_IRQ_DMA1S1) /* Vector 16+12: DMA1 Stream 1 global interrupt */ -VECTOR(stm32_dma1s2, STM32_IRQ_DMA1S2) /* Vector 16+13: DMA1 Stream 2 global interrupt */ -VECTOR(stm32_dma1s3, STM32_IRQ_DMA1S3) /* Vector 16+14: DMA1 Stream 3 global interrupt */ -VECTOR(stm32_dma1s4, STM32_IRQ_DMA1S4) /* Vector 16+15: DMA1 Stream 4 global interrupt */ -VECTOR(stm32_dma1s5, STM32_IRQ_DMA1S5) /* Vector 16+16: DMA1 Stream 5 global interrupt */ -VECTOR(stm32_dma1s6, STM32_IRQ_DMA1S6) /* Vector 16+17: DMA1 Stream 6 global interrupt */ -VECTOR(stm32_adc, STM32_IRQ_ADC) /* Vector 16+18: ADC1, ADC2, and ADC3 global interrupt */ -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* Vector 16+19: CAN1 TX interrupts */ -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* Vector 16+20: CAN1 RX0 interrupts */ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* Vector 16+21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* Vector 16+22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* Vector 16+23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* Vector 16+24: TIM1 Break interrupt/TIM9 global interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* Vector 16+25: TIM1 Update interrupt/TIM10 global interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* Vector 16+26: TIM1 Trigger and Commutation interrupts/TIM11 global interrupt */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* Vector 16+27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* Vector 16+28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* Vector 16+29: TIM3 global interrupt */ -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* Vector 16+30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* Vector 16+31: I2C1 event interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* Vector 16+32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* Vector 16+33: I2C2 event interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* Vector 16+34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* Vector 16+35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* Vector 16+36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* Vector 16+37: USART1 global interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* Vector 16+38: USART2 global interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* Vector 16+39: USART3 global interrupt */ -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* Vector 16+40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* Vector 16+41: RTC alarm through EXTI line interrupt */ -VECTOR(stm32_otgfswkup, STM32_IRQ_OTGFSWKUP) /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ -VECTOR(stm32_tim8brk, STM32_IRQ_TIM8BRK) /* Vector 16+43: TIM8 Break interrupt/TIM12 global interrupt */ -VECTOR(stm32_tim8up, STM32_IRQ_TIM8UP) /* Vector 16+44: TIM8 Update interrup/TIM13 global interrupt */ -VECTOR(stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM) /* Vector 16+45: TIM8 Trigger and Commutation interrupts/TIM14 global interrupt */ -VECTOR(stm32_tim8cc, STM32_IRQ_TIM8CC) /* Vector 16+46: TIM8 Capture Compare interrupt */ -VECTOR(stm32_dma1s7, STM32_IRQ_DMA1S7) /* Vector 16+47: DMA1 Stream 7 global interrupt */ -VECTOR(stm32_fsmc, STM32_IRQ_FSMC) /* Vector 16+48: FSMC global interrupt */ -VECTOR(stm32_sdio, STM32_IRQ_SDIO) /* Vector 16+49: SDIO global interrupt */ -VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* Vector 16+51: SPI3 global interrupt */ -VECTOR(stm32_uart4, STM32_IRQ_UART4) /* Vector 16+52: UART4 global interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt/DAC1 and DAC2 underrun error interrupts */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */ -VECTOR(stm32_dma2s0, STM32_IRQ_DMA2S0) /* Vector 16+56: DMA2 Stream 0 global interrupt */ -VECTOR(stm32_dma2s1, STM32_IRQ_DMA2S1) /* Vector 16+57: DMA2 Stream 1 global interrupt */ -VECTOR(stm32_dma2s2, STM32_IRQ_DMA2S2) /* Vector 16+58: DMA2 Stream 2 global interrupt */ -VECTOR(stm32_dma2s3, STM32_IRQ_DMA2S3) /* Vector 16+59: DMA2 Stream 3 global interrupt */ -VECTOR(stm32_dma2s4, STM32_IRQ_DMA2S4) /* Vector 16+60: DMA2 Stream 4 global interrupt */ -VECTOR(stm32_eth, STM32_IRQ_ETH) /* Vector 16+61: Ethernet global interrupt */ -VECTOR(stm32_ethwkup, STM32_IRQ_ETHWKUP) /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ -VECTOR(stm32_can2tx, STM32_IRQ_CAN2TX) /* Vector 16+63: CAN2 TX interrupts */ -VECTOR(stm32_can2rx0, STM32_IRQ_CAN2RX0) /* Vector 16+64: CAN2 RX0 interrupts */ -VECTOR(stm32_can2rx1, STM32_IRQ_CAN2RX1) /* Vector 16+65: CAN2 RX1 interrupt */ -VECTOR(stm32_can2sce, STM32_IRQ_CAN2SCE) /* Vector 16+66: CAN2 SCE interrupt */ -VECTOR(stm32_otgfs, STM32_IRQ_OTGFS) /* Vector 16+67: USB On The Go FS global interrupt */ -VECTOR(stm32_dma2s5, STM32_IRQ_DMA2S5) /* Vector 16+68: DMA2 Stream 5 global interrupt */ -VECTOR(stm32_dma2s6, STM32_IRQ_DMA2S6) /* Vector 16+69: DMA2 Stream 6 global interrupt */ -VECTOR(stm32_dma2s7, STM32_IRQ_DMA2S7) /* Vector 16+70: DMA2 Stream 7 global interrupt */ -VECTOR(stm32_usart6, STM32_IRQ_USART6) /* Vector 16+71: USART6 global interrupt */ -VECTOR(stm32_i2c3ev, STM32_IRQ_I2C3EV) /* Vector 16+72: I2C3 event interrupt */ -VECTOR(stm32_i2c3er, STM32_IRQ_I2C3ER) /* Vector 16+73: I2C3 error interrupt */ -VECTOR(stm32_otghsep1out, STM32_IRQ_OTGHSEP1OUT) /* Vector 16+74: USB On The Go HS End Point 1 Out global interrupt */ -VECTOR(stm32_otghsep1in, STM32_IRQ_OTGHSEP1IN) /* Vector 16+75: USB On The Go HS End Point 1 In global interrupt */ -VECTOR(stm32_otghswkup, STM32_IRQ_OTGHSWKUP) /* Vector 16+76: USB On The Go HS Wakeup through EXTI interrupt */ -VECTOR(stm32_otghs, STM32_IRQ_OTGHS) /* Vector 16+77: USB On The Go HS global interrupt */ -VECTOR(stm32_dcmi, STM32_IRQ_DCMI) /* Vector 16+78: DCMI global interrupt */ -VECTOR(stm32_cryp, STM32_IRQ_CRYP) /* Vector 16+79: CRYP crypto global interrupt */ -VECTOR(stm32_hash, STM32_IRQ_HASH) /* Vector 16+80: Hash and Rng global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ diff --git a/arch/arm/src/stm32/chip/stm32f30xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f30xxx_vectors.h deleted file mode 100644 index e28ecb591f..0000000000 --- a/arch/arm/src/stm32/chip/stm32f30xxx_vectors.h +++ /dev/null @@ -1,149 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f30xxx_vectors.h - * - * Copyright (C) 2011 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies each STM32F30xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f30xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 82 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 82 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper or Time stamp interrupt */ -VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 or TSC interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ -VECTOR(stm32_adc12, STM32_IRQ_ADC12) /* 18: ADC1/ADC2 global interrupt */ -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* 19: USB High Priority or CAN1 TX interrupts */ - -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* 20: USB Low Priority or CAN1 RX0 interrupts*/ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* 21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* 22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* 24: TIM1 Break or TIM15 global interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* 25: TIM1 Update or TIM16 global interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* 26: TIM1 Trigger or TIM17 global interrupt */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* 27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* 30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event or EXTI Line23 interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* 33: I2C2 event or EXTI Line24 interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* 34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* 36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global or EXTI Line 25 interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global or EXTI Line 26 interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global or EXTI Line 28 interrupt */ - -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ -VECTOR(stm32_ext18, STM32_IRQ_EXT18) /* 42: USB wakeup or EXTI Line 18 interrupt */ -VECTOR(stm32_tim8brk, STM32_IRQ_TIM8BRK) /* 43: TIM8 Break interrupt */ -VECTOR(stm32_tim8up, STM32_IRQ_TIM8UP) /* 44: TIM8 Update interrupt */ -VECTOR(stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM) /* 45: TIM8 Trigger and Commutation interrupts */ -VECTOR(stm32_tim8cc, STM32_IRQ_TIM8CC) /* 46: TIM8 Capture Compare interrupt */ -VECTOR(stm32_adc3, STM32_IRQ_ADC3) /* 47: ADC3 global interrupt */ -UNUSED(STM32_IRQ_RESERVED48) /* 48: Reserved */ -UNUSED(STM32_IRQ_RESERVED49) /* 49: Reserved */ - -UNUSED(STM32_IRQ_RESERVED50) /* 50: Reserved */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* 51: SPI3 global interrupt */ -VECTOR(stm32_uart4, STM32_IRQ_UART4) /* 52: UART4 global or EXTI Line 34 interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* 53: UART5 global or EXTI Line 35 interrupt */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* 54: TIM6 global or DAC1/2 underrun interrupts */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* 55: TIM7 global interrupt */ -VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* 56: DMA2 channel 1 global interrupt */ -VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* 57: DMA2 channel 2 global interrupt */ -VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* 58: DMA2 channel 3 global interrupt */ -VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4) /* 59: DMA2 channel 4 global interrupt */ - -VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* 60: DMA2 channel 5 global interrupt */ -VECTOR(stm32_adc4, STM32_IRQ_ADC4) /* 61: ADC4 global interrupt */ -UNUSED(STM32_IRQ_RESERVED62) /* 62: Reserved */ -UNUSED(STM32_IRQ_RESERVED63) /* 63: Reserved */ -VECTOR(stm32_comp123, STM32_IRQ_COMP123) /* 64: COMP1-3 or EXTI Lines 21-2 and 29 interrupts */ -VECTOR(stm32_comp456, STM32_IRQ_COMP456) /* 65: COMP4-6 or EXTI Lines 30-2 interrupts */ -VECTOR(stm32_comp7, STM32_IRQ_COMP7) /* 66: COMP7 or EXTI Line 33 interrupt */ -UNUSED(STM32_IRQ_RESERVED67) /* 67: Reserved */ -UNUSED(STM32_IRQ_RESERVED68) /* 68: Reserved */ -UNUSED(STM32_IRQ_RESERVED69) /* 69: Reserved */ - -UNUSED(STM32_IRQ_RESERVED70) /* 70: Reserved */ -UNUSED(STM32_IRQ_RESERVED71) /* 71: Reserved */ -UNUSED(STM32_IRQ_RESERVED72) /* 72: Reserved */ -UNUSED(STM32_IRQ_RESERVED73) /* 73: Reserved */ -VECTOR(stm32_usbhp, STM32_IRQ_USBHP_2) /* 74: USB High priority interrupt */ -VECTOR(stm32_usblp, STM32_IRQ_USBLP_2) /* 75: USB Low priority interrupt */ -VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP_2) /* 76: USB wakeup from suspend through EXTI line interrupt*/ -UNUSED(STM32_IRQ_RESERVED77) /* 77: Reserved */ -UNUSED(STM32_IRQ_RESERVED78) /* 78: Reserved */ -UNUSED(STM32_IRQ_RESERVED79) /* 79: Reserved */ - -UNUSED(STM32_IRQ_RESERVED80) /* 80: Reserved */ -VECTOR(stm32_fpu, STM32_IRQ_FPU) /* 81: FPU global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ diff --git a/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h deleted file mode 100644 index cd1077a5e2..0000000000 --- a/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h +++ /dev/null @@ -1,151 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f33xxx_vectors.h - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * Modified for STM32F334 by Mateusz Szafoni - * - * 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies each STM32F33xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f33xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 82 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 82 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper or Time stamp interrupt */ -VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 or TSC interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ -VECTOR(stm32_adc12, STM32_IRQ_ADC12) /* 18: ADC1/ADC2 global interrupt */ -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* 19: USB High Priority or CAN1 TX interrupts */ - -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* 20: USB Low Priority or CAN1 RX0 interrupts*/ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* 21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* 22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* 24: TIM1 Break or TIM15 global interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* 25: TIM1 Update or TIM16 global interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* 26: TIM1 Trigger or TIM17 global interrupt */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* 27: TIM1 Capture Compare interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - -UNUSED(STM32_IRQ_RESERVED30) /* 30: Reserved */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event or EXTI Line23 interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ -UNUSED(STM32_IRQ_RESERVED33) /* 33: Reserved */ -UNUSED(STM32_IRQ_RESERVED34) /* 34: Reserved */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ -UNUSED(STM32_IRQ_RESERVED36) /* 36: Reserved */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global or EXTI Line 25 interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global or EXTI Line 26 interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global or EXTI Line 28 interrupt */ - -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ -UNUSED(STM32_IRQ_RESERVED42) /* 42: Reserved */ -UNUSED(STM32_IRQ_RESERVED43) /* 43: Reserved */ -UNUSED(STM32_IRQ_RESERVED44) /* 44: Reserved */ -UNUSED(STM32_IRQ_RESERVED45) /* 45: Reserved */ -UNUSED(STM32_IRQ_RESERVED46) /* 46: Reserved */ -UNUSED(STM32_IRQ_RESERVED47) /* 47: Reserved*/ -UNUSED(STM32_IRQ_RESERVED48) /* 48: Reserved */ -UNUSED(STM32_IRQ_RESERVED49) /* 49: Reserved */ - -UNUSED(STM32_IRQ_RESERVED50) /* 50: Reserved */ -UNUSED(STM32_IRQ_RESERVED51) /* 51: Reserved */ -UNUSED(STM32_IRQ_RESERVED51) /* 52: Reserved */ -UNUSED(STM32_IRQ_RESERVED52) /* 53: Reserved */ -VECTOR(stm32_dac1, STM32_IRQ_DAC1) /* 54: TIM6 global or DAC1 underrun interrupts */ -VECTOR(stm32_dac2, STM32_IRQ_DAC2) /* 55: TIM7 global or DAC2 underrun interrupt */ -UNUSED(STM32_IRQ_RESERVED56) /* 56: Reserved */ -UNUSED(STM32_IRQ_RESERVED57) /* 57: Reserved */ -UNUSED(STM32_IRQ_RESERVED58) /* 58: Reserved */ -UNUSED(STM32_IRQ_RESERVED59) /* 59: Reserved */ - -UNUSED(STM32_IRQ_RESERVED60) /* 60: Reserved */ -UNUSED(STM32_IRQ_RESERVED61) /* 61: Reserved */ -UNUSED(STM32_IRQ_RESERVED62) /* 62: Reserved */ -UNUSED(STM32_IRQ_RESERVED63) /* 63: Reserved */ -VECTOR(stm32_comp2, STM32_IRQ_COMP2) /* 64: COMP2 or EXTI Lines 21-2 and 29 interrupts */ -VECTOR(stm32_comp46, STM32_IRQ_COMP46) /* 65: COMP4/COMP6 or EXTI Lines 30-2 interrupts */ -UNUSED(STM32_IRQ_RESERVED66) /* 66: Reserved */ -VECTOR(stm32_hrtim_tm, STM32_IRQ_HRTIMTM) /* 67: HRTIM master timer interrutp */ -VECTOR(stm32_hrtim_ta, STM32_IRQ_HRTIMTA) /* 68: HRTIM timer A interrutp */ -VECTOR(stm32_hrtim_tb, STM32_IRQ_HRTIMTB) /* 69: HRTIM timer B interrutp */ - -VECTOR(stm32_hrtim_tc, STM32_IRQ_HRTIMTC) /* 70: HRTIM timer C interrutp */ -VECTOR(stm32_hrtim_td, STM32_IRQ_HRTIMTD) /* 71: HRTIM timer D interrutp */ -VECTOR(stm32_hrtim_te, STM32_IRQ_HRTIMTE) /* 72: HRTIM timer E interrutp */ -VECTOR(stm32_hrtim_flt, STM32_IRQ_HRTIMFLT) /* 73: HRTIM fault interrutp */ -UNUSED(STM32_IRQ_RESERVED73) /* 74: Reserved */ -UNUSED(STM32_IRQ_RESERVED74) /* 75: Reserved */ -UNUSED(STM32_IRQ_RESERVED75) /* 76: Reserved */ -UNUSED(STM32_IRQ_RESERVED76) /* 77: Reserved */ -UNUSED(STM32_IRQ_RESERVED77) /* 78: Reserved */ -UNUSED(STM32_IRQ_RESERVED78) /* 79: Reserved */ - -UNUSED(STM32_IRQ_RESERVED79) /* 80: Reserved */ -UNUSED(STM32_IRQ_RESERVED80) /* 81: Reserved */ -VECTOR(stm32_fpu, STM32_IRQ_FPU) /* 82: FPU global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ diff --git a/arch/arm/src/stm32/chip/stm32f37xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f37xxx_vectors.h deleted file mode 100644 index c85269daf5..0000000000 --- a/arch/arm/src/stm32/chip/stm32f37xxx_vectors.h +++ /dev/null @@ -1,150 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f37xxx_vectors.h - * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * Modified for STM32F373 by Marten Svanfeldt - * - * 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies each STM32F37xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f37xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 82 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 82 - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper or Time stamp interrupt */ -VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 or TSC interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ -VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ -VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ -VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ -VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ -VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ -VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ -VECTOR(stm32_adc1, STM32_IRQ_ADC1) /* 18: ADC1 global interrupt */ -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* 19: CAN1 TX interrupts */ - -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* 20: CAN1 RX0 interrupts*/ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* 21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* 22: CAN1 SCE interrupt */ -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim15, STM32_IRQ_TIM15) /* 24: TIM15 global interrupt */ -VECTOR(stm32_tim16, STM32_IRQ_TIM16) /* 25: TIM16 global interrupt */ -VECTOR(stm32_tim17, STM32_IRQ_TIM17) /* 26: TIM17 global interrupt */ -VECTOR(stm32_tim18, STM32_IRQ_TIM18) /* 27: TIM18 global interrupt or DAC2 interrupt */ -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* 30: TIM4 global interrupt */ -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event or EXTI Line23 interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* 33: I2C2 event or EXTI Line24 interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* 34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* 36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global or EXTI Line 25 interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global or EXTI Line 26 interrupt */ -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global or EXTI Line 28 interrupt */ - -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ -VECTOR(stm32_cec, STM32_IRQ_CEC) /* 42: CEC global interrupt */ -VECTOR(stm32_tim12, STM32_IRQ_TIM12) /* 43: TIM12 global interrupt */ -VECTOR(stm32_tim13, STM32_IRQ_TIM13) /* 44: TIM13 global interrupt */ -VECTOR(stm32_tim14, STM32_IRQ_TIM14) /* 45: TIM14 global interrupt */ -UNUSED(STM32_IRQ_RESERVED46) /* 46: Reserved */ -UNUSED(STM32_IRQ_RESERVED47) /* 47: Reserved */ -UNUSED(STM32_IRQ_RESERVED48) /* 48: Reserved */ -UNUSED(STM32_IRQ_RESERVED49) /* 49: Reserved */ - -UNUSED(STM32_IRQ_RESERVED50) /* 50: Reserved */ -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* 51: SPI3 global interrupt */ -UNUSED(STM32_IRQ_RESERVED52) /* 52: Reserved */ -UNUSED(STM32_IRQ_RESERVED53) /* 53: Reserved */ -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* 54: TIM6 global or DAC1 underrun interrupts */ -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* 55: TIM7 global interrupt */ -VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* 56: DMA2 channel 1 global interrupt */ -VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* 57: DMA2 channel 2 global interrupt */ -VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* 58: DMA2 channel 3 global interrupt */ -VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4) /* 59: DMA2 channel 4 global interrupt */ - -VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* 60: DMA2 channel 5 global interrupt */ -VECTOR(stm32_sdadc1, STM32_IRQ_SDADC1) /* 61: SDADC1 global interrupt */ -VECTOR(stm32_sdadc2, STM32_IRQ_SDADC2) /* 62: SDADC2 global interrupt */ -VECTOR(stm32_sdadc3, STM32_IRQ_SDADC3) /* 63: SDADC3 global interrupt */ -VECTOR(stm32_comp12, STM32_IRQ_COMP12) /* 64: COMP1-2 */ -UNUSED(STM32_IRQ_RESERVED65) /* 65: Reserved */ -UNUSED(STM32_IRQ_RESERVED66) /* 66: Reserved */ -UNUSED(STM32_IRQ_RESERVED67) /* 67: Reserved */ -UNUSED(STM32_IRQ_RESERVED68) /* 68: Reserved */ -UNUSED(STM32_IRQ_RESERVED69) /* 69: Reserved */ - -UNUSED(STM32_IRQ_RESERVED70) /* 70: Reserved */ -UNUSED(STM32_IRQ_RESERVED71) /* 71: Reserved */ -UNUSED(STM32_IRQ_RESERVED72) /* 72: Reserved */ -UNUSED(STM32_IRQ_RESERVED73) /* 73: Reserved */ -VECTOR(stm32_usbhp, STM32_IRQ_USBHP) /* 74: USB High priority interrupt */ -VECTOR(stm32_usblp, STM32_IRQ_USBLP) /* 75: USB Low priority interrupt */ -VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP) /* 76: USB wakeup from suspend through EXTI line interrupt*/ -UNUSED(STM32_IRQ_RESERVED77) /* 77: Reserved */ -UNUSED(STM32_IRQ_RESERVED78) /* 78: Reserved */ -UNUSED(STM32_IRQ_RESERVED79) /* 79: Reserved */ - -UNUSED(STM32_IRQ_RESERVED80) /* 80: Reserved */ -VECTOR(stm32_fpu, STM32_IRQ_FPU) /* 81: FPU global interrupt */ - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ diff --git a/arch/arm/src/stm32/chip/stm32f40xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f40xxx_vectors.h deleted file mode 100644 index 31546ed7e6..0000000000 --- a/arch/arm/src/stm32/chip/stm32f40xxx_vectors.h +++ /dev/null @@ -1,321 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32f40xxx_vectors.h - * - * Copyright (C) 2011-2012, 2014-2015, 2017 Gregory Nutt. All rights reserved. - * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. - * Author: Gregory Nutt - * David Sidrane - * Paul Alexander Patience - * - * 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ - -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies each STM32F40xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f40xxx_irq.h. - * stm32_vectors.S will define the VECTOR macro in different ways in order to generate - * the interrupt vectors and handlers in their final form. - */ - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve interrupt table entries for I/O interrupts. */ - -# if defined(CONFIG_STM32_STM32F401) || defined(CONFIG_STM32_STM32F411) || \ - defined(CONFIG_STM32_STM32F405) || defined(CONFIG_STM32_STM32F407) -# define ARMV7M_PERIPHERAL_INTERRUPTS 82 -# elif defined(CONFIG_STM32_STM32F410) -# define ARMV7M_PERIPHERAL_INTERRUPTS 98 -# elif defined(CONFIG_STM32_STM32F427) -# define ARMV7M_PERIPHERAL_INTERRUPTS 87 -# elif defined(CONFIG_STM32_STM32F429) -# define ARMV7M_PERIPHERAL_INTERRUPTS 91 -# elif defined(CONFIG_STM32_STM32F446) -# define ARMV7M_PERIPHERAL_INTERRUPTS 97 -# elif defined(CONFIG_STM32_STM32F469) -# define ARMV7M_PERIPHERAL_INTERRUPTS 93 -# endif - -#else - -VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* Vector 16+0: Window Watchdog interrupt */ -VECTOR(stm32_pvd, STM32_IRQ_PVD) /* Vector 16+1: PVD through EXTI Line detection interrupt */ -VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* Vector 16+2: Tamper and time stamp interrupts */ -VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* Vector 16+3: RTC global interrupt */ -VECTOR(stm32_flash, STM32_IRQ_FLASH) /* Vector 16+4: Flash global interrupt */ -VECTOR(stm32_rcc, STM32_IRQ_RCC) /* Vector 16+5: RCC global interrupt */ -VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* Vector 16+6: EXTI Line 0 interrupt */ -VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* Vector 16+7: EXTI Line 1 interrupt */ -VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* Vector 16+8: EXTI Line 2 interrupt */ -VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* Vector 16+9: EXTI Line 3 interrupt */ -VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* Vector 16+10: EXTI Line 4 interrupt */ -VECTOR(stm32_dma1s0, STM32_IRQ_DMA1S0) /* Vector 16+11: DMA1 Stream 0 global interrupt */ -VECTOR(stm32_dma1s1, STM32_IRQ_DMA1S1) /* Vector 16+12: DMA1 Stream 1 global interrupt */ -VECTOR(stm32_dma1s2, STM32_IRQ_DMA1S2) /* Vector 16+13: DMA1 Stream 2 global interrupt */ -VECTOR(stm32_dma1s3, STM32_IRQ_DMA1S3) /* Vector 16+14: DMA1 Stream 3 global interrupt */ -VECTOR(stm32_dma1s4, STM32_IRQ_DMA1S4) /* Vector 16+15: DMA1 Stream 4 global interrupt */ -VECTOR(stm32_dma1s5, STM32_IRQ_DMA1S5) /* Vector 16+16: DMA1 Stream 5 global interrupt */ -VECTOR(stm32_dma1s6, STM32_IRQ_DMA1S6) /* Vector 16+17: DMA1 Stream 6 global interrupt */ -VECTOR(stm32_adc, STM32_IRQ_ADC) /* Vector 16+18: ADC1, ADC2, and ADC3 global interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED19) /* Vector 16+19: Reserved */ -UNUSED(STM32_IRQ_RESERVED20) /* Vector 16+20: Reserved */ -UNUSED(STM32_IRQ_RESERVED21) /* Vector 16+21: Reserved */ -UNUSED(STM32_IRQ_RESERVED22) /* Vector 16+22: Reserved */ -#else -VECTOR(stm32_can1tx, STM32_IRQ_CAN1TX) /* Vector 16+19: CAN1 TX interrupts */ -VECTOR(stm32_can1rx0, STM32_IRQ_CAN1RX0) /* Vector 16+20: CAN1 RX0 interrupts */ -VECTOR(stm32_can1rx1, STM32_IRQ_CAN1RX1) /* Vector 16+21: CAN1 RX1 interrupt */ -VECTOR(stm32_can1sce, STM32_IRQ_CAN1SCE) /* Vector 16+22: CAN1 SCE interrupt */ -#endif - -VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* Vector 16+23: EXTI Line[9:5] interrupts */ -VECTOR(stm32_tim1brk, STM32_IRQ_TIM1BRK) /* Vector 16+24: TIM1 Break interrupt/TIM9 global interrupt */ -VECTOR(stm32_tim1up, STM32_IRQ_TIM1UP) /* Vector 16+25: TIM1 Update interrupt/TIM10 global interrupt */ -VECTOR(stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM) /* Vector 16+26: TIM1 Trigger and Commutation interrupts/TIM11 global interrupt */ -VECTOR(stm32_tim1cc, STM32_IRQ_TIM1CC) /* Vector 16+27: TIM1 Capture Compare interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED28) /* Vector 16+28: Reserved */ -UNUSED(STM32_IRQ_RESERVED29) /* Vector 16+29: Reserved */ -UNUSED(STM32_IRQ_RESERVED30) /* Vector 16+30: Reserved */ -#else -VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* Vector 16+28: TIM2 global interrupt */ -VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* Vector 16+29: TIM3 global interrupt */ -VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* Vector 16+30: TIM4 global interrupt */ -#endif - -VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* Vector 16+31: I2C1 event interrupt */ -VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* Vector 16+32: I2C1 error interrupt */ -VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* Vector 16+33: I2C2 event interrupt */ -VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* Vector 16+34: I2C2 error interrupt */ -VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* Vector 16+35: SPI1 global interrupt */ -VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* Vector 16+36: SPI2 global interrupt */ -VECTOR(stm32_usart1, STM32_IRQ_USART1) /* Vector 16+37: USART1 global interrupt */ -VECTOR(stm32_usart2, STM32_IRQ_USART2) /* Vector 16+38: USART2 global interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED39) /* Vector 16+39: Reserved */ -#else -VECTOR(stm32_usart3, STM32_IRQ_USART3) /* Vector 16+39: USART3 global interrupt */ -#endif - -VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* Vector 16+40: EXTI Line[15:10] interrupts */ -VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* Vector 16+41: RTC alarm through EXTI line interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED42) /* Vector 16+42: Reserved */ -UNUSED(STM32_IRQ_RESERVED43) /* Vector 16+43: Reserved */ -UNUSED(STM32_IRQ_RESERVED44) /* Vector 16+44: Reserved */ -UNUSED(STM32_IRQ_RESERVED45) /* Vector 16+45: Reserved */ -UNUSED(STM32_IRQ_RESERVED46) /* Vector 16+46: Reserved */ -#else -VECTOR(stm32_otgfswkup, STM32_IRQ_OTGFSWKUP) /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ -VECTOR(stm32_tim8brk, STM32_IRQ_TIM8BRK) /* Vector 16+43: TIM8 Break interrupt/TIM12 global interrupt */ -VECTOR(stm32_tim8up, STM32_IRQ_TIM8UP) /* Vector 16+44: TIM8 Update interrupt/TIM13 global interrupt */ -VECTOR(stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM) /* Vector 16+45: TIM8 Trigger and Commutation interrupts/TIM14 global interrupt */ -VECTOR(stm32_tim8cc, STM32_IRQ_TIM8CC) /* Vector 16+46: TIM8 Capture Compare interrupt */ -#endif - -VECTOR(stm32_dma1s7, STM32_IRQ_DMA1S7) /* Vector 16+47: DMA1 Stream 7 global interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED48) /* Vector 16+48: Reserved */ -UNUSED(STM32_IRQ_RESERVED49) /* Vector 16+49: Reserved */ -#else -VECTOR(stm32_fsmc, STM32_IRQ_FSMC) /* Vector 16+48: FSMC global interrupt */ -VECTOR(stm32_sdio, STM32_IRQ_SDIO) /* Vector 16+49: SDIO global interrupt */ -#endif - -VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED51) /* Vector 16+51: Reserved */ -UNUSED(STM32_IRQ_RESERVED52) /* Vector 16+52: Reserved */ -UNUSED(STM32_IRQ_RESERVED53) /* Vector 16+53: Reserved */ -#else -VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* Vector 16+51: SPI3 global interrupt */ -VECTOR(stm32_uart4, STM32_IRQ_UART4) /* Vector 16+52: UART4 global interrupt */ -VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */ -#endif - -VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt/DAC1 and DAC2 underrun error interrupts */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED55) /* Vector 16+55: Reserved */ -#else -VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */ -#endif - -VECTOR(stm32_dma2s0, STM32_IRQ_DMA2S0) /* Vector 16+56: DMA2 Stream 0 global interrupt */ -VECTOR(stm32_dma2s1, STM32_IRQ_DMA2S1) /* Vector 16+57: DMA2 Stream 1 global interrupt */ -VECTOR(stm32_dma2s2, STM32_IRQ_DMA2S2) /* Vector 16+58: DMA2 Stream 2 global interrupt */ -VECTOR(stm32_dma2s3, STM32_IRQ_DMA2S3) /* Vector 16+59: DMA2 Stream 3 global interrupt */ -VECTOR(stm32_dma2s4, STM32_IRQ_DMA2S4) /* Vector 16+60: DMA2 Stream 4 global interrupt */ - -#if defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED61) /* Vector 16+61: Reserved */ -UNUSED(STM32_IRQ_RESERVED62) /* Vector 16+62: Reserved */ -#else -VECTOR(stm32_eth, STM32_IRQ_ETH) /* Vector 16+61: Ethernet global interrupt */ -VECTOR(stm32_ethwkup, STM32_IRQ_ETHWKUP) /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ -#endif - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED63) /* Vector 16+63: Reserved */ -UNUSED(STM32_IRQ_RESERVED64) /* Vector 16+64: Reserved */ -UNUSED(STM32_IRQ_RESERVED65) /* Vector 16+65: Reserved */ -UNUSED(STM32_IRQ_RESERVED66) /* Vector 16+66: Reserved */ -UNUSED(STM32_IRQ_RESERVED67) /* Vector 16+67: Reserved */ -#else -VECTOR(stm32_can2tx, STM32_IRQ_CAN2TX) /* Vector 16+63: CAN2 TX interrupts */ -VECTOR(stm32_can2rx0, STM32_IRQ_CAN2RX0) /* Vector 16+64: CAN2 RX0 interrupts */ -VECTOR(stm32_can2rx1, STM32_IRQ_CAN2RX1) /* Vector 16+65: CAN2 RX1 interrupt */ -VECTOR(stm32_can2sce, STM32_IRQ_CAN2SCE) /* Vector 16+66: CAN2 SCE interrupt */ -VECTOR(stm32_otgfs, STM32_IRQ_OTGFS) /* Vector 16+67: USB On The Go FS global interrupt */ -#endif - -VECTOR(stm32_dma2s5, STM32_IRQ_DMA2S5) /* Vector 16+68: DMA2 Stream 5 global interrupt */ -VECTOR(stm32_dma2s6, STM32_IRQ_DMA2S6) /* Vector 16+69: DMA2 Stream 6 global interrupt */ -VECTOR(stm32_dma2s7, STM32_IRQ_DMA2S7) /* Vector 16+70: DMA2 Stream 7 global interrupt */ -VECTOR(stm32_usart6, STM32_IRQ_USART6) /* Vector 16+71: USART6 global interrupt */ - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED72) /* Vector 16+72: Reserved */ -UNUSED(STM32_IRQ_RESERVED73) /* Vector 16+73: Reserved */ -UNUSED(STM32_IRQ_RESERVED74) /* Vector 16+74: Reserved */ -UNUSED(STM32_IRQ_RESERVED75) /* Vector 16+75: Reserved */ -UNUSED(STM32_IRQ_RESERVED76) /* Vector 16+76: Reserved */ -UNUSED(STM32_IRQ_RESERVED77) /* Vector 16+77: Reserved */ -UNUSED(STM32_IRQ_RESERVED78) /* Vector 16+78: Reserved */ -#else -VECTOR(stm32_i2c3ev, STM32_IRQ_I2C3EV) /* Vector 16+72: I2C3 event interrupt */ -VECTOR(stm32_i2c3er, STM32_IRQ_I2C3ER) /* Vector 16+73: I2C3 error interrupt */ -VECTOR(stm32_otghsep1out, STM32_IRQ_OTGHSEP1OUT) /* Vector 16+74: USB On The Go HS End Point 1 Out global interrupt */ -VECTOR(stm32_otghsep1in, STM32_IRQ_OTGHSEP1IN) /* Vector 16+75: USB On The Go HS End Point 1 In global interrupt */ -VECTOR(stm32_otghswkup, STM32_IRQ_OTGHSWKUP) /* Vector 16+76: USB On The Go HS Wakeup through EXTI interrupt */ -VECTOR(stm32_otghs, STM32_IRQ_OTGHS) /* Vector 16+77: USB On The Go HS global interrupt */ -VECTOR(stm32_dcmi, STM32_IRQ_DCMI) /* Vector 16+78: DCMI global interrupt */ -#endif - -#if defined(CONFIG_STM32_STM32F446) -UNUSED(STM32_IRQ_RESERVED79) /* Vector 16+79: Reserved */ -UNUSED(STM32_IRQ_RESERVED80) /* Vector 16+80: Reserved */ -#else -# if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED79) /* Vector 16+79: Reserved */ -# else -VECTOR(stm32_cryp, STM32_IRQ_CRYP) /* Vector 16+79: CRYP crypto global interrupt */ -# endif -VECTOR(stm32_hash, STM32_IRQ_HASH) /* Vector 16+80: Hash and Rng global interrupt */ -#endif - -VECTOR(stm32_fpu, STM32_IRQ_FPU) /* Vector 16+81: FPU global interrupt */ - -#if defined(CONFIG_STM32_STM32F427) || defined(CONFIG_STM32_STM32F429) || \ - defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_uart7, STM32_IRQ_UART7) /* Vector 16+82: UART7 interrupt */ -VECTOR(stm32_uart8, STM32_IRQ_UART8) /* Vector 16+83: UART8 interrupt */ -#elif defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED82) /* Vector 16+82: Reserved */ -UNUSED(STM32_IRQ_RESERVED83) /* Vector 16+83: Reserved */ -#endif - -#if defined(CONFIG_STM32_STM32F427) || defined(CONFIG_STM32_STM32F429) || \ - defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_spi4, STM32_IRQ_SPI4) /* Vector 16+84: SPI4 interrupt */ -#elif defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED84) /* Vector 16+84: Reserved */ -#endif - -#if defined(CONFIG_STM32_STM32F427) || defined(CONFIG_STM32_STM32F429) || \ - defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_spi5, STM32_IRQ_SPI5) /* Vector 16+85: SPI5 interrupt */ -VECTOR(stm32_spi6, STM32_IRQ_SPI6) /* Vector 16+86: SPI6 interrupt */ -#elif defined(CONFIG_STM32_STM32F446) -UNUSED(STM32_IRQ_RESERVED85) /* Vector 16+85: Reserved */ -UNUSED(STM32_IRQ_RESERVED86) /* Vector 16+86: Reserved */ -#elif defined(CONFIG_STM32_STM32F410) -VECTOR(stm32_spi5, STM32_IRQ_SPI5) /* Vector 16+85: SPI5 interrupt */ -UNUSED(STM32_IRQ_RESERVED86) /* Vector 16+86: Reserved */ -#endif - -#if defined(CONFIG_STM32_STM32F429) || defined(CONFIG_STM32_STM32F446) || \ - defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_sai1, STM32_IRQ_SAI1) /* Vector 16+87: SAI1 interrupt */ -#elif defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED87) /* Vector 16+87: Reserved */ -#endif - -#if defined(CONFIG_STM32_STM32F429) || defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_ltdcint, STM32_IRQ_LTDCINT) /* Vector 16+88: LTDC interrupt */ -VECTOR(stm32_ltdcerrint, STM32_IRQ_LTDCERRINT) /* Vector 16+89: LTDC Error interrupt */ -VECTOR(stm32_dma2d, STM32_IRQ_DMA2D) /* Vector 16+90: DMA2D interrupt */ -#elif defined(CONFIG_STM32_STM32F446) || defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED88) /* Vector 16+88: Reserved */ -UNUSED(STM32_IRQ_RESERVED89) /* Vector 16+89: Reserved */ -UNUSED(STM32_IRQ_RESERVED90) /* Vector 16+90: Reserved */ -#endif - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED91) /* Vector 16+91: Reserved */ -UNUSED(STM32_IRQ_RESERVED92) /* Vector 16+92: Reserved */ -#elif defined(CONFIG_STM32_STM32F446) -VECTOR(stm32_sai2, STM32_IRQ_SAI2) /* Vector 16+91: SAI2 Global interrupt */ -VECTOR(stm32_quadspi, STM32_IRQ_QUADSPI) /* Vector 16+92: QuadSPI Global interrupt */ -#elif defined(CONFIG_STM32_STM32F469) -VECTOR(stm32_quadspi, STM32_IRQ_QUADSPI) /* Vector 16+91: QuadSPI Global interrupt */ -VECTOR(stm32_dsi, STM32_IRQ_DSI) /* Vector 16+92: DSI Global interrupt */ -#endif - -#if defined(CONFIG_STM32_STM32F446) -VECTOR(stm32_hdmicec, STM32_IRQ_HDMICEC) /* Vector 16+93: HDMI-CEC Global interrupt */ -VECTOR(stm32_spdifrx, STM32_IRQ_SPDIFRX) /* Vector 16+94: SPDIF-Rx Global interrupt */ -VECTOR(stm32_fmpi2c1, STM32_IRQ_FMPI2C1) /* Vector 16+95: FMPI2C1 event interrupt */ -VECTOR(stm32_fmpi2c1err, STM32_IRQ_FMPI2C1ERR) /* Vector 16+96: FMPI2C1 Error event interrupt */ -#endif - -#if defined(CONFIG_STM32_STM32F410) -UNUSED(STM32_IRQ_RESERVED93) /* Vector 16+93: Reserved */ -UNUSED(STM32_IRQ_RESERVED94) /* Vector 16+94: Reserved */ -UNUSED(STM32_IRQ_RESERVED95) /* Vector 16+95: Reserved */ -UNUSED(STM32_IRQ_RESERVED96) /* Vector 16+96: Reserved */ -UNUSED(STM32_IRQ_RESERVED97) /* Vector 16+97: Reserved */ -#endif - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ diff --git a/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h b/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h deleted file mode 100644 index f6be873e82..0000000000 --- a/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h +++ /dev/null @@ -1,258 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/chip/stm32l15xxx_vectors.h - * For STM32L100xx, STM32L151xx, STM32L152xx and STM32L162xx advanced ARM-based - * 32-bit MCUs - * - * Copyright (C) 2013 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor definitions - ************************************************************************************/ -/* This file is included by stm32_vectors.S. It provides the macro VECTOR that - * supplies ach STM32F10xxx vector in terms of a (lower-case) ISR label and an - * (upper-case) IRQ number as defined in arch/arm/include/stm32/stm32f10xxx_irq.h. - * stm32_vectors.S will defined the VECTOR in different ways in order to generate - * the interrupt vectors and handlers in their final form. - * - * - * Vectors for low and medium density devices - */ - -#if defined(CONFIG_STM32_LOWDENSITY) || defined(CONFIG_STM32_MEDIUMDENSITY) - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 45 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 45 - -#else - VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ - VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ - VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper through EXTI line interrupt */ - VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC Wakeup through EXTI line interrupt */ - VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ - VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ - VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ - VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ - VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 interrupt */ - VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ - VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ - VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ - VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ - VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ - VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ - VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ - VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ - VECTOR(stm32_adc1, STM32_IRQ_ADC1) /* 18: ADC1 global interrupt */ - VECTOR(stm32_usbhp, STM32_IRQ_USBHP) /* 19: USB High Priority interrupts */ - VECTOR(stm32_usblp, STM32_IRQ_USBLP) /* 20: USB Low Priority interrupt */ - VECTOR(stm32_dac, STM32_IRQ_DAC) /* 21: DAC interrupt */ - VECTOR(stm32_comp, STM32_IRQ_COMP) /* 22: Comparator wakeup through EXTI interrupt */ - VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ - VECTOR(stm32_ldc, STM32_IRQ_LDC) /* 24: LCD global interrupt */ - VECTOR(stm32_tim9, STM32_IRQ_TIM9) /* 25: TIM9 global interrupt */ - VECTOR(stm32_tim10, STM32_IRQ_TIM10) /* 26: TIM10 global interrupt */ - VECTOR(stm32_tim11, STM32_IRQ_TIM11) /* 27: TIM11 global interrupt */ - VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ - VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* 30: TIM4 global interrupt */ - VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event interrupt */ - VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ - VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* 33: I2C2 event interrupt */ - VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* 34: I2C2 error interrupt */ - VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ - VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* 36: SPI2 global interrupt */ - VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global interrupt */ - VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global interrupt */ - VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global interrupt */ - VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ - VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ - VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP) /* 42: USB wakeup from suspend through EXTI line interrupt */ - VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* 43: TIM6 global interrupt */ - VECTOR(stm32_TIM7, STM32_IRQ_TIM7) /* 44: TIM7 global interrupt */ -#endif - -/* Vectors for medium+ density devices */ - -#elif defined(CONFIG_STM32_MEDIUMPLUSDENSITY) - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 61 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 54 - -#else - VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ - VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ - VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper through EXTI line interrupt */ - VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC Wakeup through EXTI line interrupt */ - VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ - VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ - VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ - VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ - VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 interrupt */ - VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ - VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ - VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ - VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ - VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ - VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ - VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ - VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ - VECTOR(stm32_adc1, STM32_IRQ_ADC1) /* 18: ADC1 global interrupt */ - VECTOR(stm32_usbhp, STM32_IRQ_USBHP) /* 19: USB High Priority interrupts */ - VECTOR(stm32_usblp, STM32_IRQ_USBLP) /* 20: USB Low Priority interrupt */ - VECTOR(stm32_dac, STM32_IRQ_DAC) /* 21: DAC interrupt */ - VECTOR(stm32_comp, STM32_IRQ_COMP) /* 22: Comparator wakeup through EXTI interrupt */ - VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ - VECTOR(stm32_ldc, STM32_IRQ_LDC) /* 24: LCD global interrupt */ - VECTOR(stm32_tim9, STM32_IRQ_TIM9) /* 25: TIM9 global interrupt */ - VECTOR(stm32_tim10, STM32_IRQ_TIM10) /* 26: TIM10 global interrupt */ - VECTOR(stm32_tim11, STM32_IRQ_TIM11) /* 27: TIM11 global interrupt */ - VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ - VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* 30: TIM4 global interrupt */ - VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event interrupt */ - VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ - VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* 33: I2C2 event interrupt */ - VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* 34: I2C2 error interrupt */ - VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ - VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* 36: SPI2 global interrupt */ - VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global interrupt */ - VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global interrupt */ - VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global interrupt */ - VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ - VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ - VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP) /* 42: USB wakeup from suspend through EXTI line interrupt */ - VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* 43: TIM6 global interrupt */ - VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* 44: TIM7 global interrupt */ - VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* 45: TIM5 global interrupt */ - VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* 46: SPI3 global interrupt */ - VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* 47: DMA2 channel 1 global interrupt */ - VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* 48: DMA2 channel 2 global interrupt */ - VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* 49: DMA2 channel 3 global interrupt */ - VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4) /* 50: DMA2 channel 4 global interrupt */ - VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* 51: DMA2 channel 5 global interrupt */ - VECTOR(stm32_aes, STM32_IRQ_AES) /* 52: AES global interrupt */ - VECTOR(stm32_compacq, STM32_IRQ_COMPACQ) /* 53: Comparator Channel Acquisition Interrupt */ -#endif - -/* Vectors for high density devices */ - -#elif defined(CONFIG_STM32_HIGHDENSITY) - -/* If the common ARMv7-M vector handling is used, then all it needs is the following - * definition that provides the number of supported vectors. - */ - -#ifdef CONFIG_ARMV7M_CMNVECTOR - -/* Reserve 61 interrupt table entries for I/O interrupts. */ - -# define ARMV7M_PERIPHERAL_INTERRUPTS 57 - -#else - VECTOR(stm32_wwdg, STM32_IRQ_WWDG) /* 0: Window Watchdog interrupt */ - VECTOR(stm32_pvd, STM32_IRQ_PVD) /* 1: PVD through EXTI Line detection interrupt */ - VECTOR(stm32_tamper, STM32_IRQ_TAMPER) /* 2: Tamper through EXTI line interrupt */ - VECTOR(stm32_rtc_wkup, STM32_IRQ_RTC_WKUP) /* 3: RTC Wakeup through EXTI line interrupt */ - VECTOR(stm32_flash, STM32_IRQ_FLASH) /* 4: Flash global interrupt */ - VECTOR(stm32_rcc, STM32_IRQ_RCC) /* 5: RCC global interrupt */ - VECTOR(stm32_exti0, STM32_IRQ_EXTI0) /* 6: EXTI Line 0 interrupt */ - VECTOR(stm32_exti1, STM32_IRQ_EXTI1) /* 7: EXTI Line 1 interrupt */ - VECTOR(stm32_exti2, STM32_IRQ_EXTI2) /* 8: EXTI Line 2 interrupt */ - VECTOR(stm32_exti3, STM32_IRQ_EXTI3) /* 9: EXTI Line 3 interrupt */ - VECTOR(stm32_exti4, STM32_IRQ_EXTI4) /* 10: EXTI Line 4 interrupt */ - VECTOR(stm32_dma1ch1, STM32_IRQ_DMA1CH1) /* 11: DMA1 channel 1 global interrupt */ - VECTOR(stm32_dma1ch2, STM32_IRQ_DMA1CH2) /* 12: DMA1 channel 2 global interrupt */ - VECTOR(stm32_dma1ch3, STM32_IRQ_DMA1CH3) /* 13: DMA1 channel 3 global interrupt */ - VECTOR(stm32_dma1ch4, STM32_IRQ_DMA1CH4) /* 14: DMA1 channel 4 global interrupt */ - VECTOR(stm32_dma1ch5, STM32_IRQ_DMA1CH5) /* 15: DMA1 channel 5 global interrupt */ - VECTOR(stm32_dma1ch6, STM32_IRQ_DMA1CH6) /* 16: DMA1 channel 6 global interrupt */ - VECTOR(stm32_dma1ch7, STM32_IRQ_DMA1CH7) /* 17: DMA1 channel 7 global interrupt */ - VECTOR(stm32_adc1, STM32_IRQ_ADC1) /* 18: ADC1 global interrupt */ - VECTOR(stm32_usbhp, STM32_IRQ_USBHP) /* 19: USB High Priority interrupts */ - VECTOR(stm32_usblp, STM32_IRQ_USBLP) /* 20: USB Low Priority interrupt */ - VECTOR(stm32_dac, STM32_IRQ_DAC) /* 21: DAC interrupt */ - VECTOR(stm32_comp, STM32_IRQ_COMP) /* 22: Comparator wakeup through EXTI interrupt */ - VECTOR(stm32_exti95, STM32_IRQ_EXTI95) /* 23: EXTI Line[9:5] interrupts */ - VECTOR(stm32_ldc, STM32_IRQ_LDC) /* 24: LCD global interrupt */ - VECTOR(stm32_tim9, STM32_IRQ_TIM9) /* 25: TIM9 global interrupt */ - VECTOR(stm32_tim10, STM32_IRQ_TIM10) /* 26: TIM10 global interrupt */ - VECTOR(stm32_tim11, STM32_IRQ_TIM11) /* 27: TIM11 global interrupt */ - VECTOR(stm32_tim2, STM32_IRQ_TIM2) /* 28: TIM2 global interrupt */ - VECTOR(stm32_tim3, STM32_IRQ_TIM3) /* 29: TIM3 global interrupt */ - VECTOR(stm32_tim4, STM32_IRQ_TIM4) /* 30: TIM4 global interrupt */ - VECTOR(stm32_i2c1ev, STM32_IRQ_I2C1EV) /* 31: I2C1 event interrupt */ - VECTOR(stm32_i2c1er, STM32_IRQ_I2C1ER) /* 32: I2C1 error interrupt */ - VECTOR(stm32_i2c2ev, STM32_IRQ_I2C2EV) /* 33: I2C2 event interrupt */ - VECTOR(stm32_i2c2er, STM32_IRQ_I2C2ER) /* 34: I2C2 error interrupt */ - VECTOR(stm32_spi1, STM32_IRQ_SPI1) /* 35: SPI1 global interrupt */ - VECTOR(stm32_spi2, STM32_IRQ_SPI2) /* 36: SPI2 global interrupt */ - VECTOR(stm32_usart1, STM32_IRQ_USART1) /* 37: USART1 global interrupt */ - VECTOR(stm32_usart2, STM32_IRQ_USART2) /* 38: USART2 global interrupt */ - VECTOR(stm32_usart3, STM32_IRQ_USART3) /* 39: USART3 global interrupt */ - VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510) /* 40: EXTI Line[15:10] interrupts */ - VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM) /* 41: RTC alarm through EXTI line interrupt */ - VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP) /* 42: USB wakeup from suspend through EXTI line interrupt */ - VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* 43: TIM6 global interrupt */ - VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* 44: TIM7 global interrupt */ - VECTOR(stm32_sdio, STM32_IRQ_SDIO) /* 45: SDIO Global interrupt */ - VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* 46: TIM5 global interrupt */ - VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* 47: SPI3 global interrupt */ - VECTOR(stm32_usart4, STM32_IRQ_UART4) /* 48: UART4 global interrupt */ - VECTOR(stm32_usart5, STM32_IRQ_UART5) /* 49: UART5 global interrupt */ - VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* 50: DMA2 channel 1 global interrupt */ - VECTOR(stm32_dma2ch2, STM32_IRQ_DMA2CH2) /* 51: DMA2 channel 2 global interrupt */ - VECTOR(stm32_dma2ch3, STM32_IRQ_DMA2CH3) /* 52: DMA2 channel 3 global interrupt */ - VECTOR(stm32_dma2ch4, STM32_IRQ_DMA2CH4) /* 53: DMA2 channel 4 global interrupt */ - VECTOR(stm32_dma2ch5, STM32_IRQ_DMA2CH5) /* 54: DMA2 channel 5 global interrupt */ - VECTOR(stm32_aes, STM32_IRQ_AES) /* 55: AES global interrupt */ - VECTOR(stm32_compacq, STM32_IRQ_COMPACQ) /* 56: Comparator Channel Acquisition Interrupt */ -#endif - -#else -# error "Unknown STM32L density" -#endif diff --git a/arch/arm/src/stm32/gnu/stm32_vectors.S b/arch/arm/src/stm32/gnu/stm32_vectors.S deleted file mode 100644 index a8feaa635f..0000000000 --- a/arch/arm/src/stm32/gnu/stm32_vectors.S +++ /dev/null @@ -1,527 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/gnu/stm32_vectors.S - * - * Copyright (C) 2009-2013, 2015-2016 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Included Files - ************************************************************************************/ - -#include - -#include - -#include "chip.h" -#include "exc_return.h" - -/************************************************************************************ - * Configuration - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ -/* Configuration ********************************************************************/ - -#ifdef CONFIG_ARCH_HIPRI_INTERRUPT - /* In kernel mode without an interrupt stack, this interrupt handler will set the - * MSP to the stack pointer of the interrupted thread. If the interrupted thread - * was a privileged thread, that will be the MSP otherwise it will be the PSP. If - * the PSP is used, then the value of the MSP will be invalid when the interrupt - * handler returns because it will be a pointer to an old position in the - * unprivileged stack. Then when the high priority interrupt occurs and uses this - * stale MSP, there will most likely be a system failure. - * - * If the interrupt stack is selected, on the other hand, then the interrupt - * handler will always set the MSP to the interrupt stack. So when the high - * priority interrupt occurs, it will either use the MSP of the last privileged - * thread to run or, in the case of the nested interrupt, the interrupt stack if - * no privileged task has run. - */ - -# if defined(CONFIG_BUILD_PROTECTED) && CONFIG_ARCH_INTERRUPTSTACK < 4 -# error Interrupt stack must be used with high priority interrupts in kernel mode -# endif - - /* Use the BASEPRI to control interrupts is required if nested, high - * priority interrupts are supported. - */ - -# ifndef CONFIG_ARMV7M_USEBASEPRI -# error CONFIG_ARMV7M_USEBASEPRI must be used with CONFIG_ARCH_HIPRI_INTERRUPT -# endif -#endif - -/* Memory Map ***********************************************************************/ -/* - * 0x0800:0000 - Beginning of FLASH. Address of vectors (if not using bootloader) - * Mapped to address 0x0000:0000 at boot time. - * 0x0800:3000 - Address of vectors if using bootloader - * 0x0803:ffff - End of flash - * 0x2000:0000 - Start of SRAM and start of .data (_sdata) - * - End of .data (_edata) abd start of .bss (_sbss) - * - End of .bss (_ebss) and bottom of idle stack - * - _ebss + CONFIG_IDLETHREAD_STACKSIZE = end of idle stack, start of heap - * 0x2000:ffff - End of SRAM and end of heap - */ - -#define IDLE_STACK (_ebss+CONFIG_IDLETHREAD_STACKSIZE-4) -#define HEAP_BASE (_ebss+CONFIG_IDLETHREAD_STACKSIZE) - -/************************************************************************************ - * Public Symbols - ************************************************************************************/ - - .syntax unified - .thumb - .file "stm32_vectors.S" - -/* Check if common ARMv7 interrupt vectoring is used (see arch/arm/src/armv7-m/up_vectors.c) */ - -#ifndef CONFIG_ARMV7M_CMNVECTOR - - .globl __start - -/************************************************************************************ - * Macros - ************************************************************************************/ - -/* On entry into an IRQ, the hardware automatically saves the xPSR, PC, LR, R12, R0-R3 - * registers on the stack, then branches to an instantantiation of the following - * macro. This macro simply loads the IRQ number into R0, then jumps to the common - * IRQ handling logic. - */ - - .macro HANDLER, label, irqno - .thumb_func -\label: - mov r0, #\irqno - b exception_common - .endm - -/************************************************************************************ - * Vectors - ************************************************************************************/ - - .section .vectors, "ax" - .code 16 - .align 2 - .globl _vectors - .type _vectors, function - -_vectors: - -/* Processor Exceptions */ - - .word IDLE_STACK /* Vector 0: Reset stack pointer */ - .word __start /* Vector 1: Reset vector */ - .word stm32_nmi /* Vector 2: Non-Maskable Interrupt (NMI) */ - .word stm32_hardfault /* Vector 3: Hard fault */ - .word stm32_mpu /* Vector 4: Memory management (MPU) */ - .word stm32_busfault /* Vector 5: Bus fault */ - .word stm32_usagefault /* Vector 6: Usage fault */ - .word stm32_reserved /* Vector 7: Reserved */ - .word stm32_reserved /* Vector 8: Reserved */ - .word stm32_reserved /* Vector 9: Reserved */ - .word stm32_reserved /* Vector 10: Reserved */ - .word stm32_svcall /* Vector 11: SVC call */ - .word stm32_dbgmonitor /* Vector 12: Debug monitor */ - .word stm32_reserved /* Vector 13: Reserved */ - .word stm32_pendsv /* Vector 14: Pendable system service request */ - .word stm32_systick /* Vector 15: System tick */ - -/* External Interrupts */ - -#if !defined(CONFIG_STM32_NOEXT_VECTORS) -#undef VECTOR -#define VECTOR(l,i) .word l - -#undef UNUSED -#define UNUSED(i) .word stm32_reserved - -#if defined(CONFIG_STM32_STM32L15XX) -# include "chip/stm32l15xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F10XX) -# include "chip/stm32f10xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F20XX) -# include "chip/stm32f20xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F30XX) -# include "chip/stm32f30xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F33XX) -# include "chip/stm32f33xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F37XX) -# include "chip/stm32f37xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F4XXX) -# include "chip/stm32f40xxx_vectors.h" -#else -# error "No vectors for STM32 chip" -#endif -#endif /* CONFIG_STM32_NOEXT_VECTORS */ - .size _vectors, .-_vectors - -/************************************************************************************ - * .text - ************************************************************************************/ - - .text - .type handlers, function - .thumb_func -handlers: - HANDLER stm32_reserved, STM32_IRQ_RESERVED /* Unexpected/reserved vector */ - HANDLER stm32_nmi, STM32_IRQ_NMI /* Vector 2: Non-Maskable Interrupt (NMI) */ - HANDLER stm32_hardfault, STM32_IRQ_HARDFAULT /* Vector 3: Hard fault */ - HANDLER stm32_mpu, STM32_IRQ_MEMFAULT /* Vector 4: Memory management (MPU) */ - HANDLER stm32_busfault, STM32_IRQ_BUSFAULT /* Vector 5: Bus fault */ - HANDLER stm32_usagefault, STM32_IRQ_USAGEFAULT /* Vector 6: Usage fault */ - HANDLER stm32_svcall, STM32_IRQ_SVCALL /* Vector 11: SVC call */ - HANDLER stm32_dbgmonitor, STM32_IRQ_DBGMONITOR /* Vector 12: Debug Monitor */ - HANDLER stm32_pendsv, STM32_IRQ_PENDSV /* Vector 14: Penable system service request */ - HANDLER stm32_systick, STM32_IRQ_SYSTICK /* Vector 15: System tick */ - -#if !defined(CONFIG_STM32_NOEXT_VECTORS) - -#undef VECTOR -#define VECTOR(l,i) HANDLER l, i - -#undef UNUSED -#define UNUSED(i) - -#if defined(CONFIG_STM32_STM32L15XX) -# include "chip/stm32l15xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F10XX) -# include "chip/stm32f10xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F20XX) -# include "chip/stm32f20xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F30XX) -# include "chip/stm32f30xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F33XX) -# include "chip/stm32f33xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F37XX) -# include "chip/stm32f37xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F4XXX) -# include "chip/stm32f40xxx_vectors.h" -#else -# error "No handlers for STM32 chip" -#endif - -#endif /* CONFIG_STM32_NOEXT_VECTORS */ - -/* Common IRQ handling logic. On entry here, the return stack is on either - * the PSP or the MSP and looks like the following: - * - * REG_XPSR - * REG_R15 - * REG_R14 - * REG_R12 - * REG_R3 - * REG_R2 - * REG_R1 - * MSP->REG_R0 - * - * And - * R0 contains the IRQ number - * R14 Contains the EXC_RETURN value - * We are in handler mode and the current SP is the MSP - */ - - .globl exception_common - .type exception_common, function - -exception_common: - - /* Complete the context save */ - -#ifdef CONFIG_BUILD_PROTECTED - /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 - * (handler mode) if the stack is on the MSP. It can only be on the PSP if - * EXC_RETURN is 0xfffffffd (unprivileged thread) - */ - - tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ - beq 1f /* Branch if context already on the MSP */ - mrs r1, psp /* R1=The process stack pointer (PSP) */ - mov sp, r1 /* Set the MSP to the PSP */ - -1: -#endif - - /* r1 holds the value of the stack pointer AFTER the exception handling logic - * pushed the various registers onto the stack. Get r2 = the value of the - * stack pointer BEFORE the interrupt modified it. - */ - - mov r2, sp /* R2=Copy of the main/process stack pointer */ - add r2, #HW_XCPT_SIZE /* R2=MSP/PSP before the interrupt was taken */ -#ifdef CONFIG_ARMV7M_USEBASEPRI - mrs r3, basepri /* R3=Current BASEPRI setting */ -#else - mrs r3, primask /* R3=Current PRIMASK setting */ -#endif - -#ifdef CONFIG_ARCH_FPU - /* Skip over the block of memory reserved for floating pointer register save. - * Lazy FPU register saving is used. FPU registers will be saved in this - * block only if a context switch occurs (this means, of course, that the FPU - * cannot be used in interrupt processing). - */ - - sub sp, #(4*SW_FPU_REGS) -#endif - - /* Save the remaining registers on the stack after the registers pushed - * by the exception handling logic. r2=SP and r3=primask or basepri, r4-r11, - * r14=register values. - */ - -#ifdef CONFIG_BUILD_PROTECTED - stmdb sp!, {r2-r11,r14} /* Save the remaining registers plus the SP value */ -#else - stmdb sp!, {r2-r11} /* Save the remaining registers plus the SP value */ -#endif - -#ifndef CONFIG_ARCH_HIPRI_INTERRUPT - /* Disable interrupts, select the stack to use for interrupt handling - * and call up_doirq to handle the interrupt - */ - - cpsid i /* Disable further interrupts */ - -#else - /* Set the BASEPRI register so that further normal interrupts will be - * masked. Nested, high priority may still occur, however. - */ - - mov r2, #NVIC_SYSH_DISABLE_PRIORITY - msr basepri, r2 /* Set the BASEPRI */ -#endif - - /* There are two arguments to up_doirq: - * - * R0 = The IRQ number - * R1 = The top of the stack points to the saved state - */ - - mov r1, sp - - /* Also save the top of the stack in a preserved register */ - - mov r4, sp - -#if CONFIG_ARCH_INTERRUPTSTACK > 7 - /* If CONFIG_ARCH_INTERRUPTSTACK is defined, we will set the MSP to use - * a special special interrupt stack pointer. The way that this is done - * here prohibits nested interrupts without some additional logic! - */ - - ldr sp, =g_intstackbase - -#else - /* Otherwise, we will re-use the interrupted thread's stack. That may - * mean using either MSP or PSP stack for interrupt level processing (in - * kernel mode). - */ - - bic r2, r4, #7 /* Get the stack pointer with 8-byte alignment */ - mov sp, r2 /* Instantiate the aligned stack */ - -#endif - - bl up_doirq /* R0=IRQ, R1=register save (msp) */ - mov r1, r4 /* Recover R1=main stack pointer */ - - /* On return from up_doirq, R0 will hold a pointer to register context - * array to use for the interrupt return. If that return value is the same - * as current stack pointer, then things are relatively easy. - */ - - cmp r0, r1 /* Context switch? */ - beq 2f /* Branch if no context switch */ - - /* We are returning with a pending context switch. - * - * If the FPU is enabled, then we will need to restore FPU registers. - * This is not done in normal interrupt save/restore because the cost - * is prohibitive. This is only done when switching contexts. A - * consequence of this is that floating point operations may not be - * performed in interrupt handling logic. - * - * Here: - * r0 = Address of the register save area - * - * NOTE: It is a requirement that up_restorefpu() preserve the value of - * r0! - */ - -#ifdef CONFIG_ARCH_FPU - bl up_restorefpu /* Restore the FPU registers */ -#endif - - /* We are returning with a pending context switch. This case is different - * because in this case, the register save structure does not lie in the - * stack but, rather, within a TCB structure. We'll have to copy some - * values to the stack. - */ - - add r1, r0, #SW_XCPT_SIZE /* R1=Address of HW save area in reg array */ - ldmia r1, {r4-r11} /* Fetch eight registers in HW save area */ - ldr r1, [r0, #(4*REG_SP)] /* R1=Value of SP before interrupt */ - stmdb r1!, {r4-r11} /* Store eight registers in HW save area */ -#ifdef CONFIG_BUILD_PROTECTED - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ -#else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ -#endif - b 3f /* Re-join common logic */ - - /* We are returning with no context switch. We simply need to "unwind" - * the same stack frame that we created - * - * Here: - * r1 = Address of the return stack (same as r0) - */ - -2: -#ifdef CONFIG_BUILD_PROTECTED - ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ -#else - ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ -#endif - -#ifdef CONFIG_ARCH_FPU - /* Skip over the block of memory reserved for floating pointer register - * save. Then R1 is the address of the HW save area - */ - - add r1, #(4*SW_FPU_REGS) -#endif - - /* Set up to return from the exception - * - * Here: - * r1 = Address on the target thread's stack position at the start of - * the registers saved by hardware - * r3 = primask or basepri - * r4-r11 = restored register values - */ - -3: - -#ifdef CONFIG_BUILD_PROTECTED - /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 - * (handler mode) if the stack is on the MSP. It can only be on the PSP if - * EXC_RETURN is 0xfffffffd (unprivileged thread) - */ - - mrs r2, control /* R2=Contents of the control register */ - tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ - beq 4f /* Branch if privileged */ - - orr r2, r2, #1 /* Unprivileged mode */ - msr psp, r1 /* R1=The process stack pointer */ - b 5f -4: - bic r2, r2, #1 /* Privileged mode */ - msr msp, r1 /* R1=The main stack pointer */ -5: - msr control, r2 /* Save the updated control register */ -#else - msr msp, r1 /* Recover the return MSP value */ - - /* Preload r14 with the special return value first (so that the return - * actually occurs with interrupts still disabled). - */ - - ldr r14, =EXC_RETURN_PRIVTHR /* Load the special value */ -#endif - - /* Restore the interrupt state */ - -#ifdef CONFIG_ARMV7M_USEBASEPRI - msr basepri, r3 /* Restore interrupts priority masking */ -#ifndef CONFIG_ARCH_HIPRI_INTERRUPT - cpsie i /* Re-enable interrupts */ -#endif - -#else - msr primask, r3 /* Restore interrupts */ -#endif - - /* Always return with R14 containing the special value that will: (1) - * return to thread mode, and (2) continue to use the MSP - */ - - bx r14 /* And return */ - .size handlers, .-handlers - -/************************************************************************************ - * Name: g_intstackalloc/g_intstackbase - * - * Description: - * Shouldn't happen - * - ************************************************************************************/ - -#if CONFIG_ARCH_INTERRUPTSTACK > 7 - .bss - .global g_intstackalloc - .global g_intstackbase - .align 8 -g_intstackalloc: - .skip ((CONFIG_ARCH_INTERRUPTSTACK + 4) & ~7) -g_intstackbase: - .size g_intstackalloc, .-g_intstackalloc -#endif - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ - -/************************************************************************************ - * .rodata - ************************************************************************************/ - - .section .rodata, "a" - -/* Variables: _sbss is the start of the BSS region (see ld.script) _ebss is the end - * of the BSS regsion (see ld.script). The idle task stack starts at the end of BSS - * and is of size CONFIG_IDLETHREAD_STACKSIZE. The IDLE thread is the thread that - * the system boots on and, eventually, becomes the idle, do nothing task that runs - * only when there is nothing else to run. The heap continues from there until the - * end of memory. See g_idle_topstack below. - */ - - .globl g_idle_topstack - .type g_idle_topstack, object -g_idle_topstack: - .word HEAP_BASE - .size g_idle_topstack, .-g_idle_topstack - - .end diff --git a/arch/arm/src/stm32/iar/stm32_vectors.S b/arch/arm/src/stm32/iar/stm32_vectors.S deleted file mode 100644 index eeaa2836b7..0000000000 --- a/arch/arm/src/stm32/iar/stm32_vectors.S +++ /dev/null @@ -1,1084 +0,0 @@ -/************************************************************************************ - * arch/arm/src/stm32/iar/stm32_vectors.S - * - * Copyright (C) 2009-2013, 2015-2016 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. - * - ************************************************************************************/ - -/************************************************************************************ - * Included Files - ************************************************************************************/ - -#include - -#include - -#include "chip.h" -#include "exc_return.h" - -/************************************************************************************ - * Configuration - ************************************************************************************/ - -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ -/* Configuration ********************************************************************/ - -#ifdef CONFIG_ARCH_HIPRI_INTERRUPT - /* In kernel mode without an interrupt stack, this interrupt handler will set the - * MSP to the stack pointer of the interrupted thread. If the interrupted thread - * was a privileged thread, that will be the MSP otherwise it will be the PSP. If - * the PSP is used, then the value of the MSP will be invalid when the interrupt - * handler returns because it will be a pointer to an old position in the - * unprivileged stack. Then when the high priority interrupt occurs and uses this - * stale MSP, there will most likely be a system failure. - * - * If the interrupt stack is selected, on the other hand, then the interrupt - * handler will always set the MSP to the interrupt stack. So when the high - * priority interrupt occurs, it will either use the MSP of the last privileged - * thread to run or, in the case of the nested interrupt, the interrupt stack if - * no privileged task has run. - */ - -# if defined(CONFIG_BUILD_PROTECTED) && CONFIG_ARCH_INTERRUPTSTACK < 4 -# error Interrupt stack must be used with high priority interrupts in kernel mode -# endif - - /* Use the BASEPRI to control interrupts is required if nested, high - * priority interrupts are supported. - */ - -# ifndef CONFIG_ARMV7M_USEBASEPRI -# error CONFIG_ARMV7M_USEBASEPRI must be used with CONFIG_ARCH_HIPRI_INTERRUPT -# endif -#endif - -/* Memory Map ***********************************************************************/ -/* - * 0x0800:0000 - Beginning of FLASH. Address of vectors (if not using bootloader) - * Mapped to address 0x0000:0000 at boot time. - * 0x0800:3000 - Address of vectors if using bootloader - * 0x0803:ffff - End of flash - * 0x2000:0000 - Start of SRAM and start of .data (_sdata) - * - End of .data (_edata) abd start of .bss (_sbss) - * - End of .bss (_ebss) and bottom of idle stack - * - _ebss + CONFIG_IDLETHREAD_STACKSIZE = end of idle stack, start of heap - * 0x2000:ffff - End of SRAM and end of heap - */ - - MODULE stm32_vectors - - /* Forward declaration of sections. */ - SECTION CSTACK:DATA:NOROOT(3) - -IDLE_STACK EQU(sfb(CSTACK)+CONFIG_IDLETHREAD_STACKSIZE-4) -HEAP_BASE EQU(sfb(CSTACK)+CONFIG_IDLETHREAD_STACKSIZE) - -/************************************************************************************ - * Public Symbols - ************************************************************************************/ - -/* Check if common ARMv7 interrupt vectoring is used (see arch/arm/src/armv7-m/up_vectors.S) */ - -#ifndef CONFIG_ARMV7M_CMNVECTOR - - PUBLIC __vector_table - EXTERN __start - EXTERN up_doirq - -/************************************************************************************ - * Macros - ************************************************************************************/ - -/* On entry into an IRQ, the hardware automatically saves the xPSR, PC, LR, R12, R0-R3 - * registers on the stack, then branches to an instantantiation of the following - * macro. This macro simply loads the IRQ number into R0, then jumps to the common - * IRQ handling logic. - */ - -HANDLER MACRO label, irqno - THUMB -label: - mov r0, #irqno - b exception_common - ENDM - -/************************************************************************************ - * Vectors - ************************************************************************************/ - - SECTION .intvec:CODE:ROOT(2) - -/* _vectors replaced on __vector_table for IAR C-SPY Simulator */ -__vector_table: - -/* Processor Exceptions */ - - DCD IDLE_STACK /* Vector 0: Reset stack pointer */ - DCD __start /* Vector 1: Reset vector */ - DCD stm32_nmi /* Vector 2: Non-Maskable Interrupt (NMI) */ - DCD stm32_hardfault /* Vector 3: Hard fault */ - DCD stm32_mpu /* Vector 4: Memory management (MPU) */ - DCD stm32_busfault /* Vector 5: Bus fault */ - DCD stm32_usagefault /* Vector 6: Usage fault */ - DCD stm32_reserved /* Vector 7: Reserved */ - DCD stm32_reserved /* Vector 8: Reserved */ - DCD stm32_reserved /* Vector 9: Reserved */ - DCD stm32_reserved /* Vector 10: Reserved */ - DCD stm32_svcall /* Vector 11: SVC call */ - DCD stm32_dbgmonitor /* Vector 12: Debug monitor */ - DCD stm32_reserved /* Vector 13: Reserved */ - DCD stm32_pendsv /* Vector 14: Pendable system service request */ - DCD stm32_systick /* Vector 15: System tick */ - -/* External Interrupts */ - -#if !defined(CONFIG_STM32_NOEXT_VECTORS) -#undef VECTOR -#define VECTOR(l,i) .word l - -/* IAR Assembler: - * You must not mix assembler language and C-style preprocessor directives. - * Conceptually, they are different languages and mixing them might lead to unexpected - * behavior because an assembler directive is not necessarily accepted as a part of the C - * preprocessor language. - */ - -#if defined(CONFIG_STM32_STM32L15XX) -# include "chip/stm32l15xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F10XX) - -# if defined(CONFIG_STM32_VALUELINE) - - DCD stm32_wwdg /* Vector 16+0: Window Watchdog interrupt */ - DCD stm32_pvd /* Vector 16+1: PVD through EXTI Line detection interrupt */ - DCD stm32_tamper /* Vector 16+2: Tamper interrupt */ - DCD stm32_rtc /* Vector 16+3: RTC Wakeup through EXTI line interrupt */ - DCD stm32_flash /* Vector 16+4: Flash global interrupt */ - DCD stm32_rcc /* Vector 16+5: RCC global interrupt */ - DCD stm32_exti0 /* Vector 16+6: EXTI Line 0 interrupt */ - DCD stm32_exti1 /* Vector 16+7: EXTI Line 1 interrupt */ - DCD stm32_exti2 /* Vector 16+8: EXTI Line 2 interrupt */ - DCD stm32_exti3 /* Vector 16+9: EXTI Line 3 interrupt */ - DCD stm32_exti4 /* Vector 16+10: EXTI Line 4 interrupt */ - DCD stm32_dma1ch1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - DCD stm32_dma1ch2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - DCD stm32_dma1ch3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - DCD stm32_dma1ch4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - DCD stm32_dma1ch5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - DCD stm32_dma1ch6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - DCD stm32_dma1ch7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - DCD stm32_adc1 /* Vector 16+18: ADC1 global interrupt */ - DCD stm32_reserved /* Vector 16+19: Reserved 0 */ - DCD stm32_reserved /* Vector 16+20: Reserved 1 */ - DCD stm32_reserved /* Vector 16+21: Reserved 2 */ - DCD stm32_reserved /* Vector 16+22: Reserved 3 */ - DCD stm32_exti95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - DCD stm32_tim1brk /* Vector 16+24: TIM1 Break interrupt; TIM15 global interrupt */ - DCD stm32_tim1up /* Vector 16+25: TIM1 Update interrupt; TIM16 global interrupt */ - DCD stm32_tim1trgcom /* Vector 16+26: TIM1 Trigger and Commutation interrupts; TIM17 global interrupt */ - DCD stm32_tim1cc /* Vector 16+27: TIM1 Capture Compare interrupt */ - DCD stm32_tim2 /* Vector 16+28: TIM2 global interrupt */ - DCD stm32_tim3 /* Vector 16+29: TIM3 global interrupt */ - DCD stm32_tim4 /* Vector 16+30: TIM4 global interrupt */ - DCD stm32_i2c1ev /* Vector 16+31: I2C1 event interrupt */ - DCD stm32_i2c1er /* Vector 16+32: I2C1 error interrupt */ - DCD stm32_i2c2ev /* Vector 16+33: I2C2 event interrupt */ - DCD stm32_i2c2er /* Vector 16+34: I2C2 error interrupt */ - DCD stm32_spi1 /* Vector 16+35: SPI1 global interrupt */ - DCD stm32_spi2 /* Vector 16+36: SPI2 global interrupt */ - DCD stm32_usart1 /* Vector 16+37: USART1 global interrupt */ - DCD stm32_usart2 /* Vector 16+38: USART2 global interrupt */ - DCD stm32_usart3 /* Vector 16+39: USART3 global interrupt */ - DCD stm32_exti1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - DCD stm32_rtcalr /* Vector 16+41: RTC alarms (A and B) through EXTI line interrupt */ - DCD stm32_cec /* Vector 16+42: CEC global interrupt */ - DCD stm32_tim12 /* Vector 16+43: TIM12 global interrupt */ - DCD stm32_tim13 /* Vector 16+44: TIM13 global interrupt */ - DCD stm32_tim14 /* Vector 16+45: TIM14 global interrupt */ - DCD stm32_reserved /* Vector 16+46: Reserved 4 */ - DCD stm32_reserved /* Vector 16+47: Reserved 5 */ - DCD stm32_fsmc /* Vector 16+48: FSMC global interrupt */ - DCD stm32_reserved /* Vector 16+49: Reserved 6 */ - DCD stm32_tim5 /* Vector 16+50: TIM5 global interrupt */ - DCD stm32_spi3 /* Vector 16+51: SPI3 global interrupt */ - DCD stm32_uart4 /* Vector 16+52: USART2 global interrupt */ - DCD stm32_uart5 /* Vector 16+53: UART5 global interrupt */ - DCD stm32_tim6 /* Vector 16+54: TIM6 global interrupt */ - DCD stm32_tim7 /* Vector 16+55: TIM7 global interrupt */ - DCD stm32_dma2ch1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - DCD stm32_dma2ch2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - DCD stm32_dma2ch3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - DCD stm32_dma2ch45 /* Vector 16+59: DMA2 Channel 4 and 5 global interrupt */ - DCD stm32_dma2ch5 /* Vector 16+60: DMA2 Channel 5 global interrupt */ - -# elif defined(CONFIG_STM32_CONNECTIVITYLINE) - - DCD stm32_wwdg /* Vector 16+0: Window Watchdog interrupt */ - DCD stm32_pvd /* Vector 16+1: PVD through EXTI Line detection interrupt */ - DCD stm32_tamper /* Vector 16+2: Tamper interrupt */ - DCD stm32_rtc /* Vector 16+3: RTC global interrupt */ - DCD stm32_flash /* Vector 16+4: Flash global interrupt */ - DCD stm32_rcc /* Vector 16+5: RCC global interrupt */ - DCD stm32_exti0 /* Vector 16+6: EXTI Line 0 interrupt */ - DCD stm32_exti1 /* Vector 16+7: EXTI Line 1 interrupt */ - DCD stm32_exti2 /* Vector 16+8: EXTI Line 2 interrupt */ - DCD stm32_exti3 /* Vector 16+9: EXTI Line 3 interrupt */ - DCD stm32_exti4 /* Vector 16+10: EXTI Line 4 interrupt */ - DCD stm32_dma1ch1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - DCD stm32_dma1ch2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - DCD stm32_dma1ch3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - DCD stm32_dma1ch4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - DCD stm32_dma1ch5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - DCD stm32_dma1ch6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - DCD stm32_dma1ch7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - DCD stm32_adc12 /* Vector 16+18: ADC1 and ADC2 global interrupt */ - DCD stm32_can1tx /* Vector 16+19: CAN1 TX interrupts */ - DCD stm32_can1rx0 /* Vector 16+20: CAN1 RX0 interrupts */ - DCD stm32_can1rx /* Vector 16+21: CAN1 RX1 interrupt */ - DCD stm32_can1sce /* Vector 16+22: CAN1 SCE interrupt */ - DCD stm32_exti95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - DCD stm32_tim1brk /* Vector 16+24: TIM1 Break interrupt */ - DCD stm32_tim1up /* Vector 16+25: TIM1 Update interrupt */ - DCD stm32_tim1trgcom /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ - DCD stm32_tim1cc /* Vector 16+27: TIM1 Capture Compare interrupt */ - DCD stm32_tim2 /* Vector 16+28: TIM2 global interrupt */ - DCD stm32_tim3 /* Vector 16+29: TIM3 global interrupt */ - DCD stm32_tim4 /* Vector 16+30: TIM4 global interrupt */ - DCD stm32_i2c1ev /* Vector 16+31: I2C1 event interrupt */ - DCD stm32_i2c1er /* Vector 16+32: I2C1 error interrupt */ - DCD stm32_i2c2ev /* Vector 16+33: I2C2 event interrupt */ - DCD stm32_i2c2er /* Vector 16+34: I2C2 error interrupt */ - DCD stm32_spi1 /* Vector 16+35: SPI1 global interrupt */ - DCD stm32_spi2 /* Vector 16+36: SPI2 global interrupt */ - DCD stm32_usart1 /* Vector 16+37: USART1 global interrupt */ - DCD stm32_usart2 /* Vector 16+38: USART2 global interrupt */ - DCD stm32_usart3 /* Vector 16+39: USART3 global interrupt */ - DCD stm32_exti1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - DCD stm32_rtcalr /* Vector 16+41: RTC alarm through EXTI line interrupt */ - DCD stm32_otgfswkup /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ - DCD stm32_reserved /* Vector 16+43: Reserved 0 */ - DCD stm32_reserved /* Vector 16+44: Reserved 1 */ - DCD stm32_reserved /* Vector 16+45: Reserved 2 */ - DCD stm32_reserved /* Vector 16+46: Reserved 3 */ - DCD stm32_reserved /* Vector 16+47: Reserved 4 */ - DCD stm32_reserved /* Vector 16+48: Reserved 5 */ - DCD stm32_reserved /* Vector 16+49: Reserved 6 */ - DCD stm32_tim5 /* Vector 16+50: TIM5 global interrupt */ - DCD stm32_spi3 /* Vector 16+51: SPI3 global interrupt */ - DCD stm32_uart4 /* Vector 16+52: UART4 global interrupt */ - DCD stm32_uart5 /* Vector 16+53: UART5 global interrupt */ - DCD stm32_tim6 /* Vector 16+54: TIM6 global interrupt */ - DCD stm32_tim7 /* Vector 16+55: TIM7 global interrupt */ - DCD stm32_dma2ch1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - DCD stm32_dma2ch2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - DCD stm32_dma2ch3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - DCD stm32_dma2ch4 /* Vector 16+59: DMA2 Channel 4 global interrupt */ - DCD stm32_dma2ch5 /* Vector 16+60: DMA2 Channel 5 global interrupt */ - DCD stm32_eth /* Vector 16+61: Ethernet global interrupt */ - DCD stm32_ethwkup /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ - DCD stm32_can2tx /* Vector 16+63: CAN2 TX interrupts */ - DCD stm32_can2rx0 /* Vector 16+64: CAN2 RX0 interrupts */ - DCD stm32_can2rx1 /* Vector 16+65: CAN2 RX1 interrupt */ - DCD stm32_can2sce /* Vector 16+66: CAN2 SCE interrupt */ - DCD stm32_otgfs /* Vector 16+67: USB On The Go FS global interrupt */ - -# else /* CONFIG_STM32_CONNECTIVITYLINE */ - - DCD stm32_wwdg /* Vector 16+0: Window Watchdog interrupt */ - DCD stm32_pvd /* Vector 16+1: PVD through EXTI Line detection interrupt */ - DCD stm32_tamper /* Vector 16+2: Tamper interrupt */ - DCD stm32_rtc /* Vector 16+3: RTC global interrupt */ - DCD stm32_flash /* Vector 16+4: Flash global interrupt */ - DCD stm32_rcc /* Vector 16+5: RCC global interrupt */ - DCD stm32_exti0 /* Vector 16+6: EXTI Line 0 interrupt */ - DCD stm32_exti1 /* Vector 16+7: EXTI Line 1 interrupt */ - DCD stm32_exti2 /* Vector 16+8: EXTI Line 2 interrupt */ - DCD stm32_exti3 /* Vector 16+9: EXTI Line 3 interrupt */ - DCD stm32_exti4 /* Vector 16+10: EXTI Line 4 interrupt */ - DCD stm32_dma1ch1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - DCD stm32_dma1ch2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - DCD stm32_dma1ch3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - DCD stm32_dma1ch4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - DCD stm32_dma1ch5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - DCD stm32_dma1ch6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - DCD stm32_dma1ch7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - DCD stm32_adc12 /* Vector 16+18: ADC1 and ADC2 global interrupt */ - DCD stm32_usbhpcantx /* Vector 16+19: USB High Priority or CAN TX interrupts*/ - DCD stm32_usblpcanrx0 /* Vector 16+20: USB Low Priority or CAN RX0 interrupts*/ - DCD stm32_can1rx1 /* Vector 16+21: CAN1 RX1 interrupt */ - DCD stm32_can1sce /* Vector 16+22: CAN1 SCE interrupt */ - DCD stm32_exti95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - DCD stm32_tim1brk /* Vector 16+24: TIM1 Break interrupt */ - DCD stm32_tim1up /* Vector 16+25: TIM1 Update interrupt */ - DCD stm32_tim1rtgcom /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ - DCD stm32_tim1cc /* Vector 16+27: TIM1 Capture Compare interrupt */ - DCD stm32_tim2 /* Vector 16+28: TIM2 global interrupt */ - DCD stm32_tim3 /* Vector 16+29: TIM3 global interrupt */ - DCD stm32_tim4 /* Vector 16+30: TIM4 global interrupt */ - DCD stm32_i2c1ev /* Vector 16+31: I2C1 event interrupt */ - DCD stm32_i2c1er /* Vector 16+32: I2C1 error interrupt */ - DCD stm32_i2c2ev /* Vector 16+33: I2C2 event interrupt */ - DCD stm32_i2c2er /* Vector 16+34: I2C2 error interrupt */ - DCD stm32_spi1 /* Vector 16+35: SPI1 global interrupt */ - DCD stm32_spi2 /* Vector 16+36: SPI2 global interrupt */ - DCD stm32_usart1 /* Vector 16+37: USART1 global interrupt */ - DCD stm32_usart2 /* Vector 16+38: USART2 global interrupt */ - DCD stm32_usart3 /* Vector 16+39: USART3 global interrupt */ - DCD stm32_exti1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - DCD stm32_rtcalr /* Vector 16+41: RTC alarm through EXTI line interrupt */ - DCD stm32_usbwkup /* Vector 16+42: USB wakeup from suspend through EXTI line interrupt*/ - DCD stm32_tim8brk /* Vector 16+43: TIM8 Break interrupt */ - DCD stm32_tim8up /* Vector 16+44: TIM8 Update interrupt */ - DCD stm32_tim8trgcom /* Vector 16+45: TIM8 Trigger and Commutation interrupts */ - DCD stm32_tim8cc /* Vector 16+46: TIM8 Capture Compare interrupt */ - DCD stm32_adc3 /* Vector 16+47: ADC3 global interrupt */ - DCD stm32_fsmc /* Vector 16+48: FSMC global interrupt */ - DCD stm32_sdio /* Vector 16+49: SDIO global interrupt */ - DCD stm32_tim5 /* Vector 16+50: TIM5 global interrupt */ - DCD stm32_spi3 /* Vector 16+51: SPI3 global interrupt */ - DCD stm32_uart4 /* Vector 16+52: UART4 global interrupt */ - DCD stm32_uart5 /* Vector 16+53: UART5 global interrupt */ - DCD stm32_tim6 /* Vector 16+54: TIM6 global interrupt */ - DCD stm32_tim7 /* Vector 16+55: TIM7 global interrupt */ - DCD stm32_dma2ch1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - DCD stm32_dma2ch2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - DCD stm32_dma2ch3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - DCD stm32_dma2ch45 /* Vector 16+59: DMA2 Channel 4&5 global interrupt */ - -# endif /* CONFIG_STM32_CONNECTIVITYLINE */ - -#elif defined(CONFIG_STM32_STM32F20XX) - DCD stm32_wwdg /* Vector 16+0: Window Watchdog interrupt */ - DCD stm32_pvd /* Vector 16+1: PVD through EXTI Line detection interrupt */ - DCD stm32_tamper /* Vector 16+2: Tamper and time stamp interrupts */ - DCD stm32_rtc_wkup /* Vector 16+3: RTC global interrupt */ - DCD stm32_flash /* Vector 16+4: Flash global interrupt */ - DCD stm32_rcc /* Vector 16+5: RCC global interrupt */ - DCD stm32_exti0 /* Vector 16+6: EXTI Line 0 interrupt */ - DCD stm32_exti1 /* Vector 16+7: EXTI Line 1 interrupt */ - DCD stm32_exti2 /* Vector 16+8: EXTI Line 2 interrupt */ - DCD stm32_exti3 /* Vector 16+9: EXTI Line 3 interrupt */ - DCD stm32_exti4 /* Vector 16+10: EXTI Line 4 interrupt */ - DCD stm32_dma1s0 /* Vector 16+11: DMA1 Stream 0 global interrupt */ - DCD stm32_dma1s1 /* Vector 16+12: DMA1 Stream 1 global interrupt */ - DCD stm32_dma1s2 /* Vector 16+13: DMA1 Stream 2 global interrupt */ - DCD stm32_dma1s3 /* Vector 16+14: DMA1 Stream 3 global interrupt */ - DCD stm32_dma1s4 /* Vector 16+15: DMA1 Stream 4 global interrupt */ - DCD stm32_dma1s5 /* Vector 16+16: DMA1 Stream 5 global interrupt */ - DCD stm32_dma1s6 /* Vector 16+17: DMA1 Stream 6 global interrupt */ - DCD stm32_adc /* Vector 16+18: ADC1, ADC2, and ADC3 global interrupt */ - DCD stm32_can1tx /* Vector 16+19: CAN1 TX interrupts */ - DCD stm32_can1rx0 /* Vector 16+20: CAN1 RX0 interrupts */ - DCD stm32_can1rx1 /* Vector 16+21: CAN1 RX1 interrupt */ - DCD stm32_can1sce /* Vector 16+22: CAN1 SCE interrupt */ - DCD stm32_exti95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - DCD stm32_tim1brk /* Vector 16+24: TIM1 Break interrupt/TIM9 global interrupt */ - DCD stm32_tim1up /* Vector 16+25: TIM1 Update interrupt/TIM10 global interrupt */ - DCD stm32_tim1trgcom /* Vector 16+26: TIM1 Trigger and Commutation interrupts/TIM11 global interrupt */ - DCD stm32_tim1cc /* Vector 16+27: TIM1 Capture Compare interrupt */ - DCD stm32_tim2 /* Vector 16+28: TIM2 global interrupt */ - DCD stm32_tim3 /* Vector 16+29: TIM3 global interrupt */ - DCD stm32_tim4 /* Vector 16+30: TIM4 global interrupt */ - DCD stm32_i2c1ev /* Vector 16+31: I2C1 event interrupt */ - DCD stm32_i2c1er /* Vector 16+32: I2C1 error interrupt */ - DCD stm32_i2c2ev /* Vector 16+33: I2C2 event interrupt */ - DCD stm32_i2c2er /* Vector 16+34: I2C2 error interrupt */ - DCD stm32_spi1 /* Vector 16+35: SPI1 global interrupt */ - DCD stm32_spi2 /* Vector 16+36: SPI2 global interrupt */ - DCD stm32_usart1 /* Vector 16+37: USART1 global interrupt */ - DCD stm32_usart2 /* Vector 16+38: USART2 global interrupt */ - DCD stm32_usart3 /* Vector 16+39: USART3 global interrupt */ - DCD stm32_exti1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - DCD stm32_rtcalrm /* Vector 16+41: RTC alarm through EXTI line interrupt */ - DCD stm32_otgfswkup /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ - DCD stm32_tim8brk /* Vector 16+43: TIM8 Break interrupt/TIM12 global interrupt */ - DCD stm32_tim8up /* Vector 16+44: TIM8 Update interrup/TIM13 global interrupt */ - DCD stm32_tim8trgcom /* Vector 16+45: TIM8 Trigger and Commutation interrupts/TIM14 global interrupt */ - DCD stm32_tim8cc /* Vector 16+46: TIM8 Capture Compare interrupt */ - DCD stm32_dma1s7 /* Vector 16+47: DMA1 Stream 7 global interrupt */ - DCD stm32_fsmc /* Vector 16+48: FSMC global interrupt */ - DCD stm32_sdio /* Vector 16+49: SDIO global interrupt */ - DCD stm32_tim5 /* Vector 16+50: TIM5 global interrupt */ - DCD stm32_spi3 /* Vector 16+51: SPI3 global interrupt */ - DCD stm32_uart4 /* Vector 16+52: UART4 global interrupt */ - DCD stm32_uart5 /* Vector 16+53: UART5 global interrupt */ - DCD stm32_tim6 /* Vector 16+54: TIM6 global interrupt/DAC1 and DAC2 underrun error interrupts */ - DCD stm32_tim7 /* Vector 16+55: TIM7 global interrupt */ - DCD stm32_dma2s0 /* Vector 16+56: DMA2 Stream 0 global interrupt */ - DCD stm32_dma2s1 /* Vector 16+57: DMA2 Stream 1 global interrupt */ - DCD stm32_dma2s2 /* Vector 16+58: DMA2 Stream 2 global interrupt */ - DCD stm32_dma2s3 /* Vector 16+59: DMA2 Stream 3 global interrupt */ - DCD stm32_dma2s4 /* Vector 16+60: DMA2 Stream 4 global interrupt */ - DCD stm32_eth /* Vector 16+61: Ethernet global interrupt */ - DCD stm32_ethwkup /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ - DCD stm32_can2tx /* Vector 16+63: CAN2 TX interrupts */ - DCD stm32_can2rx0 /* Vector 16+64: CAN2 RX0 interrupts */ - DCD stm32_can2rx1 /* Vector 16+65: CAN2 RX1 interrupt */ - DCD stm32_can2sce /* Vector 16+66: CAN2 SCE interrupt */ - DCD stm32_otgfs /* Vector 16+67: USB On The Go FS global interrupt */ - DCD stm32_dma2s5 /* Vector 16+68: DMA2 Stream 5 global interrupt */ - DCD stm32_dma2s6 /* Vector 16+69: DMA2 Stream 6 global interrupt */ - DCD stm32_dma2s7 /* Vector 16+70: DMA2 Stream 7 global interrupt */ - DCD stm32_usart6 /* Vector 16+71: USART6 global interrupt */ - DCD stm32_i2c3ev /* Vector 16+72: I2C3 event interrupt */ - DCD stm32_i2c3er /* Vector 16+73: I2C3 error interrupt */ - DCD stm32_otghsep1out /* Vector 16+74: USB On The Go HS End Point 1 Out global interrupt */ - DCD stm32_otghsep1in /* Vector 16+75: USB On The Go HS End Point 1 In global interrupt */ - DCD stm32_otghswkup /* Vector 16+76: USB On The Go HS Wakeup through EXTI interrupt */ - DCD stm32_otghs /* Vector 16+77: USB On The Go HS global interrupt */ - DCD stm32_dcmi /* Vector 16+78: DCMI global interrupt */ - DCD stm32_cryp /* Vector 16+79: CRYP crypto global interrupt */ - DCD stm32_hash /* Vector 16+80: Hash and Rng global interrupt */ -#elif defined(CONFIG_STM32_STM32F30XX) -# include "chip/stm32f30xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F33XX) -# include "chip/stm32f33xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F37XX) -# include "chip/stm32f37xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F427) || defined(CONFIG_STM32_STM32F429) -# include "chip/stm32f42xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F446) -# include "chip/stm32f44xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F4XXX) -# include "chip/stm32f40xxx_vectors.h" -#else -# error "No vectors for STM32 chip" -#endif -#endif /* CONFIG_STM32_NOEXT_VECTORS */ - -/************************************************************************************ - * .text - ************************************************************************************/ - - SECTION .text:CODE:NOROOT(8) - -handlers: - HANDLER stm32_reserved, STM32_IRQ_RESERVED /* Unexpected/reserved vector */ - HANDLER stm32_nmi, STM32_IRQ_NMI /* Vector 2: Non-Maskable Interrupt (NMI) */ - HANDLER stm32_hardfault, STM32_IRQ_HARDFAULT /* Vector 3: Hard fault */ - HANDLER stm32_mpu, STM32_IRQ_MEMFAULT /* Vector 4: Memory management (MPU) */ - HANDLER stm32_busfault, STM32_IRQ_BUSFAULT /* Vector 5: Bus fault */ - HANDLER stm32_usagefault, STM32_IRQ_USAGEFAULT /* Vector 6: Usage fault */ - HANDLER stm32_svcall, STM32_IRQ_SVCALL /* Vector 11: SVC call */ - HANDLER stm32_dbgmonitor, STM32_IRQ_DBGMONITOR /* Vector 12: Debug Monitor */ - HANDLER stm32_pendsv, STM32_IRQ_PENDSV /* Vector 14: Penable system service request */ - HANDLER stm32_systick, STM32_IRQ_SYSTICK /* Vector 15: System tick */ - -#if !defined(CONFIG_STM32_NOEXT_VECTORS) - -/* IAR Assembler: - * You must not mix assembler language and C-style preprocessor directives. - * Conceptually, they are different languages and mixing them might lead to unexpected - * behavior because an assembler directive is not necessarily accepted as a part of the C - * preprocessor language. - */ - -#if defined(CONFIG_STM32_STM32L15XX) -# include "chip/stm32l15xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F10XX) - - -# if defined(CONFIG_STM32_VALUELINE) - - HANDLER stm32_wwdg, STM32_IRQ_WWDG /* Vector 16+0: Window Watchdog interrupt */ - HANDLER stm32_pvd, STM32_IRQ_PVD /* Vector 16+1: PVD through EXTI Line detection interrupt */ - HANDLER stm32_tamper, STM32_IRQ_TAMPER /* Vector 16+2: Tamper interrupt */ - HANDLER stm32_rtc, STM32_IRQ_RTC /* Vector 16+3: RTC Wakeup through EXTI line interrupt */ - HANDLER stm32_flash, STM32_IRQ_FLASH /* Vector 16+4: Flash global interrupt */ - HANDLER stm32_rcc, STM32_IRQ_RCC /* Vector 16+5: RCC global interrupt */ - HANDLER stm32_exti0, STM32_IRQ_EXTI0 /* Vector 16+6: EXTI Line 0 interrupt */ - HANDLER stm32_exti1, STM32_IRQ_EXTI1 /* Vector 16+7: EXTI Line 1 interrupt */ - HANDLER stm32_exti2, STM32_IRQ_EXTI2 /* Vector 16+8: EXTI Line 2 interrupt */ - HANDLER stm32_exti3, STM32_IRQ_EXTI3 /* Vector 16+9: EXTI Line 3 interrupt */ - HANDLER stm32_exti4, STM32_IRQ_EXTI4 /* Vector 16+10: EXTI Line 4 interrupt */ - HANDLER stm32_dma1ch1, STM32_IRQ_DMA1CH1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - HANDLER stm32_dma1ch2, STM32_IRQ_DMA1CH2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - HANDLER stm32_dma1ch3, STM32_IRQ_DMA1CH3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - HANDLER stm32_dma1ch4, STM32_IRQ_DMA1CH4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - HANDLER stm32_dma1ch5, STM32_IRQ_DMA1CH5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - HANDLER stm32_dma1ch6, STM32_IRQ_DMA1CH6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - HANDLER stm32_dma1ch7, STM32_IRQ_DMA1CH7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - HANDLER stm32_adc1, STM32_IRQ_ADC1 /* Vector 16+18: ADC1 global interrupt */ - HANDLER stm32_exti95, STM32_IRQ_EXTI95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - HANDLER stm32_tim1brk, STM32_IRQ_TIM1BRK /* Vector 16+24: TIM1 Break interrupt; TIM15 global interrupt */ - HANDLER stm32_tim1up, STM32_IRQ_TIM1UP /* Vector 16+25: TIM1 Update interrupt; TIM16 global interrupt */ - HANDLER stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM /* Vector 16+26: TIM1 Trigger and Commutation interrupts; TIM17 global interrupt */ - HANDLER stm32_tim1cc, STM32_IRQ_TIM1CC /* Vector 16+27: TIM1 Capture Compare interrupt */ - HANDLER stm32_tim2, STM32_IRQ_TIM2 /* Vector 16+28: TIM2 global interrupt */ - HANDLER stm32_tim3, STM32_IRQ_TIM3 /* Vector 16+29: TIM3 global interrupt */ - HANDLER stm32_tim4, STM32_IRQ_TIM4 /* Vector 16+30: TIM4 global interrupt */ - HANDLER stm32_i2c1ev, STM32_IRQ_I2C1EV /* Vector 16+31: I2C1 event interrupt */ - HANDLER stm32_i2c1er, STM32_IRQ_I2C1ER /* Vector 16+32: I2C1 error interrupt */ - HANDLER stm32_i2c2ev, STM32_IRQ_I2C2EV /* Vector 16+33: I2C2 event interrupt */ - HANDLER stm32_i2c2er, STM32_IRQ_I2C2ER /* Vector 16+34: I2C2 error interrupt */ - HANDLER stm32_spi1, STM32_IRQ_SPI1 /* Vector 16+35: SPI1 global interrupt */ - HANDLER stm32_spi2, STM32_IRQ_SPI2 /* Vector 16+36: SPI2 global interrupt */ - HANDLER stm32_usart1, STM32_IRQ_USART1 /* Vector 16+37: USART1 global interrupt */ - HANDLER stm32_usart2, STM32_IRQ_USART2 /* Vector 16+38: USART2 global interrupt */ - HANDLER stm32_usart3, STM32_IRQ_USART3 /* Vector 16+39: USART3 global interrupt */ - HANDLER stm32_exti1510, STM32_IRQ_EXTI1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - HANDLER stm32_rtcalr, STM32_IRQ_RTCALR /* Vector 16+41: RTC alarms (A and B) through EXTI line interrupt */ - HANDLER stm32_cec, STM32_IRQ_CEC /* Vector 16+42: CEC global interrupt */ - HANDLER stm32_tim12, STM32_IRQ_TIM12 /* Vector 16+43: TIM12 global interrupt */ - HANDLER stm32_tim13, STM32_IRQ_TIM13 /* Vector 16+44: TIM13 global interrupt */ - HANDLER stm32_tim14, STM32_IRQ_TIM14 /* Vector 16+45: TIM14 global interrupt */ - HANDLER stm32_fsmc, STM32_IRQ_FSMC /* Vector 16+48: FSMC global interrupt */ - HANDLER stm32_tim5, STM32_IRQ_TIM5 /* Vector 16+50: TIM5 global interrupt */ - HANDLER stm32_spi3, STM32_IRQ_SPI3 /* Vector 16+51: SPI3 global interrupt */ - HANDLER stm32_uart4, STM32_IRQ_UART4 /* Vector 16+52: USART2 global interrupt */ - HANDLER stm32_uart5, STM32_IRQ_UART5 /* Vector 16+53: UART5 global interrupt */ - HANDLER stm32_tim6, STM32_IRQ_TIM6 /* Vector 16+54: TIM6 global interrupt */ - HANDLER stm32_tim7, STM32_IRQ_TIM7 /* Vector 16+55: TIM7 global interrupt */ - HANDLER stm32_dma2ch1, STM32_IRQ_DMA2CH1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - HANDLER stm32_dma2ch2, STM32_IRQ_DMA2CH2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - HANDLER stm32_dma2ch3, STM32_IRQ_DMA2CH3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - HANDLER stm32_dma2ch45, STM32_IRQ_DMA2CH45 /* Vector 16+59: DMA2 Channel 4 and 5 global interrupt */ - HANDLER stm32_dma2ch5, STM32_IRQ_DMA2CH5 /* Vector 16+60: DMA2 Channel 5 global interrupt */ - -# elif defined(CONFIG_STM32_CONNECTIVITYLINE) - - HANDLER stm32_wwdg, STM32_IRQ_WWDG /* Vector 16+0: Window Watchdog interrupt */ - HANDLER stm32_pvd, STM32_IRQ_PVD /* Vector 16+1: PVD through EXTI Line detection interrupt */ - HANDLER stm32_tamper, STM32_IRQ_TAMPER /* Vector 16+2: Tamper interrupt */ - HANDLER stm32_rtc, STM32_IRQ_RTC /* Vector 16+3: RTC global interrupt */ - HANDLER stm32_flash, STM32_IRQ_FLASH /* Vector 16+4: Flash global interrupt */ - HANDLER stm32_rcc, STM32_IRQ_RCC /* Vector 16+5: RCC global interrupt */ - HANDLER stm32_exti0, STM32_IRQ_EXTI0 /* Vector 16+6: EXTI Line 0 interrupt */ - HANDLER stm32_exti1, STM32_IRQ_EXTI1 /* Vector 16+7: EXTI Line 1 interrupt */ - HANDLER stm32_exti2, STM32_IRQ_EXTI2 /* Vector 16+8: EXTI Line 2 interrupt */ - HANDLER stm32_exti3, STM32_IRQ_EXTI3 /* Vector 16+9: EXTI Line 3 interrupt */ - HANDLER stm32_exti4, STM32_IRQ_EXTI4 /* Vector 16+10: EXTI Line 4 interrupt */ - HANDLER stm32_dma1ch1, STM32_IRQ_DMA1CH1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - HANDLER stm32_dma1ch2, STM32_IRQ_DMA1CH2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - HANDLER stm32_dma1ch3, STM32_IRQ_DMA1CH3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - HANDLER stm32_dma1ch4, STM32_IRQ_DMA1CH4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - HANDLER stm32_dma1ch5, STM32_IRQ_DMA1CH5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - HANDLER stm32_dma1ch6, STM32_IRQ_DMA1CH6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - HANDLER stm32_dma1ch7, STM32_IRQ_DMA1CH7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - HANDLER stm32_adc12, STM32_IRQ_ADC12 /* Vector 16+18: ADC1 and ADC2 global interrupt */ - HANDLER stm32_can1tx, STM32_IRQ_CAN1TX /* Vector 16+19: CAN1 TX interrupts */ - HANDLER stm32_can1rx0, STM32_IRQ_CAN1RX0 /* Vector 16+20: CAN1 RX0 interrupts */ - HANDLER stm32_can1rx, STM32_IRQ_CAN1RX1 /* Vector 16+21: CAN1 RX1 interrupt */ - HANDLER stm32_can1sce, STM32_IRQ_CAN1SCE /* Vector 16+22: CAN1 SCE interrupt */ - HANDLER stm32_exti95, STM32_IRQ_EXTI95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - HANDLER stm32_tim1brk, STM32_IRQ_TIM1BRK /* Vector 16+24: TIM1 Break interrupt */ - HANDLER stm32_tim1up, STM32_IRQ_TIM1UP /* Vector 16+25: TIM1 Update interrupt */ - HANDLER stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ - HANDLER stm32_tim1cc, STM32_IRQ_TIM1CC /* Vector 16+27: TIM1 Capture Compare interrupt */ - HANDLER stm32_tim2, STM32_IRQ_TIM2 /* Vector 16+28: TIM2 global interrupt */ - HANDLER stm32_tim3, STM32_IRQ_TIM3 /* Vector 16+29: TIM3 global interrupt */ - HANDLER stm32_tim4, STM32_IRQ_TIM4 /* Vector 16+30: TIM4 global interrupt */ - HANDLER stm32_i2c1ev, STM32_IRQ_I2C1EV /* Vector 16+31: I2C1 event interrupt */ - HANDLER stm32_i2c1er, STM32_IRQ_I2C1ER /* Vector 16+32: I2C1 error interrupt */ - HANDLER stm32_i2c2ev, STM32_IRQ_I2C2EV /* Vector 16+33: I2C2 event interrupt */ - HANDLER stm32_i2c2er, STM32_IRQ_I2C2ER /* Vector 16+34: I2C2 error interrupt */ - HANDLER stm32_spi1, STM32_IRQ_SPI1 /* Vector 16+35: SPI1 global interrupt */ - HANDLER stm32_spi2, STM32_IRQ_SPI2 /* Vector 16+36: SPI2 global interrupt */ - HANDLER stm32_usart1, STM32_IRQ_USART1 /* Vector 16+37: USART1 global interrupt */ - HANDLER stm32_usart2, STM32_IRQ_USART2 /* Vector 16+38: USART2 global interrupt */ - HANDLER stm32_usart3, STM32_IRQ_USART3 /* Vector 16+39: USART3 global interrupt */ - HANDLER stm32_exti1510, STM32_IRQ_EXTI1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - HANDLER stm32_rtcalr, STM32_IRQ_RTCALRM /* Vector 16+41: RTC alarm through EXTI line interrupt */ - HANDLER stm32_otgfswkup, STM32_IRQ_OTGFSWKUP /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ - HANDLER stm32_tim5, STM32_IRQ_TIM5 /* Vector 16+50: TIM5 global interrupt */ - HANDLER stm32_spi3, STM32_IRQ_SPI3 /* Vector 16+51: SPI3 global interrupt */ - HANDLER stm32_uart4 , STM32_IRQ_UART4 /* Vector 16+52: UART4 global interrupt */ - HANDLER stm32_uart5, STM32_IRQ_UART5 /* Vector 16+53: UART5 global interrupt */ - HANDLER stm32_tim6, STM32_IRQ_TIM6 /* Vector 16+54: TIM6 global interrupt */ - HANDLER stm32_tim7, STM32_IRQ_TIM7 /* Vector 16+55: TIM7 global interrupt */ - HANDLER stm32_dma2ch1, STM32_IRQ_DMA2CH1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - HANDLER stm32_dma2ch2, STM32_IRQ_DMA2CH2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - HANDLER stm32_dma2ch3, STM32_IRQ_DMA2CH3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - HANDLER stm32_dma2ch4, STM32_IRQ_DMA2CH4 /* Vector 16+59: DMA2 Channel 4 global interrupt */ - HANDLER stm32_dma2ch5, STM32_IRQ_DMA2CH5 /* Vector 16+60: DMA2 Channel 5 global interrupt */ - HANDLER stm32_eth, STM32_IRQ_ETH /* Vector 16+61: Ethernet global interrupt */ - HANDLER stm32_ethwkup, STM32_IRQ_ETHWKUP /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ - HANDLER stm32_can2tx, STM32_IRQ_CAN2TX /* Vector 16+63: CAN2 TX interrupts */ - HANDLER stm32_can2rx0, STM32_IRQ_CAN2RX0 /* Vector 16+64: CAN2 RX0 interrupts */ - HANDLER stm32_can2rx1, STM32_IRQ_CAN2RX1 /* Vector 16+65: CAN2 RX1 interrupt */ - HANDLER stm32_can2sce, STM32_IRQ_CAN2SCE /* Vector 16+66: CAN2 SCE interrupt */ - HANDLER stm32_otgfs, STM32_IRQ_OTGFS /* Vector 16+67: USB On The Go FS global interrupt */ - -# else /* CONFIG_STM32_CONNECTIVITYLINE */ - - HANDLER stm32_wwdg, STM32_IRQ_WWDG /* Vector 16+0: Window Watchdog interrupt */ - HANDLER stm32_pvd, STM32_IRQ_PVD /* Vector 16+1: PVD through EXTI Line detection interrupt */ - HANDLER stm32_tamper, STM32_IRQ_TAMPER /* Vector 16+2: Tamper interrupt */ - HANDLER stm32_rtc, STM32_IRQ_RTC /* Vector 16+3: RTC global interrupt */ - HANDLER stm32_flash, STM32_IRQ_FLASH /* Vector 16+4: Flash global interrupt */ - HANDLER stm32_rcc, STM32_IRQ_RCC /* Vector 16+5: RCC global interrupt */ - HANDLER stm32_exti0, STM32_IRQ_EXTI0 /* Vector 16+6: EXTI Line 0 interrupt */ - HANDLER stm32_exti1, STM32_IRQ_EXTI1 /* Vector 16+7: EXTI Line 1 interrupt */ - HANDLER stm32_exti2, STM32_IRQ_EXTI2 /* Vector 16+8: EXTI Line 2 interrupt */ - HANDLER stm32_exti3, STM32_IRQ_EXTI3 /* Vector 16+9: EXTI Line 3 interrupt */ - HANDLER stm32_exti4, STM32_IRQ_EXTI4 /* Vector 16+10: EXTI Line 4 interrupt */ - HANDLER stm32_dma1ch1, STM32_IRQ_DMA1CH1 /* Vector 16+11: DMA1 Channel 1 global interrupt */ - HANDLER stm32_dma1ch2, STM32_IRQ_DMA1CH2 /* Vector 16+12: DMA1 Channel 2 global interrupt */ - HANDLER stm32_dma1ch3, STM32_IRQ_DMA1CH3 /* Vector 16+13: DMA1 Channel 3 global interrupt */ - HANDLER stm32_dma1ch4, STM32_IRQ_DMA1CH4 /* Vector 16+14: DMA1 Channel 4 global interrupt */ - HANDLER stm32_dma1ch5, STM32_IRQ_DMA1CH5 /* Vector 16+15: DMA1 Channel 5 global interrupt */ - HANDLER stm32_dma1ch6, STM32_IRQ_DMA1CH6 /* Vector 16+16: DMA1 Channel 6 global interrupt */ - HANDLER stm32_dma1ch7, STM32_IRQ_DMA1CH7 /* Vector 16+17: DMA1 Channel 7 global interrupt */ - HANDLER stm32_adc12, STM32_IRQ_ADC12 /* Vector 16+18: ADC1 and ADC2 global interrupt */ - HANDLER stm32_usbhpcantx, STM32_IRQ_USBHPCANTX /* Vector 16+19: USB High Priority or CAN TX interrupts*/ - HANDLER stm32_usblpcanrx0, STM32_IRQ_USBLPCANRX0 /* Vector 16+20: USB Low Priority or CAN RX0 interrupts*/ - HANDLER stm32_can1rx1, STM32_IRQ_CAN1RX1 /* Vector 16+21: CAN1 RX1 interrupt */ - HANDLER stm32_can1sce, STM32_IRQ_CAN1SCE /* Vector 16+22: CAN1 SCE interrupt */ - HANDLER stm32_exti95, STM32_IRQ_EXTI95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - HANDLER stm32_tim1brk, STM32_IRQ_TIM1BRK /* Vector 16+24: TIM1 Break interrupt */ - HANDLER stm32_tim1up, STM32_IRQ_TIM1UP /* Vector 16+25: TIM1 Update interrupt */ - HANDLER stm32_tim1rtgcom, STM32_IRQ_TIM1TRGCOM /* Vector 16+26: TIM1 Trigger and Commutation interrupts */ - HANDLER stm32_tim1cc, STM32_IRQ_TIM1CC /* Vector 16+27: TIM1 Capture Compare interrupt */ - HANDLER stm32_tim2, STM32_IRQ_TIM2 /* Vector 16+28: TIM2 global interrupt */ - HANDLER stm32_tim3, STM32_IRQ_TIM3 /* Vector 16+29: TIM3 global interrupt */ - HANDLER stm32_tim4, STM32_IRQ_TIM4 /* Vector 16+30: TIM4 global interrupt */ - HANDLER stm32_i2c1ev, STM32_IRQ_I2C1EV /* Vector 16+31: I2C1 event interrupt */ - HANDLER stm32_i2c1er, STM32_IRQ_I2C1ER /* Vector 16+32: I2C1 error interrupt */ - HANDLER stm32_i2c2ev, STM32_IRQ_I2C2EV /* Vector 16+33: I2C2 event interrupt */ - HANDLER stm32_i2c2er, STM32_IRQ_I2C2ER /* Vector 16+34: I2C2 error interrupt */ - HANDLER stm32_spi1, STM32_IRQ_SPI1 /* Vector 16+35: SPI1 global interrupt */ - HANDLER stm32_spi2, STM32_IRQ_SPI2 /* Vector 16+36: SPI2 global interrupt */ - HANDLER stm32_usart1, STM32_IRQ_USART1 /* Vector 16+37: USART1 global interrupt */ - HANDLER stm32_usart2, STM32_IRQ_USART2 /* Vector 16+38: USART2 global interrupt */ - HANDLER stm32_usart3, STM32_IRQ_USART3 /* Vector 16+39: USART3 global interrupt */ - HANDLER stm32_exti1510, STM32_IRQ_EXTI1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - HANDLER stm32_rtcalr, STM32_IRQ_RTCALRM /* Vector 16+41: RTC alarm through EXTI line interrupt */ - HANDLER stm32_usbwkup, STM32_IRQ_USBWKUP /* Vector 16+42: USB wakeup from suspend through EXTI line interrupt*/ - HANDLER stm32_tim8brk, STM32_IRQ_TIM8BRK /* Vector 16+43: TIM8 Break interrupt */ - HANDLER stm32_tim8up, STM32_IRQ_TIM8UP /* Vector 16+44: TIM8 Update interrupt */ - HANDLER stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM /* Vector 16+45: TIM8 Trigger and Commutation interrupts */ - HANDLER stm32_tim8cc, STM32_IRQ_TIM8CC /* Vector 16+46: TIM8 Capture Compare interrupt */ - HANDLER stm32_adc3, STM32_IRQ_ADC3 /* Vector 16+47: ADC3 global interrupt */ - HANDLER stm32_fsmc, STM32_IRQ_FSMC /* Vector 16+48: FSMC global interrupt */ - HANDLER stm32_sdio, STM32_IRQ_SDIO /* Vector 16+49: SDIO global interrupt */ - HANDLER stm32_tim5, STM32_IRQ_TIM5 /* Vector 16+50: TIM5 global interrupt */ - HANDLER stm32_spi3, STM32_IRQ_SPI3 /* Vector 16+51: SPI3 global interrupt */ - HANDLER stm32_uart4, STM32_IRQ_UART4 /* Vector 16+52: UART4 global interrupt */ - HANDLER stm32_uart5, STM32_IRQ_UART5 /* Vector 16+53: UART5 global interrupt */ - HANDLER stm32_tim6, STM32_IRQ_TIM6 /* Vector 16+54: TIM6 global interrupt */ - HANDLER stm32_tim7, STM32_IRQ_TIM7 /* Vector 16+55: TIM7 global interrupt */ - HANDLER stm32_dma2ch1, STM32_IRQ_DMA2CH1 /* Vector 16+56: DMA2 Channel 1 global interrupt */ - HANDLER stm32_dma2ch2, STM32_IRQ_DMA2CH2 /* Vector 16+57: DMA2 Channel 2 global interrupt */ - HANDLER stm32_dma2ch3, STM32_IRQ_DMA2CH3 /* Vector 16+58: DMA2 Channel 3 global interrupt */ - HANDLER stm32_dma2ch45, STM32_IRQ_DMA2CH45 /* Vector 16+59: DMA2 Channel 4&5 global interrupt */ - -# endif /* CONFIG_STM32_CONNECTIVITYLINE */ - -#elif defined(CONFIG_STM32_STM32F20XX) - - HANDLER stm32_wwdg, STM32_IRQ_WWDG /* Vector 16+0: Window Watchdog interrupt */ - HANDLER stm32_pvd, STM32_IRQ_PVD /* Vector 16+1: PVD through EXTI Line detection interrupt */ - HANDLER stm32_tamper, STM32_IRQ_TAMPER /* Vector 16+2: Tamper and time stamp interrupts */ - HANDLER stm32_rtc_wkup, STM32_IRQ_RTC_WKUP /* Vector 16+3: RTC global interrupt */ - HANDLER stm32_flash, STM32_IRQ_FLASH /* Vector 16+4: Flash global interrupt */ - HANDLER stm32_rcc, STM32_IRQ_RCC /* Vector 16+5: RCC global interrupt */ - HANDLER stm32_exti0, STM32_IRQ_EXTI0 /* Vector 16+6: EXTI Line 0 interrupt */ - HANDLER stm32_exti1, STM32_IRQ_EXTI1 /* Vector 16+7: EXTI Line 1 interrupt */ - HANDLER stm32_exti2, STM32_IRQ_EXTI2 /* Vector 16+8: EXTI Line 2 interrupt */ - HANDLER stm32_exti3, STM32_IRQ_EXTI3 /* Vector 16+9: EXTI Line 3 interrupt */ - HANDLER stm32_exti4, STM32_IRQ_EXTI4 /* Vector 16+10: EXTI Line 4 interrupt */ - HANDLER stm32_dma1s0, STM32_IRQ_DMA1S0 /* Vector 16+11: DMA1 Stream 0 global interrupt */ - HANDLER stm32_dma1s1, STM32_IRQ_DMA1S1 /* Vector 16+12: DMA1 Stream 1 global interrupt */ - HANDLER stm32_dma1s2, STM32_IRQ_DMA1S2 /* Vector 16+13: DMA1 Stream 2 global interrupt */ - HANDLER stm32_dma1s3, STM32_IRQ_DMA1S3 /* Vector 16+14: DMA1 Stream 3 global interrupt */ - HANDLER stm32_dma1s4, STM32_IRQ_DMA1S4 /* Vector 16+15: DMA1 Stream 4 global interrupt */ - HANDLER stm32_dma1s5, STM32_IRQ_DMA1S5 /* Vector 16+16: DMA1 Stream 5 global interrupt */ - HANDLER stm32_dma1s6, STM32_IRQ_DMA1S6 /* Vector 16+17: DMA1 Stream 6 global interrupt */ - HANDLER stm32_adc, STM32_IRQ_ADC /* Vector 16+18: ADC1, ADC2, and ADC3 global interrupt */ - HANDLER stm32_can1tx, STM32_IRQ_CAN1TX /* Vector 16+19: CAN1 TX interrupts */ - HANDLER stm32_can1rx0, STM32_IRQ_CAN1RX0 /* Vector 16+20: CAN1 RX0 interrupts */ - HANDLER stm32_can1rx1, STM32_IRQ_CAN1RX1 /* Vector 16+21: CAN1 RX1 interrupt */ - HANDLER stm32_can1sce, STM32_IRQ_CAN1SCE /* Vector 16+22: CAN1 SCE interrupt */ - HANDLER stm32_exti95, STM32_IRQ_EXTI95 /* Vector 16+23: EXTI Line[9:5] interrupts */ - HANDLER stm32_tim1brk, STM32_IRQ_TIM1BRK /* Vector 16+24: TIM1 Break interrupt/TIM9 global interrupt */ - HANDLER stm32_tim1up, STM32_IRQ_TIM1UP /* Vector 16+25: TIM1 Update interrupt/TIM10 global interrupt */ - HANDLER stm32_tim1trgcom, STM32_IRQ_TIM1TRGCOM /* Vector 16+26: TIM1 Trigger and Commutation interrupts/TIM11 global interrupt */ - HANDLER stm32_tim1cc, STM32_IRQ_TIM1CC /* Vector 16+27: TIM1 Capture Compare interrupt */ - HANDLER stm32_tim2, STM32_IRQ_TIM2 /* Vector 16+28: TIM2 global interrupt */ - HANDLER stm32_tim3, STM32_IRQ_TIM3 /* Vector 16+29: TIM3 global interrupt */ - HANDLER stm32_tim4, STM32_IRQ_TIM4 /* Vector 16+30: TIM4 global interrupt */ - HANDLER stm32_i2c1ev, STM32_IRQ_I2C1EV /* Vector 16+31: I2C1 event interrupt */ - HANDLER stm32_i2c1er, STM32_IRQ_I2C1ER /* Vector 16+32: I2C1 error interrupt */ - HANDLER stm32_i2c2ev, STM32_IRQ_I2C2EV /* Vector 16+33: I2C2 event interrupt */ - HANDLER stm32_i2c2er, STM32_IRQ_I2C2ER /* Vector 16+34: I2C2 error interrupt */ - HANDLER stm32_spi1, STM32_IRQ_SPI1 /* Vector 16+35: SPI1 global interrupt */ - HANDLER stm32_spi2, STM32_IRQ_SPI2 /* Vector 16+36: SPI2 global interrupt */ - HANDLER stm32_usart1, STM32_IRQ_USART1 /* Vector 16+37: USART1 global interrupt */ - HANDLER stm32_usart2, STM32_IRQ_USART2 /* Vector 16+38: USART2 global interrupt */ - HANDLER stm32_usart3, STM32_IRQ_USART3 /* Vector 16+39: USART3 global interrupt */ - HANDLER stm32_exti1510, STM32_IRQ_EXTI1510 /* Vector 16+40: EXTI Line[15:10] interrupts */ - HANDLER stm32_rtcalrm, STM32_IRQ_RTCALRM /* Vector 16+41: RTC alarm through EXTI line interrupt */ - HANDLER stm32_otgfswkup, STM32_IRQ_OTGFSWKUP /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */ - HANDLER stm32_tim8brk, STM32_IRQ_TIM8BRK /* Vector 16+43: TIM8 Break interrupt/TIM12 global interrupt */ - HANDLER stm32_tim8up, STM32_IRQ_TIM8UP /* Vector 16+44: TIM8 Update interrup/TIM13 global interrupt */ - HANDLER stm32_tim8trgcom, STM32_IRQ_TIM8TRGCOM /* Vector 16+45: TIM8 Trigger and Commutation interrupts/TIM14 global interrupt */ - HANDLER stm32_tim8cc, STM32_IRQ_TIM8CC /* Vector 16+46: TIM8 Capture Compare interrupt */ - HANDLER stm32_dma1s7, STM32_IRQ_DMA1S7 /* Vector 16+47: DMA1 Stream 7 global interrupt */ - HANDLER stm32_fsmc, STM32_IRQ_FSMC /* Vector 16+48: FSMC global interrupt */ - HANDLER stm32_sdio, STM32_IRQ_SDIO /* Vector 16+49: SDIO global interrupt */ - HANDLER stm32_tim5, STM32_IRQ_TIM5 /* Vector 16+50: TIM5 global interrupt */ - HANDLER stm32_spi3, STM32_IRQ_SPI3 /* Vector 16+51: SPI3 global interrupt */ - HANDLER stm32_uart4, STM32_IRQ_UART4 /* Vector 16+52: UART4 global interrupt */ - HANDLER stm32_uart5, STM32_IRQ_UART5 /* Vector 16+53: UART5 global interrupt */ - HANDLER stm32_tim6, STM32_IRQ_TIM6 /* Vector 16+54: TIM6 global interrupt/DAC1 and DAC2 underrun error interrupts */ - HANDLER stm32_tim7, STM32_IRQ_TIM7 /* Vector 16+55: TIM7 global interrupt */ - HANDLER stm32_dma2s0, STM32_IRQ_DMA2S0 /* Vector 16+56: DMA2 Stream 0 global interrupt */ - HANDLER stm32_dma2s1, STM32_IRQ_DMA2S1 /* Vector 16+57: DMA2 Stream 1 global interrupt */ - HANDLER stm32_dma2s2, STM32_IRQ_DMA2S2 /* Vector 16+58: DMA2 Stream 2 global interrupt */ - HANDLER stm32_dma2s3, STM32_IRQ_DMA2S3 /* Vector 16+59: DMA2 Stream 3 global interrupt */ - HANDLER stm32_dma2s4, STM32_IRQ_DMA2S4 /* Vector 16+60: DMA2 Stream 4 global interrupt */ - HANDLER stm32_eth, STM32_IRQ_ETH /* Vector 16+61: Ethernet global interrupt */ - HANDLER stm32_ethwkup, STM32_IRQ_ETHWKUP /* Vector 16+62: Ethernet Wakeup through EXTI line interrupt */ - HANDLER stm32_can2tx, STM32_IRQ_CAN2TX /* Vector 16+63: CAN2 TX interrupts */ - HANDLER stm32_can2rx0, STM32_IRQ_CAN2RX0 /* Vector 16+64: CAN2 RX0 interrupts */ - HANDLER stm32_can2rx1, STM32_IRQ_CAN2RX1 /* Vector 16+65: CAN2 RX1 interrupt */ - HANDLER stm32_can2sce, STM32_IRQ_CAN2SCE /* Vector 16+66: CAN2 SCE interrupt */ - HANDLER stm32_otgfs, STM32_IRQ_OTGFS /* Vector 16+67: USB On The Go FS global interrupt */ - HANDLER stm32_dma2s5, STM32_IRQ_DMA2S5 /* Vector 16+68: DMA2 Stream 5 global interrupt */ - HANDLER stm32_dma2s6, STM32_IRQ_DMA2S6 /* Vector 16+69: DMA2 Stream 6 global interrupt */ - HANDLER stm32_dma2s7, STM32_IRQ_DMA2S7 /* Vector 16+70: DMA2 Stream 7 global interrupt */ - HANDLER stm32_usart6, STM32_IRQ_USART6 /* Vector 16+71: USART6 global interrupt */ - HANDLER stm32_i2c3ev, STM32_IRQ_I2C3EV /* Vector 16+72: I2C3 event interrupt */ - HANDLER stm32_i2c3er, STM32_IRQ_I2C3ER /* Vector 16+73: I2C3 error interrupt */ - HANDLER stm32_otghsep1out, STM32_IRQ_OTGHSEP1OUT /* Vector 16+74: USB On The Go HS End Point 1 Out global interrupt */ - HANDLER stm32_otghsep1in, STM32_IRQ_OTGHSEP1IN /* Vector 16+75: USB On The Go HS End Point 1 In global interrupt */ - HANDLER stm32_otghswkup, STM32_IRQ_OTGHSWKUP /* Vector 16+76: USB On The Go HS Wakeup through EXTI interrupt */ - HANDLER stm32_otghs, STM32_IRQ_OTGHS /* Vector 16+77: USB On The Go HS global interrupt */ - HANDLER stm32_dcmi, STM32_IRQ_DCMI /* Vector 16+78: DCMI global interrupt */ - HANDLER stm32_cryp, STM32_IRQ_CRYP /* Vector 16+79: CRYP crypto global interrupt */ - HANDLER stm32_hash, STM32_IRQ_HASH /* Vector 16+80: Hash and Rng global interrupt */ - -#elif defined(CONFIG_STM32_STM32F30XX) -# include "chip/stm32f30xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F33XX) -# include "chip/stm32f33xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F37XX) -# include "chip/stm32f37xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F427) || defined(CONFIG_STM32_STM32F429) -# include "chip/stm32f42xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F446) -# include "chip/stm32f44xxx_vectors.h" -#elif defined(CONFIG_STM32_STM32F4XXX) -# include "chip/stm32f40xxx_vectors.h" -#else -# error "No handlers for STM32 chip" -#endif - -#endif /* CONFIG_STM32_NOEXT_VECTORS */ - -/* Common IRQ handling logic. On entry here, the return stack is on either - * the PSP or the MSP and looks like the following: - * - * REG_XPSR - * REG_R15 - * REG_R14 - * REG_R12 - * REG_R3 - * REG_R2 - * REG_R1 - * MSP->REG_R0 - * - * And - * R0 contains the IRQ number - * R14 Contains the EXC_RETURN value - * We are in handler mode and the current SP is the MSP - */ - - PUBLIC exception_common - -exception_common: - - /* Complete the context save */ - -#ifdef CONFIG_BUILD_PROTECTED - /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 - * (handler mode) if the stack is on the MSP. It can only be on the PSP if - * EXC_RETURN is 0xfffffffd (unprivileged thread) - */ - - tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ - beq l1 /* Branch if context already on the MSP */ - mrs r1, psp /* R1=The process stack pointer (PSP) */ - mov sp, r1 /* Set the MSP to the PSP */ - -l1: -#endif - - /* r1 holds the value of the stack pointer AFTER the exception handling logic - * pushed the various registers onto the stack. Get r2 = the value of the - * stack pointer BEFORE the interrupt modified it. - */ - - mov r2, sp /* R2=Copy of the main/process stack pointer */ - add r2, r2, #HW_XCPT_SIZE /* R2=MSP/PSP before the interrupt was taken */ -#ifdef CONFIG_ARMV7M_USEBASEPRI - mrs r3, basepri /* R3=Current BASEPRI setting */ -#else - mrs r3, primask /* R3=Current PRIMASK setting */ -#endif - -#ifdef CONFIG_ARCH_FPU - /* Skip over the block of memory reserved for floating pointer register save. - * Lazy FPU register saving is used. FPU registers will be saved in this - * block only if a context switch occurs (this means, of course, that the FPU - * cannot be used in interrupt processing). - */ - - sub sp, #(4*SW_FPU_REGS) -#endif - - /* Save the remaining registers on the stack after the registers pushed - * by the exception handling logic. r2=SP and r3=primask or basepri, r4-r11, - * r14=register values. - */ - -#ifdef CONFIG_BUILD_PROTECTED - stmdb sp!, {r2-r11,r14} /* Save the remaining registers plus the SP value */ -#else - stmdb sp!, {r2-r11} /* Save the remaining registers plus the SP value */ -#endif - -#ifndef CONFIG_ARCH_HIPRI_INTERRUPT - /* Disable interrupts, select the stack to use for interrupt handling - * and call up_doirq to handle the interrupt - */ - - cpsid i /* Disable further interrupts */ - -#else - /* Set the BASEPRI register so that further normal interrupts will be - * masked. Nested, high priority may still occur, however. - */ - - mov r2, #NVIC_SYSH_DISABLE_PRIORITY - msr basepri, r2 /* Set the BASEPRI */ -#endif - - /* There are two arguments to up_doirq: - * - * R0 = The IRQ number - * R1 = The top of the stack points to the saved state - */ - - mov r1, sp - - /* Also save the top of the stack in a preserved register */ - - mov r4, sp - -#if CONFIG_ARCH_INTERRUPTSTACK > 7 - /* If CONFIG_ARCH_INTERRUPTSTACK is defined, we will set the MSP to use - * a special special interrupt stack pointer. The way that this is done - * here prohibits nested interrupts without some additional logic! - */ - - ldr sp, =g_intstackbase - -#else - /* Otherwise, we will re-use the interrupted thread's stack. That may - * mean using either MSP or PSP stack for interrupt level processing (in - * kernel mode). - */ - - bic r2, r4, #7 /* Get the stack pointer with 8-byte alignment */ - mov sp, r2 /* Instantiate the aligned stack */ - -#endif - - bl up_doirq /* R0=IRQ, R1=register save (msp) */ - mov r1, r4 /* Recover R1=main stack pointer */ - - /* On return from up_doirq, R0 will hold a pointer to register context - * array to use for the interrupt return. If that return value is the same - * as current stack pointer, then things are relatively easy. - */ - - cmp r0, r1 /* Context switch? */ - beq l2 /* Branch if no context switch */ - - /* We are returning with a pending context switch. - * - * If the FPU is enabled, then we will need to restore FPU registers. - * This is not done in normal interrupt save/restore because the cost - * is prohibitive. This is only done when switching contexts. A - * consequence of this is that floating point operations may not be - * performed in interrupt handling logic. - * - * Here: - * r0 = Address of the register save area - * - * NOTE: It is a requirement that up_restorefpu() preserve the value of - * r0! - */ - -#ifdef CONFIG_ARCH_FPU - bl up_restorefpu /* Restore the FPU registers */ -#endif - - /* We are returning with a pending context switch. This case is different - * because in this case, the register save structure does not lie in the - * stack but, rather, within a TCB structure. We'll have to copy some - * values to the stack. - */ - - add r1, r0, #SW_XCPT_SIZE /* R1=Address of HW save area in reg array */ - ldmia r1, {r4-r11} /* Fetch eight registers in HW save area */ - ldr r1, [r0, #(4*REG_SP)] /* R1=Value of SP before interrupt */ - stmdb r1!, {r4-r11} /* Store eight registers in HW save area */ -#ifdef CONFIG_BUILD_PROTECTED - ldmia r0, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ -#else - ldmia r0, {r2-r11} /* Recover R4-R11 + 2 temp values */ -#endif - b l3 /* Re-join common logic */ - - /* We are returning with no context switch. We simply need to "unwind" - * the same stack frame that we created - * - * Here: - * r1 = Address of the return stack (same as r0) - */ - -l2: -#ifdef CONFIG_BUILD_PROTECTED - ldmia r1!, {r2-r11,r14} /* Recover R4-R11, r14 + 2 temp values */ -#else - ldmia r1!, {r2-r11} /* Recover R4-R11 + 2 temp values */ -#endif - -#ifdef CONFIG_ARCH_FPU - /* Skip over the block of memory reserved for floating pointer register - * save. Then R1 is the address of the HW save area - */ - - add r1, #(4*SW_FPU_REGS) -#endif - - /* Set up to return from the exception - * - * Here: - * r1 = Address on the target thread's stack position at the start of - * the registers saved by hardware - * r3 = primask or basepri - * r4-r11 = restored register values - */ - -l3: - -#ifdef CONFIG_BUILD_PROTECTED - /* The EXC_RETURN value will be 0xfffffff9 (privileged thread) or 0xfffffff1 - * (handler mode) if the stack is on the MSP. It can only be on the PSP if - * EXC_RETURN is 0xfffffffd (unprivileged thread) - */ - - mrs r2, control /* R2=Contents of the control register */ - tst r14, #EXC_RETURN_PROCESS_STACK /* nonzero if context on process stack */ - beq l4 /* Branch if privileged */ - - orr r2, r2, #1 /* Unprivileged mode */ - msr psp, r1 /* R1=The process stack pointer */ - b l5 -l4: - bic r2, r2, #1 /* Privileged mode */ - msr msp, r1 /* R1=The main stack pointer */ -l5: - msr control, r2 /* Save the updated control register */ -#else - msr msp, r1 /* Recover the return MSP value */ - - /* Preload r14 with the special return value first (so that the return - * actually occurs with interrupts still disabled). - */ - - ldr r14, =EXC_RETURN_PRIVTHR /* Load the special value */ -#endif - - /* Restore the interrupt state */ - -#ifdef CONFIG_ARMV7M_USEBASEPRI - msr basepri, r3 /* Restore interrupts priority masking */ -#ifndef CONFIG_ARCH_HIPRI_INTERRUPT - cpsie i /* Re-enable interrupts */ -#endif - -#else - msr primask, r3 /* Restore interrupts */ -#endif - - /* Always return with R14 containing the special value that will: (1) - * return to thread mode, and (2) continue to use the MSP - */ - - bx r14 /* And return */ - -/************************************************************************************ - * Name: g_intstackalloc/g_intstackbase - * - * Description: - * Shouldn't happen - * - ************************************************************************************/ - -#if CONFIG_ARCH_INTERRUPTSTACK > 7 - .bss - .global g_intstackalloc - .global g_intstackbase - .align 8 -g_intstackalloc: - .skip ((CONFIG_ARCH_INTERRUPTSTACK + 4) & ~7) -g_intstackbase: - .size g_intstackalloc, .-g_intstackalloc -#endif - -#endif /* CONFIG_ARMV7M_CMNVECTOR */ - -/************************************************************************************ - * .rodata - ************************************************************************************/ - - SECTION .rodata:CONST:NOROOT(2) - -/* Variables: _sbss is the start of the BSS region (see ld.script) _ebss is the end - * of the BSS regsion (see ld.script). The idle task stack starts at the end of BSS - * and is of size CONFIG_IDLETHREAD_STACKSIZE. The IDLE thread is the thread that - * the system boots on and, eventually, becomes the idle, do nothing task that runs - * only when there is nothing else to run. The heap continues from there until the - * end of memory. See g_idle_topstack below. - */ - - PUBLIC g_idle_topstack - -g_idle_topstack: - DCD HEAP_BASE - - END diff --git a/arch/arm/src/stm32/stm32_rcc.h b/arch/arm/src/stm32/stm32_rcc.h index c1b7281578..c31461650c 100644 --- a/arch/arm/src/stm32/stm32_rcc.h +++ b/arch/arm/src/stm32/stm32_rcc.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/stm32/stm32_rcc.h * - * Copyright (C) 2009, 2011-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2014, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -80,14 +80,20 @@ extern "C" * Public Data ************************************************************************************/ -/* This symbol references the Cortex-M3 vector table (as positioned by the linker +/* This symbol references the Cortex-M3/4 vector table (as positioned by the linker * script, ld.script or ld.script.dfu. The standard location for the vector table is * at the beginning of FLASH at address 0x0800:0000. If we are using the STMicro DFU * bootloader, then the vector table will be offset to a different location in FLASH * and we will need to set the NVIC vector location to this alternative location. */ -extern uint32_t _vectors[]; /* See stm32_vectors.S */ +#if defined(__ICCARM__) +/* _vectors replaced on __vector_table for IAR C-SPY Simulator */ + +extern uint32_t __vector_table[]; +#else +extern uint32_t _vectors[]; +#endif /************************************************************************************ * Inline Functions diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c index d960ea86e0..d8483ef163 100644 --- a/arch/arm/src/stm32/stm32_start.c +++ b/arch/arm/src/stm32/stm32_start.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_start.c * - * Copyright (C) 2009, 2011-2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -58,6 +58,36 @@ #include "stm32_start.h" +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* .data is positioned first in the primary RAM followed immediately by .bss. + * The IDLE thread stack lies just after .bss and has size give by + * CONFIG_IDLETHREAD_STACKSIZE; The heap then begins just after the IDLE. + * ARM EABI requires 64 bit stack alignment. + */ + +#define IDLE_STACKSIZE (CONFIG_IDLETHREAD_STACKSIZE & ~7) +#define IDLE_STACK ((uintptr_t)&_ebss + IDLE_STACKSIZE) +#define HEAP_BASE ((uintptr_t)&_ebss + IDLE_STACKSIZE) + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* g_idle_topstack: _sbss is the start of the BSS region as defined by the + * linker script. _ebss lies at the end of the BSS region. The idle task + * stack starts at the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE. + * The IDLE thread is the thread that the system boots on and, eventually, + * becomes the IDLE, do nothing task that runs only when there is nothing + * else to run. The heap continues from there until the end of memory. + * g_idle_topstack is a read-only variable the provides this computed + * address. + */ + +const uintptr_t g_idle_topstack = HEAP_BASE; + /**************************************************************************** * Private Function prototypes ****************************************************************************/ @@ -122,7 +152,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void stm32_fpuconfig(void) { diff --git a/arch/arm/src/stm32/stm32_start.h b/arch/arm/src/stm32/stm32_start.h index 04d5fe840c..ac6b90b6af 100644 --- a/arch/arm/src/stm32/stm32_start.h +++ b/arch/arm/src/stm32/stm32_start.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/stm32/stm32_start.h * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2017-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,6 +42,22 @@ #include +/************************************************************************************ + * Public Data + ************************************************************************************/ + +/* g_idle_topstack: _sbss is the start of the BSS region as defined by the + * linker script. _ebss lies at the end of the BSS region. The idle task + * stack starts at the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE. + * The IDLE thread is the thread that the system boots on and, eventually, + * becomes the IDLE, do nothing task that runs only when there is nothing + * else to run. The heap continues from there until the end of memory. + * g_idle_topstack is a read-only variable the provides this computed + * address. + */ + +extern const uintptr_t g_idle_topstack; + /************************************************************************************ * Public Function Prototypes ************************************************************************************/ diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs index 64210d0655..941729d77f 100644 --- a/arch/arm/src/stm32f7/Make.defs +++ b/arch/arm/src/stm32f7/Make.defs @@ -60,14 +60,12 @@ endif # Configuration-dependent common files -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARMV7M_DCACHE),y) CMN_CSRCS += arch_enable_dcache.c arch_disable_dcache.c @@ -80,11 +78,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c index 0b12cd35e5..8784369d02 100644 --- a/arch/arm/src/stm32f7/stm32_start.c +++ b/arch/arm/src/stm32f7/stm32_start.c @@ -142,7 +142,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void stm32_fpuconfig(void) { diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs index 1131574635..f11e9dfc4a 100644 --- a/arch/arm/src/stm32h7/Make.defs +++ b/arch/arm/src/stm32h7/Make.defs @@ -57,14 +57,12 @@ CMN_CSRCS += up_hardfault.c up_svcall.c up_vfork.c # Configuration-dependent common files -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARMV7M_DCACHE),y) CMN_CSRCS += arch_enable_dcache.c arch_disable_dcache.c @@ -77,11 +75,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y) diff --git a/arch/arm/src/stm32h7/stm32_start.c b/arch/arm/src/stm32h7/stm32_start.c index e0a9190c68..4304baadd9 100644 --- a/arch/arm/src/stm32h7/stm32_start.c +++ b/arch/arm/src/stm32h7/stm32_start.c @@ -143,7 +143,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void stm32_fpuconfig(void) { diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs index 8459f96310..eb79139cb0 100644 --- a/arch/arm/src/stm32l4/Make.defs +++ b/arch/arm/src/stm32l4/Make.defs @@ -62,22 +62,16 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c index 4c1219b760..38b31f6899 100644 --- a/arch/arm/src/stm32l4/stm32l4_start.c +++ b/arch/arm/src/stm32l4/stm32l4_start.c @@ -160,7 +160,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void stm32l4_fpuconfig(void) { diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index 6c4d44a18b..87ead2105a 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -52,14 +52,12 @@ ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y) CMN_CSRCS += up_idle.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs index 06ca7d54f9..805aa331b5 100644 --- a/arch/arm/src/xmc4/Make.defs +++ b/arch/arm/src/xmc4/Make.defs @@ -33,11 +33,7 @@ # ############################################################################ -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) HEAD_ASRC = -else -HEAD_ASRC = xmc4_vectors.S -endif CMN_UASRCS = CMN_UCSRCS = @@ -58,14 +54,12 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c endif -ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) CMN_ASRCS += up_lazyexception.S else CMN_ASRCS += up_exception.S endif CMN_CSRCS += up_vectors.c -endif ifeq ($(CONFIG_ARCH_RAMVECTORS),y) CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c @@ -95,11 +89,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_ASRCS += up_fpu.S -ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_CSRCS += up_copyarmstate.c -else ifeq ($(CONFIG_ARMV7M_LAZYFPU),y) -CMN_CSRCS += up_copyarmstate.c -endif endif ifeq ($(CONFIG_ARMV7M_ITMSYSLOG),y) diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c index 5e65aecaac..caae9a5ace 100644 --- a/arch/arm/src/xmc4/xmc4_start.c +++ b/arch/arm/src/xmc4/xmc4_start.c @@ -108,9 +108,8 @@ static void go_os_start(void *pv, unsigned int nbytes) * g_idle_topstack is a read-only variable the provides this computed * address. */ -#if defined(CONFIG_ARMV7M_CMNVECTOR) + const uintptr_t g_idle_topstack = HEAP_BASE; -#endif /**************************************************************************** * Private Data @@ -155,7 +154,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_ARCH_FPU -#if defined(CONFIG_ARMV7M_CMNVECTOR) && !defined(CONFIG_ARMV7M_LAZYFPU) +#ifndef CONFIG_ARMV7M_LAZYFPU static inline void xmc4_fpu_config(void) { diff --git a/configs/bambino-200e/README.txt b/configs/bambino-200e/README.txt index 9fea0f3252..b7e910fe8e 100644 --- a/configs/bambino-200e/README.txt +++ b/configs/bambino-200e/README.txt @@ -85,39 +85,31 @@ FPU Configuration Options ------------------------- There are two version of the FPU support built into the most NuttX Cortex-M4 -ports. The current LPC43xx port support only one of these options, the "Non- -Lazy Floating Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR -must be defined in *all* LPC43xx configuration files. +ports. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/bambino-200e/src/lpc43_ostest.c b/configs/bambino-200e/src/lpc43_ostest.c index 72f90a6889..a7aad06bd9 100644 --- a/configs/bambino-200e/src/lpc43_ostest.c +++ b/configs/bambino-200e/src/lpc43_ostest.c @@ -60,8 +60,7 @@ #undef HAVE_FPU #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ - defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) && \ - !defined(CONFIG_ARMV7M_CMNVECTOR) + defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif diff --git a/configs/clicker2-stm32/knsh/defconfig b/configs/clicker2-stm32/knsh/defconfig index c39207df0e..7b8d95e744 100644 --- a/configs/clicker2-stm32/knsh/defconfig +++ b/configs/clicker2-stm32/knsh/defconfig @@ -1,19 +1,18 @@ -# CONFIG_NSH_CMDOPT_DF_H is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARM_MPU=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig index 2983630373..056929f56c 100644 --- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig +++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig @@ -2,43 +2,43 @@ # CONFIG_NET_ETHERNET is not set # CONFIG_NET_IPv4 is not set # CONFIG_NSH_DISABLE_TELNETD is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" +CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DRIVERS_IEEE802154=y CONFIG_DRIVERS_WIRELESS=y +CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_DEVNAME="wpan0" -CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_6=0x00ff CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800 +CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616 CONFIG_EXAMPLES_NETTEST_TARGET2=y -CONFIG_EXAMPLES_NETTEST=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y +CONFIG_EXAMPLES_UDP=y CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617 CONFIG_EXAMPLES_UDP_DEVNAME="wpan0" -CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_6=0x00ff CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_8=0x0d00 +CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_EXAMPLES_UDP_TARGET2=y -CONFIG_EXAMPLES_UDP=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -57,22 +57,22 @@ CONFIG_IOB_NCHAINS=16 CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_NETDEV_LATEINIT=y +CONFIG_NETDEV_STATISTICS=y +CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y CONFIG_NET_HOSTNAME="MRF24J40" CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_STATISTICS=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETDEVICES=y -CONFIG_NETUTILS_TELNETD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -88,11 +88,11 @@ CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 -CONFIG_RAM_SIZE=131072 -CONFIG_RAM_START=0x20000000 +CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=131072 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y @@ -113,5 +113,5 @@ CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WIRELESS_IEEE802154=y CONFIG_WIRELESS=y +CONFIG_WIRELESS_IEEE802154=y diff --git a/configs/clicker2-stm32/mrf24j40-starhub/defconfig b/configs/clicker2-stm32/mrf24j40-starhub/defconfig index 84f40e14d4..fcb80eb7c3 100644 --- a/configs/clicker2-stm32/mrf24j40-starhub/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starhub/defconfig @@ -2,26 +2,26 @@ # CONFIG_NET_ETHERNET is not set # CONFIG_NET_IPv4 is not set # CONFIG_NSH_DISABLE_TELNETD is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" +CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DRIVERS_IEEE802154=y CONFIG_DRIVERS_WIRELESS=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -40,6 +40,12 @@ CONFIG_IOB_NCHAINS=16 CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_NETDEV_LATEINIT=y +CONFIG_NETDEV_STATISTICS=y +CONFIG_NETDEV_TELNET=y +CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y CONFIG_NET_HOSTNAME="MRF24J40" @@ -48,16 +54,10 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y CONFIG_NET_STARHUB=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_STATISTICS=y -CONFIG_NETDEV_TELNET=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETDEVICES=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -73,11 +73,11 @@ CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 -CONFIG_RAM_SIZE=131072 -CONFIG_RAM_START=0x20000000 +CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=131072 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y @@ -98,5 +98,5 @@ CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WIRELESS_IEEE802154=y CONFIG_WIRELESS=y +CONFIG_WIRELESS_IEEE802154=y diff --git a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig index 5d300bf367..79df886e21 100644 --- a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig +++ b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig @@ -2,43 +2,43 @@ # CONFIG_NET_ETHERNET is not set # CONFIG_NET_IPv4 is not set # CONFIG_NSH_DISABLE_TELNETD is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" +CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DRIVERS_IEEE802154=y CONFIG_DRIVERS_WIRELESS=y +CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_DEVNAME="wpan0" -CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_6=0x00ff CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800 +CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616 CONFIG_EXAMPLES_NETTEST_TARGET2=y -CONFIG_EXAMPLES_NETTEST=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y +CONFIG_EXAMPLES_UDP=y CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617 CONFIG_EXAMPLES_UDP_DEVNAME="wpan0" -CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_6=0x00ff CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_8=0x0d00 +CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_EXAMPLES_UDP_TARGET2=y -CONFIG_EXAMPLES_UDP=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -57,6 +57,13 @@ CONFIG_IOB_NCHAINS=16 CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_NET=y +CONFIG_NETDEVICES=y +CONFIG_NETDEV_LATEINIT=y +CONFIG_NETDEV_STATISTICS=y +CONFIG_NETDEV_WIRELESS_IOCTL=y +CONFIG_NETUTILS_TELNETC=y +CONFIG_NETUTILS_TELNETD=y CONFIG_NET_6LOWPAN=y CONFIG_NET_BROADCAST=y CONFIG_NET_HOSTNAME="MRF24J40" @@ -64,17 +71,10 @@ CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STAR=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_STATISTICS=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETDEVICES=y -CONFIG_NETUTILS_TELNETC=y -CONFIG_NETUTILS_TELNETD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -90,11 +90,11 @@ CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 -CONFIG_RAM_SIZE=131072 -CONFIG_RAM_START=0x20000000 +CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y +CONFIG_RAM_SIZE=131072 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y @@ -114,5 +114,5 @@ CONFIG_STM32_PWR=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WIRELESS_IEEE802154=y CONFIG_WIRELESS=y +CONFIG_WIRELESS_IEEE802154=y diff --git a/configs/clicker2-stm32/nsh/defconfig b/configs/clicker2-stm32/nsh/defconfig index c451db20cc..5eaceff8f2 100644 --- a/configs/clicker2-stm32/nsh/defconfig +++ b/configs/clicker2-stm32/nsh/defconfig @@ -1,18 +1,17 @@ -# CONFIG_NSH_CMDOPT_DF_H is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y diff --git a/configs/clicker2-stm32/scripts/flash.ld b/configs/clicker2-stm32/scripts/flash.ld index 6bb3aabadd..59331788d0 100644 --- a/configs/clicker2-stm32/scripts/flash.ld +++ b/configs/clicker2-stm32/scripts/flash.ld @@ -52,6 +52,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/clicker2-stm32/scripts/kernel-space.ld b/configs/clicker2-stm32/scripts/kernel-space.ld index eacdb017ea..7ae056b8dc 100644 --- a/configs/clicker2-stm32/scripts/kernel-space.ld +++ b/configs/clicker2-stm32/scripts/kernel-space.ld @@ -38,6 +38,7 @@ */ OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/clicker2-stm32/usbnsh/defconfig b/configs/clicker2-stm32/usbnsh/defconfig index eb99169ce9..13c1170780 100644 --- a/configs/clicker2-stm32/usbnsh/defconfig +++ b/configs/clicker2-stm32/usbnsh/defconfig @@ -1,24 +1,23 @@ # CONFIG_DEV_CONSOLE is not set -# CONFIG_NSH_CMDOPT_DF_H is not set -CONFIG_ARCH_BOARD_CLICKER2_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" +CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" +CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y diff --git a/configs/clicker2-stm32/xbee-6lowpan/defconfig b/configs/clicker2-stm32/xbee-6lowpan/defconfig index 3d86d08f25..0099a026f3 100644 --- a/configs/clicker2-stm32/xbee-6lowpan/defconfig +++ b/configs/clicker2-stm32/xbee-6lowpan/defconfig @@ -1,23 +1,27 @@ +# CONFIG_DEV_CONSOLE is not set +# CONFIG_NET_ETHERNET is not set +# CONFIG_NET_IPv4 is not set +# CONFIG_NSH_DISABLE_TELNETD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_CHIP_STM32=y +CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_CLICKER2_STM32_MB1_XBEE=y -# CONFIG_DEV_CONSOLE is not set CONFIG_DRIVERS_IEEE802154=y CONFIG_DRIVERS_WIRELESS=y +CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_DEVNAME="wpan0" CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_6=0x00ff @@ -25,9 +29,9 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800 CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616 CONFIG_EXAMPLES_NETTEST_TARGET2=y -CONFIG_EXAMPLES_NETTEST=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y +CONFIG_EXAMPLES_UDP=y CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617 CONFIG_EXAMPLES_UDP_DEVNAME="wpan0" CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_1=0xfe80 @@ -36,52 +40,41 @@ CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_7=0xfe00 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_8=0x0d00 CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616 CONFIG_EXAMPLES_UDP_TARGET2=y -CONFIG_EXAMPLES_UDP=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IEEE802154_I8SAK=y -CONFIG_IEEE802154_IND_PREALLOC=32 -CONFIG_IEEE802154_MACDEV=y -CONFIG_IEEE802154_NETDEV=y CONFIG_IEEE802154_XBEE=y CONFIG_INTELHEX_BINARY=y CONFIG_IOB_BUFSIZE=128 CONFIG_IOB_NBUFFERS=32 CONFIG_IOB_NCHAINS=16 -CONFIG_MAC802154_NNOTIF=48 -CONFIG_MAC802154_NTXDESC=32 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_NET_6LOWPAN=y -CONFIG_NET_BROADCAST=y +CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_STATISTICS=y CONFIG_NETDEV_WIRELESS_IOCTL=y -# CONFIG_NET_ETHERNET is not set +CONFIG_NETUTILS_TELNETD=y +CONFIG_NET_6LOWPAN=y +CONFIG_NET_BROADCAST=y CONFIG_NET_HOSTNAME="XBee" -# CONFIG_NET_IPv4 is not set CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y CONFIG_NET_UDP=y -CONFIG_NETUTILS_TELNETD=y -CONFIG_NET=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -# CONFIG_NSH_CMDOPT_DF_H is not set CONFIG_NSH_DISABLE_GET=y CONFIG_NSH_DISABLE_PUT=y -# CONFIG_NSH_DISABLE_TELNETD is not set CONFIG_NSH_DISABLE_WGET=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 @@ -91,18 +84,18 @@ CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 +CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPERIOD=50000 CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=160 CONFIG_SCHED_LPWORK=y +CONFIG_SCHED_LPWORKPRIORITY=160 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STANDARD_SERIAL=y @@ -116,5 +109,5 @@ CONFIG_SYSTEM_TELNET_CLIENT=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WIRELESS_IEEE802154=y CONFIG_WIRELESS=y +CONFIG_WIRELESS_IEEE802154=y diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 93b89a8470..8176901318 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/configs/cloudctrl/nsh/defconfig @@ -2,12 +2,12 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SPI_CALLBACK is not set -CONFIG_ARCH_BOARD_CLOUDCTRL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="cloudctrl" +CONFIG_ARCH_BOARD_CLOUDCTRL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -21,24 +21,24 @@ CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_MMCSD=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y +CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -60,22 +60,22 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_BKP=y -CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_ETHMAC=y +CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 CONFIG_STM32_PHYINIT=y +CONFIG_STM32_PHYSR=17 CONFIG_STM32_PHYSR_100FD=0x8000 CONFIG_STM32_PHYSR_100HD=0x4000 CONFIG_STM32_PHYSR_10FD=0x2000 CONFIG_STM32_PHYSR_10HD=0x1000 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0xf000 -CONFIG_STM32_PHYSR=17 CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_RXBUFSIZE=128 diff --git a/configs/cloudctrl/scripts/cloudctrl-dfu.ld b/configs/cloudctrl/scripts/cloudctrl-dfu.ld index e040b22eed..13f666cd47 100644 --- a/configs/cloudctrl/scripts/cloudctrl-dfu.ld +++ b/configs/cloudctrl/scripts/cloudctrl-dfu.ld @@ -46,6 +46,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/cloudctrl/scripts/cloudctrl.ld b/configs/cloudctrl/scripts/cloudctrl.ld index 1862e9baab..5ed650a3be 100644 --- a/configs/cloudctrl/scripts/cloudctrl.ld +++ b/configs/cloudctrl/scripts/cloudctrl.ld @@ -44,6 +44,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index 27651d312f..207863d451 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -3,12 +3,12 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SPI_CALLBACK is not set -CONFIG_ARCH_BOARD_FIRE_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="fire-stm32v2" +CONFIG_ARCH_BOARD_FIRE_STM32=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -18,26 +18,16 @@ CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MAXBUS=2 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=16 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=16 -CONFIG_NET_TCP=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y +CONFIG_MMCSD_SDIO=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y @@ -45,6 +35,16 @@ CONFIG_NETDEVICES=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=16 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=16 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -80,6 +80,7 @@ CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_EPBULKIN=5 @@ -88,6 +89,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/fire-stm32v2/scripts/fire-stm32v2-dfu.ld b/configs/fire-stm32v2/scripts/fire-stm32v2-dfu.ld index e17e43e3f8..74fc27362a 100644 --- a/configs/fire-stm32v2/scripts/fire-stm32v2-dfu.ld +++ b/configs/fire-stm32v2/scripts/fire-stm32v2-dfu.ld @@ -46,6 +46,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/fire-stm32v2/scripts/fire-stm32v2.ld b/configs/fire-stm32v2/scripts/fire-stm32v2.ld index ed638f502b..a9eeab42f4 100644 --- a/configs/fire-stm32v2/scripts/fire-stm32v2.ld +++ b/configs/fire-stm32v2/scripts/fire-stm32v2.ld @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig index 58eda803ad..5e348957a5 100644 --- a/configs/hymini-stm32v/nsh/defconfig +++ b/configs/hymini-stm32v/nsh/defconfig @@ -1,13 +1,13 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" +CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_POLL=y @@ -16,8 +16,8 @@ CONFIG_FAT_LCNAMES=y CONFIG_FS_FAT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index 497fdf4a5d..bedace822a 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -1,54 +1,54 @@ # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_SPI_CALLBACK is not set -CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" +CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y -CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_NX=y -CONFIG_EXAMPLES_NXHELLO_BPP=16 CONFIG_EXAMPLES_NXHELLO=y -CONFIG_EXAMPLES_NXIMAGE_BPP=16 +CONFIG_EXAMPLES_NXHELLO_BPP=16 CONFIG_EXAMPLES_NXIMAGE=y +CONFIG_EXAMPLES_NXIMAGE_BPP=16 +CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y CONFIG_FS_ROMFS=y -CONFIG_INPUT_ADS7843E=y CONFIG_INPUT=y +CONFIG_INPUT_ADS7843E=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_MAXPOWER=100 CONFIG_LCD_SSD1289=y -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 @@ -69,8 +69,8 @@ CONFIG_STM32_FSMC=y CONFIG_STM32_PWR=y CONFIG_STM32_SDIO=y CONFIG_STM32_SPI1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y @@ -78,6 +78,7 @@ CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_TRACE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_EPBULKIN=5 @@ -86,6 +87,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/hymini-stm32v/scripts/ld.script b/configs/hymini-stm32v/scripts/ld.script index 15370f39a2..f1b2b1d7fa 100644 --- a/configs/hymini-stm32v/scripts/ld.script +++ b/configs/hymini-stm32v/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig index 722fb02dbc..a6538e466d 100644 --- a/configs/hymini-stm32v/usbmsc/defconfig +++ b/configs/hymini-stm32v/usbmsc/defconfig @@ -1,19 +1,19 @@ # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set -CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" +CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_POLL=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_MQ_MSGS=4 @@ -40,6 +40,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_EPBULKIN=5 @@ -48,6 +49,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="msconn_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig index 163d8b7116..74a6499ba0 100644 --- a/configs/hymini-stm32v/usbnsh/defconfig +++ b/configs/hymini-stm32v/usbnsh/defconfig @@ -1,20 +1,20 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" +CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BINFMT_DISABLE=y -CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=5483 +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y CONFIG_LIB_BOARDCTL=y diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig index 09b2c26a16..7246736887 100644 --- a/configs/hymini-stm32v/usbserial/defconfig +++ b/configs/hymini-stm32v/usbserial/defconfig @@ -1,9 +1,9 @@ -CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" +CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_MOUNTPOINT=y @@ -14,11 +14,11 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_PL2303=y CONFIG_PL2303_PRODUCTSTR="USBdev Serial" CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" -CONFIG_PL2303=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt index 05eda5cf2a..5df4aef27e 100644 --- a/configs/lpc4330-xplorer/README.txt +++ b/configs/lpc4330-xplorer/README.txt @@ -337,39 +337,31 @@ FPU Configuration Options ------------------------- There are two version of the FPU support built into the most NuttX Cortex-M4 -ports. The current LPC43xx port support only one of these options, the "Non- -Lazy Floating Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR -must be defined in *all* LPC43xx configuration files. +ports. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/lpc4330-xplorer/src/lpc43_ostest.c b/configs/lpc4330-xplorer/src/lpc43_ostest.c index 8bfee95428..8b99cf7114 100644 --- a/configs/lpc4330-xplorer/src/lpc43_ostest.c +++ b/configs/lpc4330-xplorer/src/lpc43_ostest.c @@ -58,8 +58,7 @@ #undef HAVE_FPU #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ - defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) && \ - !defined(CONFIG_ARMV7M_CMNVECTOR) + defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif diff --git a/configs/lpc4337-ws/README.txt b/configs/lpc4337-ws/README.txt index e60a035e1f..1c23730012 100644 --- a/configs/lpc4337-ws/README.txt +++ b/configs/lpc4337-ws/README.txt @@ -376,39 +376,31 @@ FPU Configuration Options ------------------------- There are two version of the FPU support built into the most NuttX Cortex-M4 -ports. The current LPC43xx port support only one of these options, the "Non- -Lazy Floating Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR -must be defined in *all* LPC43xx configuration files. +ports. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/lpc4357-evb/README.txt b/configs/lpc4357-evb/README.txt index cc8fe714d0..a3d0d52f06 100644 --- a/configs/lpc4357-evb/README.txt +++ b/configs/lpc4357-evb/README.txt @@ -373,39 +373,31 @@ FPU Configuration Options ------------------------- There are two version of the FPU support built into the most NuttX Cortex-M4 -ports. The current LPC43xx port support only one of these options, the "Non- -Lazy Floating Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR -must be defined in *all* LPC43xx configuration files. +ports. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/lpc4357-evb/src/lpc43_ostest.c b/configs/lpc4357-evb/src/lpc43_ostest.c index 5ad0d477d8..cc3b9f8428 100644 --- a/configs/lpc4357-evb/src/lpc43_ostest.c +++ b/configs/lpc4357-evb/src/lpc43_ostest.c @@ -58,8 +58,7 @@ #undef HAVE_FPU #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ - defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) && \ - !defined(CONFIG_ARMV7M_CMNVECTOR) + defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif diff --git a/configs/lpc4370-link2/README.txt b/configs/lpc4370-link2/README.txt index 5ebc1a9daf..2e5f72744e 100644 --- a/configs/lpc4370-link2/README.txt +++ b/configs/lpc4370-link2/README.txt @@ -376,39 +376,31 @@ FPU Configuration Options ------------------------- There are two version of the FPU support built into the most NuttX Cortex-M4 -ports. The current LPC43xx port support only one of these options, the "Non- -Lazy Floating Point Register Save". As a consequence, CONFIG_ARMV7M_CMNVECTOR -must be defined in *all* LPC43xx configuration files. +ports. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/lpc4370-link2/src/lpc43_ostest.c b/configs/lpc4370-link2/src/lpc43_ostest.c index c1ae98937a..755cdb6161 100644 --- a/configs/lpc4370-link2/src/lpc43_ostest.c +++ b/configs/lpc4370-link2/src/lpc43_ostest.c @@ -58,8 +58,7 @@ #undef HAVE_FPU #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ - defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) && \ - !defined(CONFIG_ARMV7M_CMNVECTOR) + defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig index e033dfd31d..fa29fcf02e 100644 --- a/configs/maple/nsh/defconfig +++ b/configs/maple/nsh/defconfig @@ -1,8 +1,8 @@ # CONFIG_DISABLE_OS_API is not set -# CONFIG_NSH_DISABLE_ADDROUTE is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set -# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_GET is not set @@ -14,14 +14,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" +CONFIG_ARCH_BOARD_MAPLE=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y @@ -53,7 +51,7 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index 3f3c2177dc..22fbdfdcf0 100644 --- a/configs/maple/nx/defconfig +++ b/configs/maple/nx/defconfig @@ -1,5 +1,7 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set @@ -13,31 +15,29 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NX_DISABLE_1BPP is not set -CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" +CONFIG_ARCH_BOARD_MAPLE=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y -CONFIG_EXAMPLES_NX_BPP=1 CONFIG_EXAMPLES_NX=y -CONFIG_EXAMPLES_NXHELLO_BPP=1 CONFIG_EXAMPLES_NXHELLO=y +CONFIG_EXAMPLES_NXHELLO_BPP=1 +CONFIG_EXAMPLES_NX_BPP=1 CONFIG_I2C=y -CONFIG_LCD_SHARP_MEMLCD=y CONFIG_LCD=y +CONFIG_LCD_SHARP_MEMLCD=y CONFIG_LIB_RAND_ORDER=2 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -48,9 +48,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_NSH_USBCONSOLE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=6 @@ -75,7 +75,7 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=15 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/maple/scripts/ld.script b/configs/maple/scripts/ld.script index 8fe3ae43fb..84d5cccc49 100644 --- a/configs/maple/scripts/ld.script +++ b/configs/maple/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/maple/scripts/ld.script.dfu b/configs/maple/scripts/ld.script.dfu index e69140c886..bb0de615ac 100644 --- a/configs/maple/scripts/ld.script.dfu +++ b/configs/maple/scripts/ld.script.dfu @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig index cb7fd11905..6a17b604d1 100644 --- a/configs/maple/usbnsh/defconfig +++ b/configs/maple/usbnsh/defconfig @@ -1,9 +1,9 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_DISABLE_OS_API is not set -# CONFIG_NSH_DISABLE_ADDROUTE is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set -# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_GET is not set @@ -15,20 +15,18 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" +CONFIG_ARCH_BOARD_MAPLE=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y @@ -61,7 +59,7 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt index 773613a7b5..b586104b10 100644 --- a/configs/mikroe-stm32f4/README.txt +++ b/configs/mikroe-stm32f4/README.txt @@ -129,35 +129,29 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y MIO283QT-2/MIO283QT-9A ====================== diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index dab8c12914..d87e94a945 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -2,37 +2,37 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_STM32_CCMEXCLUDE is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" +CONFIG_AUDIO=y CONFIG_AUDIO_FORMAT_MIDI=y CONFIG_AUDIO_VS1053=y -CONFIG_AUDIO=y -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_LOOP=y CONFIG_DEV_ZERO=y CONFIG_DISABLE_POLL=y CONFIG_DRIVERS_AUDIO=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y -CONFIG_EXAMPLES_NX_BPP=16 +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NX=y +CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_FS_BINFS=y CONFIG_FS_FAT=y @@ -42,24 +42,23 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INPUT=y CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_MIO283QT2=y CONFIG_LCD=y +CONFIG_LCD_MIO283QT2=y CONFIG_LIBC_PERROR_STDOUT=y -CONFIG_LIB_BOARDCTL=y CONFIG_LIBC_STRERROR=y CONFIG_M25P_MANUFACTURER=0x1C CONFIG_M25P_MEMORY_TYPE=0x31 CONFIG_M25P_SUBSECTOR_ERASE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MIKROE_FLASH_PART=y CONFIG_MIKROE_FLASH=y -CONFIG_MM_REGIONS=2 -CONFIG_MMCSD_SPICLOCK=30000000 +CONFIG_MIKROE_FLASH_PART=y CONFIG_MMCSD=y +CONFIG_MMCSD_SPICLOCK=30000000 +CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_MTD_CONFIG_ERASEDVALUE=0xFF CONFIG_MTD_CONFIG=y +CONFIG_MTD_CONFIG_ERASEDVALUE=0xFF CONFIG_MTD_PARTITION=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_NFILE_DESCRIPTORS=8 @@ -73,9 +72,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_NSH_STRERROR=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS17X23B=y CONFIG_NXFONT_SANS20X27B=y @@ -84,44 +80,47 @@ CONFIG_NXFONT_SANS28X37B=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/usr/sounds" CONFIG_NXPLAYER_INCLUDE_SYSTEM_RESET=y -CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM=y +CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTK_BORDERCOLOR1=0x8410 CONFIG_NXTK_BORDERCOLOR2=0x4208 CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_BACKGROUND_IMAGE="" CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR=0x39C7 CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS=y +CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/ttyS0" CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 -CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_MEDIAPLAYER=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA=y CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PLATFORM_CONFIGDATA=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 CONFIG_RAMDISK=y CONFIG_RAMMTD=y +CONFIG_RAM_SIZE=114688 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_RTC=y CONFIG_RTC_ALARM=y CONFIG_RTC_DATETIME=y -CONFIG_RTC=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPERIOD=20000 CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_ONEXIT=y +CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_ADC2=y @@ -132,8 +131,8 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_RNG=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI2=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y CONFIG_STM32_USART2=y CONFIG_SYSLOG_CHAR=y diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig index c912bde0cd..c155515e72 100644 --- a/configs/mikroe-stm32f4/kostest/defconfig +++ b/configs/mikroe-stm32f4/kostest/defconfig @@ -2,21 +2,21 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_SPI_CALLBACK is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARM_MPU=y -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_LOOP=y CONFIG_DEV_ZERO=y @@ -36,11 +36,11 @@ CONFIG_M25P_MEMORY_TYPE=0x31 CONFIG_M25P_SUBSECTOR_ERASE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MIKROE_FLASH_PART_LIST="256,768" -CONFIG_MIKROE_FLASH_PART=y CONFIG_MIKROE_FLASH=y -CONFIG_MM_REGIONS=2 +CONFIG_MIKROE_FLASH_PART=y +CONFIG_MIKROE_FLASH_PART_LIST="256,768" CONFIG_MMCSD=y +CONFIG_MM_REGIONS=2 CONFIG_MTD_PARTITION=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_NFILE_DESCRIPTORS=8 @@ -55,20 +55,20 @@ CONFIG_PASS1_BUILDIR="configs/mikroe-stm32f4/kernel" CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 CONFIG_RAMDISK=y CONFIG_RAMMTD=y +CONFIG_RAM_SIZE=114688 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_RTC=y CONFIG_RTC_ALARM=y CONFIG_RTC_DATETIME=y -CONFIG_RTC=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPERIOD=20000 CONFIG_SCHED_HPWORKPRIORITY=192 -CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_ONEXIT=y +CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_ADC2=y @@ -81,9 +81,9 @@ CONFIG_STM32_RNG=y CONFIG_STM32_SPI2=y CONFIG_STM32_TIM1=y CONFIG_STM32_USART2=y -CONFIG_SYS_RESERVED=8 CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" +CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=11 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig index ada308a4cf..ce65009601 100644 --- a/configs/mikroe-stm32f4/nsh/defconfig +++ b/configs/mikroe-stm32f4/nsh/defconfig @@ -4,20 +4,20 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SPI_CALLBACK is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEV_LOOP=y CONFIG_DEV_ZERO=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_FAT=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y @@ -31,11 +31,11 @@ CONFIG_M25P_MEMORY_TYPE=0x31 CONFIG_M25P_SUBSECTOR_ERASE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MIKROE_FLASH_PART_LIST="256,768" -CONFIG_MIKROE_FLASH_PART=y CONFIG_MIKROE_FLASH=y -CONFIG_MM_REGIONS=2 +CONFIG_MIKROE_FLASH_PART=y +CONFIG_MIKROE_FLASH_PART_LIST="256,768" CONFIG_MMCSD=y +CONFIG_MM_REGIONS=2 CONFIG_MTD_PARTITION=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_NFILE_DESCRIPTORS=8 @@ -49,10 +49,10 @@ CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 -CONFIG_RAM_SIZE=114688 -CONFIG_RAM_START=0x20000000 CONFIG_RAMDISK=y CONFIG_RAMMTD=y +CONFIG_RAM_SIZE=114688 +CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig index e7a3b73ef8..36c7b02224 100644 --- a/configs/mikroe-stm32f4/nx/defconfig +++ b/configs/mikroe-stm32f4/nx/defconfig @@ -3,28 +3,28 @@ # CONFIG_DEV_NULL is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_SERIAL is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_NX=y +CONFIG_EXAMPLES_NX_BPP=16 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_MIO283QT2=y CONFIG_LCD=y +CONFIG_LCD_MIO283QT2=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_MAX_TASKS=16 @@ -40,13 +40,13 @@ CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXTK_BORDERCOLOR1=0x8410 CONFIG_NXTK_BORDERCOLOR2=0x4208 CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig index cce7ac96fe..3be92b604e 100644 --- a/configs/mikroe-stm32f4/nxlines/defconfig +++ b/configs/mikroe-stm32f4/nxlines/defconfig @@ -4,34 +4,34 @@ # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set -# CONFIG_NX_WRITEONLY is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set +# CONFIG_NX_WRITEONLY is not set # CONFIG_SERIAL is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y +CONFIG_EXAMPLES_NXLINES=y CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0 CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xFFE0 CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0x87F0 CONFIG_EXAMPLES_NXLINES_LINECOLOR=0x861F -CONFIG_EXAMPLES_NXLINES=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MIO283QT2=y CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -44,13 +44,13 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXTK_BORDERCOLOR1=0x8410 CONFIG_NXTK_BORDERCOLOR2=0x4208 CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig index b9e1474e94..b268733285 100644 --- a/configs/mikroe-stm32f4/nxtext/defconfig +++ b/configs/mikroe-stm32f4/nxtext/defconfig @@ -3,29 +3,29 @@ # CONFIG_DEV_NULL is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_SERIAL is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NXTEXT_BPP=16 CONFIG_EXAMPLES_NXTEXT=y +CONFIG_EXAMPLES_NXTEXT_BPP=16 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_MIO283QT2=y CONFIG_LCD=y +CONFIG_LCD_MIO283QT2=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -38,13 +38,13 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_SERIF22X28B=y CONFIG_NXTK_BORDERCOLOR1=0x8410 CONFIG_NXTK_BORDERCOLOR2=0x4208 CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/mikroe-stm32f4/scripts/kernel-space.ld b/configs/mikroe-stm32f4/scripts/kernel-space.ld index 758a44c7cc..383bbe5f29 100644 --- a/configs/mikroe-stm32f4/scripts/kernel-space.ld +++ b/configs/mikroe-stm32f4/scripts/kernel-space.ld @@ -38,6 +38,7 @@ */ OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/mikroe-stm32f4/scripts/ld.script b/configs/mikroe-stm32f4/scripts/ld.script index 34dcc1cc2c..33df010b9a 100644 --- a/configs/mikroe-stm32f4/scripts/ld.script +++ b/configs/mikroe-stm32f4/scripts/ld.script @@ -53,6 +53,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig index 7cc138b665..645cfd7048 100644 --- a/configs/mikroe-stm32f4/usbnsh/defconfig +++ b/configs/mikroe-stm32f4/usbnsh/defconfig @@ -3,25 +3,25 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SPI_CALLBACK is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y -CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEV_LOOP=y CONFIG_DEV_ZERO=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_FAT=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y @@ -35,12 +35,12 @@ CONFIG_M25P_MEMORY_TYPE=0x31 CONFIG_M25P_SUBSECTOR_ERASE=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MIKROE_FLASH_PART_LIST="256,768" -CONFIG_MIKROE_FLASH_PART=y CONFIG_MIKROE_FLASH=y +CONFIG_MIKROE_FLASH_PART=y +CONFIG_MIKROE_FLASH_PART_LIST="256,768" CONFIG_MIKROE_RAMMTD=y -CONFIG_MM_REGIONS=2 CONFIG_MMCSD=y +CONFIG_MM_REGIONS=2 CONFIG_MTD_PARTITION=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_NFILE_DESCRIPTORS=8 @@ -54,9 +54,9 @@ CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMDISK=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 -CONFIG_RAMDISK=y CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig index c5c79b0e31..c077173886 100644 --- a/configs/nucleo-f303re/adc/defconfig +++ b/configs/nucleo-f303re/adc/defconfig @@ -3,17 +3,17 @@ # CONFIG_SERIAL is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_LIB_BOARDCTL=y diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig index ed11a34c19..c7935eb03d 100644 --- a/configs/nucleo-f303re/can/defconfig +++ b/configs/nucleo-f303re/can/defconfig @@ -1,13 +1,13 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set # CONFIG_SERIAL is not set -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_CAN=y diff --git a/configs/nucleo-f303re/hello/defconfig b/configs/nucleo-f303re/hello/defconfig index 62944db205..1d0166f70c 100644 --- a/configs/nucleo-f303re/hello/defconfig +++ b/configs/nucleo-f303re/hello/defconfig @@ -1,11 +1,11 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig index 202b600491..771f475fb5 100644 --- a/configs/nucleo-f303re/nxlines/defconfig +++ b/configs/nucleo-f303re/nxlines/defconfig @@ -1,39 +1,39 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_SERIAL is not set -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_CAN=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NXLINES=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_SSD1351=y CONFIG_LCD=y +CONFIG_LCD_SSD1351=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMLOG=y +CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig index 4222f3bba8..74ca2ac7a7 100644 --- a/configs/nucleo-f303re/pwm/defconfig +++ b/configs/nucleo-f303re/pwm/defconfig @@ -3,13 +3,13 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SERIAL is not set -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y @@ -27,13 +27,13 @@ CONFIG_NSH_LIBRARY=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_PWM=y CONFIG_PWM_MULTICHAN=y CONFIG_PWM_NCHANNELS=2 -CONFIG_PWM=y +CONFIG_RAMLOG=y +CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y @@ -42,12 +42,12 @@ CONFIG_START_DAY=27 CONFIG_START_YEAR=2013 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWM_MULTICHAN=y +CONFIG_STM32_TIM3=y CONFIG_STM32_TIM3_CH1OUT=y CONFIG_STM32_TIM3_CH2OUT=y CONFIG_STM32_TIM3_CHANNEL1=y CONFIG_STM32_TIM3_CHANNEL2=y CONFIG_STM32_TIM3_PWM=y -CONFIG_STM32_TIM3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="pwm_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/nucleo-f303re/scripts/ld.script b/configs/nucleo-f303re/scripts/ld.script index ff2087a631..0176c0d1ad 100644 --- a/configs/nucleo-f303re/scripts/ld.script +++ b/configs/nucleo-f303re/scripts/ld.script @@ -50,6 +50,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig index c8afc6b0ff..cf00e3db61 100644 --- a/configs/nucleo-f303re/serialrx/defconfig +++ b/configs/nucleo-f303re/serialrx/defconfig @@ -2,17 +2,17 @@ # CONFIG_DEV_CONSOLE is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_NUCLEO_F303RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" +CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_EXAMPLES_SERIALRX=y +CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INTELHEX_BINARY=y CONFIG_LIB_BOARDCTL=y diff --git a/configs/nucleo-f334r8/adc/defconfig b/configs/nucleo-f334r8/adc/defconfig index b96e5cbf3c..01157d95c7 100644 --- a/configs/nucleo-f334r8/adc/defconfig +++ b/configs/nucleo-f334r8/adc/defconfig @@ -4,25 +4,25 @@ # CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_NUCLEO_F334R8=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" +CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_DISABLE_SIGNALS=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_NSH=y CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y @@ -33,14 +33,12 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_DISABLE_ADDROUTE=y CONFIG_NSH_DISABLE_BASENAME=y CONFIG_NSH_DISABLE_CAT=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CMP=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_DD=y -CONFIG_NSH_DISABLE_DELROUTE=y CONFIG_NSH_DISABLE_DF=y CONFIG_NSH_DISABLE_DIRNAME=y CONFIG_NSH_DISABLE_EXEC=y @@ -97,6 +95,6 @@ CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/nucleo-f334r8/highpri/defconfig b/configs/nucleo-f334r8/highpri/defconfig index d3623b06c9..593667a92c 100644 --- a/configs/nucleo-f334r8/highpri/defconfig +++ b/configs/nucleo-f334r8/highpri/defconfig @@ -1,18 +1,20 @@ +# CONFIG_DEV_NULL is not set +# CONFIG_LIBC_LONG_LONG is not set +# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_ADC=y CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_CHIP_STM32=y +CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_BUILTIN=y -# CONFIG_DEV_NULL is not set +CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y @@ -21,7 +23,6 @@ CONFIG_EXAMPLES_NSH=y CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y -# CONFIG_LIBC_LONG_LONG is not set CONFIG_LIBM=y CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=1 @@ -52,11 +53,10 @@ CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_MOUNT=y CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_MW=y -# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_PWD=y -CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_RM=y +CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y CONFIG_NSH_DISABLE_SH=y CONFIG_NSH_DISABLE_SLEEP=y @@ -86,22 +86,22 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 -CONFIG_STM32_ADC1_DMA=y CONFIG_STM32_ADC1=y +CONFIG_STM32_ADC1_DMA=y CONFIG_STM32_ADC_NOIRQ=y CONFIG_STM32_DMA1=y CONFIG_STM32_HRTIM1=y +CONFIG_STM32_HRTIM_ADC1_TRG1=y +CONFIG_STM32_HRTIM_ADC=y CONFIG_STM32_HRTIM_CLK_FROM_PLL=y CONFIG_STM32_HRTIM_DISABLE_CHARDRV=y CONFIG_STM32_HRTIM_TIMA=y -CONFIG_STM32_HRTIM_ADC=y -CONFIG_STM32_HRTIM_ADC1_TRG1=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="highpri_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="highpri_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/nucleo-f334r8/scripts/ld.script b/configs/nucleo-f334r8/scripts/ld.script index 76f4c361dc..5c218ae94a 100644 --- a/configs/nucleo-f334r8/scripts/ld.script +++ b/configs/nucleo-f334r8/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/nucleo-f410rb/nsh/defconfig b/configs/nucleo-f410rb/nsh/defconfig index ff89051087..39ac60186a 100644 --- a/configs/nucleo-f410rb/nsh/defconfig +++ b/configs/nucleo-f410rb/nsh/defconfig @@ -1,5 +1,4 @@ # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set diff --git a/configs/nucleo-f410rb/scripts/f410rb.ld b/configs/nucleo-f410rb/scripts/f410rb.ld index b0ca4f863e..f24c7cf9cf 100644 --- a/configs/nucleo-f410rb/scripts/f410rb.ld +++ b/configs/nucleo-f410rb/scripts/f410rb.ld @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig index 60d4c7ca00..500d8454ff 100644 --- a/configs/nucleo-f4x1re/f401-nsh/defconfig +++ b/configs/nucleo-f4x1re/f401-nsh/defconfig @@ -4,20 +4,20 @@ # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_NUCLEO_F401RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f4x1re" +CONFIG_ARCH_BOARD_NUCLEO_F401RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F401RE=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig index f7c02bd24c..48681dde4b 100644 --- a/configs/nucleo-f4x1re/f411-nsh/defconfig +++ b/configs/nucleo-f4x1re/f411-nsh/defconfig @@ -1,24 +1,23 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_NUCLEO_F411RE=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f4x1re" +CONFIG_ARCH_BOARD_NUCLEO_F411RE=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F411RE=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y diff --git a/configs/nucleo-f4x1re/scripts/f401re.ld b/configs/nucleo-f4x1re/scripts/f401re.ld index 0fdf32397a..ace460afd6 100644 --- a/configs/nucleo-f4x1re/scripts/f401re.ld +++ b/configs/nucleo-f4x1re/scripts/f401re.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/nucleo-f4x1re/scripts/f411re.ld b/configs/nucleo-f4x1re/scripts/f411re.ld index 865cae4885..16d18a722f 100644 --- a/configs/nucleo-f4x1re/scripts/f411re.ld +++ b/configs/nucleo-f4x1re/scripts/f411re.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-e407/discover/defconfig b/configs/olimex-stm32-e407/discover/defconfig index a512bc2b2c..fc5628259c 100644 --- a/configs/olimex-stm32-e407/discover/defconfig +++ b/configs/olimex-stm32-e407/discover/defconfig @@ -1,41 +1,41 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_ETH0_PHY_LAN8720=y +CONFIG_EXAMPLES_DISCOVER=y CONFIG_EXAMPLES_DISCOVER_DHCPC=y CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80101 CONFIG_EXAMPLES_DISCOVER_NOMAC=y -CONFIG_EXAMPLES_DISCOVER=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_NET=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_SOLINGER=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y -CONFIG_NET=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -57,13 +57,13 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_USART2=y diff --git a/configs/olimex-stm32-e407/netnsh/defconfig b/configs/olimex-stm32-e407/netnsh/defconfig index 38336bf89d..1616b9e2a3 100644 --- a/configs/olimex-stm32-e407/netnsh/defconfig +++ b/configs/olimex-stm32-e407/netnsh/defconfig @@ -1,43 +1,43 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_ETH0_PHY_LAN8720=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_ARP_IPIN=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETUTILS_DHCPC=y CONFIG_NETUTILS_DISCOVER=y CONFIG_NETUTILS_TELNETD=y +CONFIG_NET_ARP_IPIN=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_SOLINGER=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y @@ -63,13 +63,13 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_USART2=y diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig index 16c5728308..6d533045f7 100644 --- a/configs/olimex-stm32-e407/nsh/defconfig +++ b/configs/olimex-stm32-e407/nsh/defconfig @@ -1,22 +1,21 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLOXX=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/olimex-stm32-e407/scripts/ld.script b/configs/olimex-stm32-e407/scripts/ld.script index d24be46787..d3b3e6e71b 100644 --- a/configs/olimex-stm32-e407/scripts/ld.script +++ b/configs/olimex-stm32-e407/scripts/ld.script @@ -53,6 +53,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-e407/telnetd/defconfig b/configs/olimex-stm32-e407/telnetd/defconfig index 3e601c2eef..67b715979d 100644 --- a/configs/olimex-stm32-e407/telnetd/defconfig +++ b/configs/olimex-stm32-e407/telnetd/defconfig @@ -1,47 +1,47 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_ETH0_PHY_LAN8720=y +CONFIG_EXAMPLES_TELNETD=y CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128 CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128 CONFIG_EXAMPLES_TELNETD_DRIPADDR=0xc0a80101 CONFIG_EXAMPLES_TELNETD_IPADDR=0xc0a80185 CONFIG_EXAMPLES_TELNETD_NOMAC=y -CONFIG_EXAMPLES_TELNETD=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_ARP_IPIN=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETUTILS_DHCPC=y CONFIG_NETUTILS_DISCOVER=y CONFIG_NETUTILS_TELNETD=y +CONFIG_NET_ARP_IPIN=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_SOLINGER=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -63,13 +63,13 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_USART2=y diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig index d32d1b939b..d93419db54 100644 --- a/configs/olimex-stm32-e407/usbnsh/defconfig +++ b/configs/olimex-stm32-e407/usbnsh/defconfig @@ -1,24 +1,24 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HELLOXX=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/olimex-stm32-e407/webserver/defconfig b/configs/olimex-stm32-e407/webserver/defconfig index 3621a7caf3..be18481073 100644 --- a/configs/olimex-stm32-e407/webserver/defconfig +++ b/configs/olimex-stm32-e407/webserver/defconfig @@ -1,43 +1,43 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" +CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_ETH0_PHY_LAN8720=y -CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0xc0a80101 CONFIG_EXAMPLES_WEBSERVER=y +CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0xc0a80101 CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_ARP_IPIN=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETUTILS_DHCPC=y CONFIG_NETUTILS_DISCOVER=y CONFIG_NETUTILS_WEBSERVER=y +CONFIG_NET_ARP_IPIN=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_SOLINGER=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -59,13 +59,13 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_USART2=y diff --git a/configs/olimex-stm32-h405/scripts/ld.script b/configs/olimex-stm32-h405/scripts/ld.script index 508d49e59c..29f6482539 100644 --- a/configs/olimex-stm32-h405/scripts/ld.script +++ b/configs/olimex-stm32-h405/scripts/ld.script @@ -53,6 +53,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig index 792e55862e..9c679a3d52 100644 --- a/configs/olimex-stm32-h405/usbnsh/defconfig +++ b/configs/olimex-stm32-h405/usbnsh/defconfig @@ -1,34 +1,33 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_OLIMEX_STM32H405=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h405" +CONFIG_ARCH_BOARD_OLIMEX_STM32H405=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F405RG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BUILTIN=y CONFIG_CAN_TSEG2=8 +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_ADC=y CONFIG_EXAMPLES_CAN=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y @@ -63,8 +62,8 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y -CONFIG_STM32_TIM1_ADC=y CONFIG_STM32_TIM1=y +CONFIG_STM32_TIM1_ADC=y CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig index 29765a1249..f2c840a57c 100644 --- a/configs/olimex-stm32-h407/nsh/defconfig +++ b/configs/olimex-stm32-h407/nsh/defconfig @@ -1,23 +1,22 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_SPI_EXCHANGE is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h407" +CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/olimex-stm32-h407/nsh_uext/defconfig b/configs/olimex-stm32-h407/nsh_uext/defconfig index 7c438609e6..3ded0fa960 100644 --- a/configs/olimex-stm32-h407/nsh_uext/defconfig +++ b/configs/olimex-stm32-h407/nsh_uext/defconfig @@ -1,10 +1,14 @@ +# CONFIG_ARCH_FPU is not set +# CONFIG_NSH_ARGCAT is not set +# CONFIG_NSH_CMDOPT_HEXDUMP is not set +# CONFIG_NSH_CMDPARMS is not set +# CONFIG_SPI_EXCHANGE is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h407" CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y CONFIG_ARCH_BUTTONS=y -# CONFIG_ARCH_FPU is not set -CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_CHIP_STM32=y +CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y @@ -19,11 +23,7 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -# CONFIG_NSH_ARGCAT is not set CONFIG_NSH_BUILTIN_APPS=y -# CONFIG_NSH_CMDOPT_DF_H is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -# CONFIG_NSH_CMDPARMS is not set CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y @@ -34,9 +34,8 @@ CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 -CONFIG_SDCLONE_DISABLE=y CONFIG_SCHED_WAITPID=y -# CONFIG_SPI_EXCHANGE is not set +CONFIG_SDCLONE_DISABLE=y CONFIG_SPI=y CONFIG_START_YEAR=2016 CONFIG_STM32_JTAG_SW_ENABLE=y diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index b3c828df2a..8f3bbf0715 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -1,16 +1,15 @@ # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32P107=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p107" +CONFIG_ARCH_BOARD_OLIMEX_STM32P107=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -22,19 +21,19 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y CONFIG_MTD=y -CONFIG_NET_ETH_MTU=650 -CONFIG_NET_ETH_TCP_RECVWNDO=624 -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ETH_MTU=650 +CONFIG_NET_ETH_TCP_RECVWNDO=624 +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y @@ -58,14 +57,14 @@ CONFIG_START_MONTH=9 CONFIG_START_YEAR=2009 CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/configs/olimex-stm32-p107/scripts/ld.script b/configs/olimex-stm32-p107/scripts/ld.script index 651848df71..bf648f198c 100644 --- a/configs/olimex-stm32-p107/scripts/ld.script +++ b/configs/olimex-stm32-p107/scripts/ld.script @@ -41,6 +41,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-p107/scripts/ld.script.dfu b/configs/olimex-stm32-p107/scripts/ld.script.dfu index c20a6224fa..ff87e2eb63 100644 --- a/configs/olimex-stm32-p107/scripts/ld.script.dfu +++ b/configs/olimex-stm32-p107/scripts/ld.script.dfu @@ -41,6 +41,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig index 16cec8b2fb..6ff57e83c9 100644 --- a/configs/olimex-stm32-p207/nsh/defconfig +++ b/configs/olimex-stm32-p207/nsh/defconfig @@ -1,17 +1,16 @@ # CONFIG_NET_UDP_READAHEAD is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_OLIMEX_STM32P207=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p207" +CONFIG_ARCH_BOARD_OLIMEX_STM32P207=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207ZE=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -19,10 +18,10 @@ CONFIG_BUILTIN=y CONFIG_CAN_TSEG2=8 CONFIG_DEBUG_SYMBOLS=y CONFIG_ETH0_PHY_KS8721=y -CONFIG_EXAMPLES_ADC_GROUPSIZE=1 CONFIG_EXAMPLES_ADC=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y +CONFIG_EXAMPLES_ADC_GROUPSIZE=1 CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y @@ -30,14 +29,14 @@ CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET=y +CONFIG_NETDB_DNSCLIENT=y CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y @@ -68,17 +67,17 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x18 CONFIG_STM32_PHYSR_100HD=0x8 CONFIG_STM32_PHYSR_10FD=0x14 CONFIG_STM32_PHYSR_10HD=0x4 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x1c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y -CONFIG_STM32_TIM1_ADC=y CONFIG_STM32_TIM1=y +CONFIG_STM32_TIM1_ADC=y CONFIG_STM32_USART3=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/olimex-stm32-p207/scripts/ld.script b/configs/olimex-stm32-p207/scripts/ld.script index 5b311478bc..ccaf2f05ea 100644 --- a/configs/olimex-stm32-p207/scripts/ld.script +++ b/configs/olimex-stm32-p207/scripts/ld.script @@ -52,6 +52,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimex-stm32-p407/knsh/defconfig b/configs/olimex-stm32-p407/knsh/defconfig index b9b583c992..36ae84d545 100644 --- a/configs/olimex-stm32-p407/knsh/defconfig +++ b/configs/olimex-stm32-p407/knsh/defconfig @@ -1,20 +1,19 @@ -# CONFIG_NSH_CMDOPT_DF_H is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" +CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_ARM_MPU=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_ARM_MPU=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/olimex-stm32-p407/nsh/defconfig b/configs/olimex-stm32-p407/nsh/defconfig index 7ffd56a07e..a7d088b2cb 100644 --- a/configs/olimex-stm32-p407/nsh/defconfig +++ b/configs/olimex-stm32-p407/nsh/defconfig @@ -1,19 +1,18 @@ -# CONFIG_NSH_CMDOPT_DF_H is not set -CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" +CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -54,7 +53,7 @@ CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USBHOST_MSC=y CONFIG_USBHOST=y +CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/olimex-stm32-p407/scripts/flash.ld b/configs/olimex-stm32-p407/scripts/flash.ld index e819be42da..d5b7d9c210 100644 --- a/configs/olimex-stm32-p407/scripts/flash.ld +++ b/configs/olimex-stm32-p407/scripts/flash.ld @@ -52,6 +52,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig index 8ed1c49642..c555f7b123 100644 --- a/configs/olimexino-stm32/can/defconfig +++ b/configs/olimexino-stm32/can/defconfig @@ -11,8 +11,9 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_XD is not set CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" +CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y @@ -20,12 +21,11 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_C99_BOOL8=y CONFIG_CAN_EXTID=y CONFIG_CAN_LOOPBACK=y @@ -43,8 +43,8 @@ CONFIG_FS_FATTIME=y CONFIG_FS_NAMED_SEMAPHORES=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C_RESET=y CONFIG_I2C=y +CONFIG_I2C_RESET=y CONFIG_IDLETHREAD_STACKSIZE=300 CONFIG_INTELHEX_BINARY=y CONFIG_LIB_SENDFILE_BUFSIZE=0 @@ -82,24 +82,24 @@ CONFIG_SERIAL_TERMIOS=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 CONFIG_STM32_ADC1=y -CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_CAN1=y +CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_FORCEPOWER=y +CONFIG_STM32_I2C2=y CONFIG_STM32_I2C_DUTY16_9=y +CONFIG_STM32_I2C_DYNTIMEO=y CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 -CONFIG_STM32_I2C_DYNTIMEO=y -CONFIG_STM32_I2C2=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI2=y -CONFIG_STM32_TIM1_PARTIAL_REMAP=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y +CONFIG_STM32_TIM1_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_TIME64=y @@ -108,6 +108,6 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=880 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index 868b2a697e..1444d26e13 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -1,6 +1,8 @@ # CONFIG_DISABLE_OS_API is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_DF is not set @@ -18,12 +20,11 @@ # CONFIG_NSH_DISABLE_SEMICOLON is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_SPI_CALLBACK is not set CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" +CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y @@ -31,13 +32,13 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_C99_BOOL8=y +CONFIG_CDCACM=y CONFIG_CDCACM_COMPOSITE=y CONFIG_CDCACM_EPBULKIN_HSSIZE=64 CONFIG_CDCACM_EPBULKOUT_HSSIZE=64 @@ -45,7 +46,6 @@ CONFIG_CDCACM_NRDREQS=2 CONFIG_CDCACM_NWRREQS=2 CONFIG_CDCACM_RXBUFSIZE=96 CONFIG_CDCACM_TXBUFSIZE=96 -CONFIG_CDCACM=y CONFIG_COMPOSITE_IAD=y CONFIG_COMPOSITE_PRODUCTID=0x2022 CONFIG_COMPOSITE_PRODUCTSTR="Composite Device" @@ -68,8 +68,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIB_SENDFILE_BUFSIZE=0 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_SMALL=y CONFIG_MMCSD=y +CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 @@ -103,20 +103,20 @@ CONFIG_STM32_DMA2=y CONFIG_STM32_DMACAPABLE=y CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_FORCEPOWER=y +CONFIG_STM32_I2C2=y CONFIG_STM32_I2C_DUTY16_9=y +CONFIG_STM32_I2C_DYNTIMEO=y CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 -CONFIG_STM32_I2C_DYNTIMEO=y -CONFIG_STM32_I2C2=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI2=y -CONFIG_STM32_TIM1_PARTIAL_REMAP=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y +CONFIG_STM32_TIM1_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_STM32_USB=y @@ -131,13 +131,13 @@ CONFIG_USART1_TXBUFSIZE=32 CONFIG_USART2_RXBUFSIZE=32 CONFIG_USART2_TXBUFSIZE=32 CONFIG_USBDEV_COMPOSITE=y +CONFIG_USBMSC=y CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_SCSI_STACKSIZE=340 -CONFIG_USBMSC=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=880 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig index 0bd53f08b2..4869a1da4d 100644 --- a/configs/olimexino-stm32/nsh/defconfig +++ b/configs/olimexino-stm32/nsh/defconfig @@ -1,6 +1,8 @@ # CONFIG_DISABLE_OS_API is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_DF is not set @@ -18,12 +20,11 @@ # CONFIG_NSH_DISABLE_SEMICOLON is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_SPI_CALLBACK is not set CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" +CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y @@ -31,12 +32,11 @@ CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_C99_BOOL8=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y @@ -56,8 +56,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIB_SENDFILE_BUFSIZE=0 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MM_SMALL=y CONFIG_MMCSD=y +CONFIG_MM_SMALL=y CONFIG_NAME_MAX=8 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 @@ -91,20 +91,20 @@ CONFIG_STM32_DMA2=y CONFIG_STM32_DMACAPABLE=y CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_FORCEPOWER=y +CONFIG_STM32_I2C2=y CONFIG_STM32_I2C_DUTY16_9=y +CONFIG_STM32_I2C_DYNTIMEO=y CONFIG_STM32_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32_I2C_DYNTIMEO_USECPERBYTE=40 -CONFIG_STM32_I2C_DYNTIMEO=y -CONFIG_STM32_I2C2=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI2=y -CONFIG_STM32_TIM1_PARTIAL_REMAP=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y +CONFIG_STM32_TIM1_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y @@ -116,7 +116,7 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USART2_RXBUFSIZE=32 CONFIG_USART2_TXBUFSIZE=32 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=880 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/olimexino-stm32/scripts/ld.script b/configs/olimexino-stm32/scripts/ld.script index e771e9c276..0b3661058a 100644 --- a/configs/olimexino-stm32/scripts/ld.script +++ b/configs/olimexino-stm32/scripts/ld.script @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimexino-stm32/scripts/ld.script.dfu b/configs/olimexino-stm32/scripts/ld.script.dfu index 33403fc7b4..3f6c09b5d5 100644 --- a/configs/olimexino-stm32/scripts/ld.script.dfu +++ b/configs/olimexino-stm32/scripts/ld.script.dfu @@ -41,6 +41,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig index d53beea412..20b6213eea 100644 --- a/configs/olimexino-stm32/smallnsh/defconfig +++ b/configs/olimexino-stm32/smallnsh/defconfig @@ -4,19 +4,19 @@ # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_XD is not set -CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" +CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_C99_BOOL8=y CONFIG_CAN_EXTID=y CONFIG_CAN_LOOPBACK=y @@ -74,18 +74,18 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 -CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_CAN1=y +CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_FORCEPOWER=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI2=y -CONFIG_STM32_TIM1_PARTIAL_REMAP=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y +CONFIG_STM32_TIM1_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=12 @@ -93,6 +93,6 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=880 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig index f003f36250..5d9a32b260 100644 --- a/configs/olimexino-stm32/tiny/defconfig +++ b/configs/olimexino-stm32/tiny/defconfig @@ -1,19 +1,19 @@ # CONFIG_ARCH_LEDS is not set # CONFIG_DEV_NULL is not set # CONFIG_DISABLE_OS_API is not set -CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" +CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_INTERRUPTSTACK=340 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 -CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=768 CONFIG_C99_BOOL8=y CONFIG_CAN_EXTID=y CONFIG_CAN_LOOPBACK=y @@ -55,19 +55,19 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SERIAL_DISABLE_REORDERING=y CONFIG_STACK_COLORATION=y CONFIG_START_YEAR=2014 -CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_CAN1=y +CONFIG_STM32_CAN1_REMAP1=y CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_FORCEPOWER=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI_DMA=y CONFIG_STM32_SPI2=y -CONFIG_STM32_TIM1_PARTIAL_REMAP=y +CONFIG_STM32_SPI_DMA=y CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM3_PARTIAL_REMAP=y +CONFIG_STM32_TIM1_PARTIAL_REMAP=y CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y @@ -76,6 +76,6 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 -CONFIG_USER_ENTRYPOINT="can_main" CONFIG_USERMAIN_STACKSIZE=880 +CONFIG_USER_ENTRYPOINT="can_main" CONFIG_WDOG_INTRESERVE=2 diff --git a/configs/photon/nsh/defconfig b/configs/photon/nsh/defconfig index f14d48b922..bc1845ee1a 100644 --- a/configs/photon/nsh/defconfig +++ b/configs/photon/nsh/defconfig @@ -2,12 +2,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" +CONFIG_ARCH_BOARD_PHOTON=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/photon/scripts/photon_jtag.ld b/configs/photon/scripts/photon_jtag.ld index da1c9fa754..a25761dc75 100644 --- a/configs/photon/scripts/photon_jtag.ld +++ b/configs/photon/scripts/photon_jtag.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/photon/usbnsh/defconfig b/configs/photon/usbnsh/defconfig index f8c7bc5b66..a48b364328 100644 --- a/configs/photon/usbnsh/defconfig +++ b/configs/photon/usbnsh/defconfig @@ -2,17 +2,17 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" +CONFIG_ARCH_BOARD_PHOTON=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y CONFIG_FS_PROCFS=y diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index adceb3ad08..9160f4099f 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -1,12 +1,12 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_SPI_CALLBACK is not set -CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" +CONFIG_ARCH_BOARD_SHENZHOU=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DM9161=y @@ -18,24 +18,24 @@ CONFIG_HAVE_CXX=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_MMCSD=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y +CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -57,21 +57,21 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_BKP=y -CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_ETHMAC=y +CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=17 CONFIG_STM32_PHYSR_100FD=0x8000 CONFIG_STM32_PHYSR_100HD=0x4000 CONFIG_STM32_PHYSR_10FD=0x2000 CONFIG_STM32_PHYSR_10HD=0x1000 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0xf000 -CONFIG_STM32_PHYSR=17 CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_RXBUFSIZE=128 diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 859bb2ca3e..e8572f0745 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -1,54 +1,53 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set -# CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set +# CONFIG_NX_PACKEDMSFIRST is not set CONFIG_ADS7843E_SPIDEV=3 CONFIG_ADS7843E_SWAPXY=y CONFIG_ADS7843E_THRESHX=39 CONFIG_ADS7843E_THRESHY=51 -CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" +CONFIG_ARCH_BOARD_SHENZHOU=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_ETH0_PHY_DM9161=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y -CONFIG_INPUT_ADS7843E=y CONFIG_INPUT=y +CONFIG_INPUT_ADS7843E=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y CONFIG_LCD_SSD1289=y -CONFIG_LCD=y -CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=16 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=16 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=16 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=16 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 CONFIG_NSH_ARCHINIT=y @@ -60,31 +59,29 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596 CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596 CONFIG_NSOCKET_DESCRIPTORS=16 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=325 CONFIG_NXTERM_NXKBDIN=y -CONFIG_NXTERM=y CONFIG_NXTK_BORDERCOLOR1=0x5cb7 CONFIG_NXTK_BORDERCOLOR2=0x21c9 CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_LISTENERSTACK=1596 CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_BACKGROUND_IMAGE="" CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024 CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y CONFIG_NXWM_HEXCALCULATOR_FONTID=5 +CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024 -CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_NXTERM_STACKSIZE=1596 CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596 CONFIG_NXWM_TASKBAR_LEFT=y @@ -92,7 +89,9 @@ CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=101 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 @@ -107,26 +106,26 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=26 CONFIG_START_MONTH=9 CONFIG_START_YEAR=2012 -CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_ETHMAC=y +CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=17 CONFIG_STM32_PHYSR_100FD=0x8000 CONFIG_STM32_PHYSR_100HD=0x4000 CONFIG_STM32_PHYSR_10FD=0x2000 CONFIG_STM32_PHYSR_10HD=0x1000 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0xf000 -CONFIG_STM32_PHYSR=17 -CONFIG_STM32_SPI3_REMAP=y CONFIG_STM32_SPI3=y -CONFIG_STM32_USART2_REMAP=y +CONFIG_STM32_SPI3_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/shenzhou/scripts/ld.script b/configs/shenzhou/scripts/ld.script index 1a23385f70..8a92168c3e 100644 --- a/configs/shenzhou/scripts/ld.script +++ b/configs/shenzhou/scripts/ld.script @@ -44,6 +44,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/shenzhou/scripts/ld.script.dfu b/configs/shenzhou/scripts/ld.script.dfu index dcf57b9b0b..d5e9dbe95a 100644 --- a/configs/shenzhou/scripts/ld.script.dfu +++ b/configs/shenzhou/scripts/ld.script.dfu @@ -46,6 +46,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index 95c1b3fc82..2d0454d67d 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -1,40 +1,27 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" +CONFIG_ARCH_BOARD_SHENZHOU=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DM9161=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_THTTPD=y CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xc0a80001 CONFIG_EXAMPLES_THTTPD_NOMAC=y -CONFIG_EXAMPLES_THTTPD=y CONFIG_FS_NXFFS=y CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MTD_W25=y CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_MTU=768 -CONFIG_NET_ETH_TCP_RECVWNDO=742 -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y +CONFIG_MTD_W25=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y @@ -42,6 +29,19 @@ CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_THTTPD=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_MTU=768 +CONFIG_NET_ETH_TCP_RECVWNDO=742 +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -65,20 +65,20 @@ CONFIG_RTC=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_STM32_BKP=y -CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_ETHMAC=y +CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_JTAG_FULL_ENABLE=y +CONFIG_STM32_PHYSR=17 CONFIG_STM32_PHYSR_100FD=0x8000 CONFIG_STM32_PHYSR_100HD=0x4000 CONFIG_STM32_PHYSR_10FD=0x2000 CONFIG_STM32_PHYSR_10HD=0x1000 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0xf000 -CONFIG_STM32_PHYSR=17 CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index d881bc64f7..efb4c6499b 100644 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -1,17 +1,17 @@ # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 +CONFIG_CDCACM=y CONFIG_CDCACM_COMPOSITE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_COMPOSITE_CONFIGSTR="system/composite" CONFIG_COMPOSITE_IAD=y CONFIG_COMPOSITE_PRODUCTID=0x2022 @@ -24,8 +24,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_MTD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 @@ -55,6 +55,7 @@ CONFIG_SYSTEM_COMPOSITE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_COMPOSITE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_COMPOSITE=y @@ -62,6 +63,5 @@ CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="conn_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig index 06e1408e1a..f369712f97 100644 --- a/configs/stm3210e-eval/nsh/defconfig +++ b/configs/stm3210e-eval/nsh/defconfig @@ -2,12 +2,12 @@ # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_POLL=y @@ -18,8 +18,8 @@ CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_MTD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 81ba91ba1d..78f33f27c2 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -1,27 +1,33 @@ -# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set -# CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set # CONFIG_EXAMPLES_NXHELLO_DEFAULT_COLORS is not set # CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT is not set +# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set +# CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NX=y +CONFIG_EXAMPLES_NXHELLO=y +CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 +CONFIG_EXAMPLES_NXHELLO_BPP=16 +CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf +CONFIG_EXAMPLES_NXHELLO_FONTID=6 CONFIG_EXAMPLES_NX_BGCOLOR=0x0011 CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_NX_COLOR1=0xaedc @@ -29,29 +35,23 @@ CONFIG_EXAMPLES_NX_COLOR2=0xe7ff CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000 CONFIG_EXAMPLES_NX_FONTID=0 CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a -CONFIG_EXAMPLES_NX=y -CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 -CONFIG_EXAMPLES_NXHELLO_BPP=16 -CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf -CONFIG_EXAMPLES_NXHELLO_FONTID=6 -CONFIG_EXAMPLES_NXHELLO=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MAXBUS=2 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y CONFIG_LCD_RPORTRAIT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y CONFIG_NFILE_DESCRIPTORS=8 @@ -61,14 +61,14 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y CONFIG_NXTK_BORDERCOLOR1=0xd69a CONFIG_NXTK_BORDERCOLOR2=0xad55 +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 @@ -83,6 +83,8 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=5 CONFIG_START_MONTH=7 CONFIG_START_YEAR=2011 +CONFIG_STM3210E_LCD=y +CONFIG_STM3210E_R61580_DISABLE=y CONFIG_STM32_DFU=y CONFIG_STM32_DMA2=y CONFIG_STM32_FSMC=y @@ -92,12 +94,11 @@ CONFIG_STM32_SDIO=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_STM32_USB=y -CONFIG_STM3210E_LCD=y -CONFIG_STM3210E_R61580_DISABLE=y CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_EPBULKIN=5 @@ -106,6 +107,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index ae1a4aeff6..0dba35dc95 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -1,16 +1,16 @@ # CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set # CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DEV_LOWCONSOLE=y @@ -18,6 +18,7 @@ CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POSIX_TIMERS=y +CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX_BGCOLOR=0x0011 CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_NX_COLOR1=0xaedc @@ -25,7 +26,6 @@ CONFIG_EXAMPLES_NX_COLOR2=0xe7ff CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000 CONFIG_EXAMPLES_NX_FONTID=0 CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a -CONFIG_EXAMPLES_NX=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_LCD_MAXCONTRAST=1 @@ -36,14 +36,14 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXTK_BORDERCOLOR1=0xad55 CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 @@ -57,6 +57,8 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=5 CONFIG_START_MONTH=7 CONFIG_START_YEAR=2011 +CONFIG_STM3210E_LCD=y +CONFIG_STM3210E_R61580_DISABLE=y CONFIG_STM32_DFU=y CONFIG_STM32_DMA2=y CONFIG_STM32_FSMC=y @@ -65,8 +67,6 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_STM32_USB=y -CONFIG_STM3210E_LCD=y -CONFIG_STM3210E_R61580_DISABLE=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig index a245f11675..00ac312815 100644 --- a/configs/stm3210e-eval/nxterm/defconfig +++ b/configs/stm3210e-eval/nxterm/defconfig @@ -1,16 +1,16 @@ # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -31,18 +31,18 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=256 -CONFIG_NXTERM=y CONFIG_NXTK_BORDERCOLOR1=0xad55 CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 @@ -56,14 +56,14 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=29 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2012 +CONFIG_STM3210E_LCD=y +CONFIG_STM3210E_R61580_DISABLE=y CONFIG_STM32_DFU=y CONFIG_STM32_DMA2=y CONFIG_STM32_FSMC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y -CONFIG_STM3210E_LCD=y -CONFIG_STM3210E_R61580_DISABLE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxterm_main" diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index 922c583817..4f95750c2c 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -1,16 +1,17 @@ -# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set -# CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set # CONFIG_EXAMPLES_NXHELLO_DEFAULT_COLORS is not set # CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT is not set +# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set +# CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y @@ -18,12 +19,17 @@ CONFIG_ARCH_CUSTOM_PMINIT=y CONFIG_ARCH_IDLE_CUSTOM=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NX=y +CONFIG_EXAMPLES_NXHELLO=y +CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 +CONFIG_EXAMPLES_NXHELLO_BPP=16 +CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf +CONFIG_EXAMPLES_NXHELLO_FONTID=6 CONFIG_EXAMPLES_NX_BGCOLOR=0x0011 CONFIG_EXAMPLES_NX_BPP=16 CONFIG_EXAMPLES_NX_COLOR1=0xaedc @@ -31,12 +37,6 @@ CONFIG_EXAMPLES_NX_COLOR2=0xe7ff CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000 CONFIG_EXAMPLES_NX_FONTID=0 CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a -CONFIG_EXAMPLES_NX=y -CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 -CONFIG_EXAMPLES_NXHELLO_BPP=16 -CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf -CONFIG_EXAMPLES_NXHELLO_FONTID=6 -CONFIG_EXAMPLES_NXHELLO=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_LCD_MAXCONTRAST=100 @@ -53,32 +53,36 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y CONFIG_NXTK_BORDERCOLOR1=0xad55 CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb -CONFIG_PM_BUTTONS=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PM=y +CONFIG_PM_BUTTONS=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 +CONFIG_RTC=y CONFIG_RTC_ALARM=y CONFIG_RTC_FREQUENCY=16384 CONFIG_RTC_HIRES=y -CONFIG_RTC=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKSTACKSIZE=1024 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y +CONFIG_STM3210E_LCD=y +CONFIG_STM3210E_LCD_BACKLIGHT=y +CONFIG_STM3210E_LCD_PWM=y +CONFIG_STM3210E_R61580_DISABLE=y CONFIG_STM32_BKP=y CONFIG_STM32_DFU=y CONFIG_STM32_FSMC=y @@ -87,10 +91,6 @@ CONFIG_STM32_PWR=y CONFIG_STM32_TIM1=y CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y -CONFIG_STM3210E_LCD_BACKLIGHT=y -CONFIG_STM3210E_LCD_PWM=y -CONFIG_STM3210E_LCD=y -CONFIG_STM3210E_R61580_DISABLE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/stm3210e-eval/scripts/ld.script b/configs/stm3210e-eval/scripts/ld.script index 0f0e017aa8..5444c56ab3 100644 --- a/configs/stm3210e-eval/scripts/ld.script +++ b/configs/stm3210e-eval/scripts/ld.script @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm3210e-eval/scripts/ld.script.dfu b/configs/stm3210e-eval/scripts/ld.script.dfu index 8669a0f021..09e3ab875f 100644 --- a/configs/stm3210e-eval/scripts/ld.script.dfu +++ b/configs/stm3210e-eval/scripts/ld.script.dfu @@ -46,6 +46,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig index bd3c4339a1..9e34778a6c 100644 --- a/configs/stm3210e-eval/usbmsc/defconfig +++ b/configs/stm3210e-eval/usbmsc/defconfig @@ -1,11 +1,11 @@ # CONFIG_MMCSD_HAVE_CARDDETECT is not set # CONFIG_MMCSD_MMCSUPPORT is not set -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DISABLE_POLL=y @@ -13,8 +13,8 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_SDIO=y CONFIG_MMCSD=y +CONFIG_MMCSD_SDIO=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_MQ_MSGS=4 @@ -41,6 +41,7 @@ CONFIG_STM32_USB=y CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USBMSC=y CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_EPBULKIN=5 @@ -49,6 +50,5 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 -CONFIG_USBMSC=y CONFIG_USER_ENTRYPOINT="msconn_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig index 6af5d5f4c1..22e527b601 100644 --- a/configs/stm3210e-eval/usbserial/defconfig +++ b/configs/stm3210e-eval/usbserial/defconfig @@ -1,9 +1,9 @@ -CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" +CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 @@ -16,11 +16,11 @@ CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 +CONFIG_PL2303=y CONFIG_PL2303_PRODUCTSTR="USBdev Serial" CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" -CONFIG_PL2303=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig index 1e6aae2cd7..5a7ebcf492 100644 --- a/configs/stm3220g-eval/dhcpd/defconfig +++ b/configs/stm3220g-eval/dhcpd/defconfig @@ -1,10 +1,10 @@ # CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DISABLE_ENVIRON=y @@ -13,9 +13,9 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_DHCPD=y CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001 CONFIG_EXAMPLES_DHCPD_NOMAC=y -CONFIG_EXAMPLES_DHCPD=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y @@ -23,14 +23,14 @@ CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_NETLIB=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -50,11 +50,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig index 93d3e1ce7e..987c89b693 100644 --- a/configs/stm3220g-eval/nettest/defconfig +++ b/configs/stm3220g-eval/nettest/defconfig @@ -1,9 +1,9 @@ -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DEV_LOWCONSOLE=y @@ -13,21 +13,21 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y -CONFIG_EXAMPLES_NETTEST=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 +CONFIG_NET=y +CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP=y -CONFIG_NET=y -CONFIG_NETUTILS_NETLIB=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -47,11 +47,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig index a20a2296c1..352147836b 100644 --- a/configs/stm3220g-eval/nsh/defconfig +++ b/configs/stm3220g-eval/nsh/defconfig @@ -2,45 +2,45 @@ # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD=y +CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y @@ -52,8 +52,8 @@ CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y @@ -62,11 +62,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_SYMTAB_ORDEREDBYNAME=y diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig index 0d7255a4b7..03d48ded03 100644 --- a/configs/stm3220g-eval/nsh2/defconfig +++ b/configs/stm3220g-eval/nsh2/defconfig @@ -4,53 +4,53 @@ # CONFIG_NSH_CONSOLE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -63,13 +63,13 @@ CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 +CONFIG_RAMLOG=y +CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_WAITPID=y @@ -80,11 +80,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_SDIO=y CONFIG_SYMTAB_ORDEREDBYNAME=y diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 25a868d872..7c242b14a2 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -3,16 +3,16 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NX_DISABLE_16BPP is not set -# CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +# CONFIG_NX_DISABLE_16BPP is not set +# CONFIG_NX_PACKEDMSFIRST is not set +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_ETH0_PHY_DP83848C=y @@ -23,32 +23,32 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_I2C_POLLED=y -CONFIG_INPUT_STMPE811=y CONFIG_INPUT=y +CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD=y +CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 CONFIG_NSH_FILEIOSIZE=512 @@ -57,20 +57,18 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=325 CONFIG_NXTERM_NXKBDIN=y -CONFIG_NXTERM=y CONFIG_NXTK_BORDERCOLOR1=0x5cb7 CONFIG_NXTK_BORDERCOLOR2=0x21c9 CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y @@ -80,24 +78,26 @@ CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xd73e CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9 CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_BACKGROUND_IMAGE="" CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y CONFIG_NXWM_HEXCALCULATOR_FONTID=5 -CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_KEYBOARD=y +CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_ONEXIT=y @@ -109,11 +109,11 @@ CONFIG_STM32_FSMC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_STMPE811_ACTIVELOW=y diff --git a/configs/stm3220g-eval/scripts/ld.script b/configs/stm3220g-eval/scripts/ld.script index 1b88091666..93440169d2 100644 --- a/configs/stm3220g-eval/scripts/ld.script +++ b/configs/stm3220g-eval/scripts/ld.script @@ -52,6 +52,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig index 89765eb18c..a52ae28237 100644 --- a/configs/stm3220g-eval/telnetd/defconfig +++ b/configs/stm3220g-eval/telnetd/defconfig @@ -1,9 +1,9 @@ -CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" +CONFIG_ARCH_BOARD_STM3220G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=10926 CONFIG_DEV_LOWCONSOLE=y @@ -13,24 +13,24 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_TELNETD=y CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128 CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128 CONFIG_EXAMPLES_TELNETD_NOMAC=y -CONFIG_EXAMPLES_TELNETD=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 CONFIG_MM_REGIONS=2 -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_TELNETD=y +CONFIG_NET_ICMP=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -49,11 +49,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index 23137cfd64..ae0b266a72 100644 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -150,35 +150,29 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the scripts/ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index 554ce169f4..989f826c7b 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/configs/stm3240g-eval/dhcpd/defconfig @@ -1,11 +1,11 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DISABLE_ENVIRON=y @@ -14,9 +14,9 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_DHCPD=y CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001 CONFIG_EXAMPLES_DHCPD_NOMAC=y -CONFIG_EXAMPLES_DHCPD=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y @@ -24,14 +24,14 @@ CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETUTILS_DHCPD=y CONFIG_NETUTILS_NETLIB=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -51,11 +51,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index 9b1facf171..773b32a086 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -1,44 +1,44 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DISCOVER_DESCR="STM3240G-EVAL" CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_DISCOVER=y CONFIG_EXAMPLES_DISCOVER_DHCPC=y CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80201 CONFIG_EXAMPLES_DISCOVER_NOMAC=y -CONFIG_EXAMPLES_DISCOVER=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y +CONFIG_I2C_POLLED=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_NET=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NET_ARP_IPIN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_MTU=650 CONFIG_NET_ETH_TCP_RECVWNDO=624 -CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -59,11 +59,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_SYSTEM_PING=y diff --git a/configs/stm3240g-eval/fb/defconfig b/configs/stm3240g-eval/fb/defconfig index f101953f56..62628c88a3 100644 --- a/configs/stm3240g-eval/fb/defconfig +++ b/configs/stm3240g-eval/fb/defconfig @@ -1,10 +1,10 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y @@ -20,13 +20,13 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0x64000000 CONFIG_HEAP2_SIZE=2097152 CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=3 @@ -52,15 +52,15 @@ CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=17 CONFIG_START_MONTH=9 -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_PWR=y diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 18f80a8e22..ba8aadcb90 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -1,18 +1,18 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NX_DISABLE_16BPP is not set -# CONFIG_NX_PACKEDMSFIRST is not set -# CONFIG_NX_WRITEONLY is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NXWM_NXTERM is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +# CONFIG_NX_DISABLE_16BPP is not set +# CONFIG_NX_PACKEDMSFIRST is not set +# CONFIG_NX_WRITEONLY is not set +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_ARM_MPU=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y +CONFIG_ARM_MPU=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y CONFIG_CXX_NEWLONG=y @@ -24,12 +24,12 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_I2C_POLLED=y -CONFIG_INPUT_STMPE811=y CONFIG_INPUT=y +CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_LIB_BOARDCTL=y CONFIG_LIB_USRWORK=y CONFIG_MAX_TASKS=16 @@ -39,9 +39,6 @@ CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 CONFIG_NUTTX_USERSPACE=0x08040000 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y @@ -49,6 +46,7 @@ CONFIG_NXSTART_SERVERSTACK=1596 CONFIG_NXTK_BORDERCOLOR1=0x5cb7 CONFIG_NXTK_BORDERCOLOR2=0x21c9 CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y @@ -58,22 +56,24 @@ CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xd73e CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9 CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y CONFIG_NXWM_HEXCALCULATOR_FONTID=5 CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PASS1_BUILDIR="configs/stm3240g-eval/kernel" CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_ONEXIT=y @@ -91,8 +91,8 @@ CONFIG_STMPE811_MULTIPLE=y CONFIG_STMPE811_THRESHX=39 CONFIG_STMPE811_THRESHY=51 CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYS_RESERVED=8 CONFIG_SYSTEM_READLINE=y +CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index d0dc384c35..3e8c761648 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/configs/stm3240g-eval/nettest/defconfig @@ -1,10 +1,10 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y @@ -14,22 +14,22 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_NETTEST=y CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y -CONFIG_EXAMPLES_NETTEST=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 CONFIG_MM_REGIONS=2 +CONFIG_NET=y +CONFIG_NETUTILS_NETLIB=y CONFIG_NET_ICMP=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP=y -CONFIG_NET=y -CONFIG_NETUTILS_NETLIB=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -49,11 +49,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index b599f4e457..43384bb9bb 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -1,50 +1,50 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y @@ -59,8 +59,8 @@ CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y @@ -68,11 +68,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_RNG=y CONFIG_STM32_USART3=y diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index 692234b06e..964870441b 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/configs/stm3240g-eval/nsh2/defconfig @@ -5,53 +5,53 @@ # CONFIG_NSH_CONSOLE is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_DP83848C=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y CONFIG_MTD=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -64,13 +64,13 @@ CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 +CONFIG_RAMLOG=y +CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKSTACKSIZE=1024 @@ -82,11 +82,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_SDIO=y CONFIG_SYMTAB_ORDEREDBYNAME=y diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig index 56a2f4cfed..48e1ac604e 100644 --- a/configs/stm3240g-eval/nxterm/defconfig +++ b/configs/stm3240g-eval/nxterm/defconfig @@ -1,17 +1,17 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y @@ -22,36 +22,36 @@ CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0x64000000 CONFIG_HEAP2_SIZE=2097152 CONFIG_HOST_WINDOWS=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MINBUS=1 +CONFIG_I2C_POLLED=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=3 CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSCLIENT=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 CONFIG_NSH_BUILTIN_APPS=y @@ -61,41 +61,41 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=256 -CONFIG_NXTERM=y CONFIG_NXTK_BORDERCOLOR1=0xad55 CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_SYSTEM_I2CTOOL=y diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index 6a277c9bd8..e298329c32 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -2,17 +2,17 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set # CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NX_WRITEONLY is not set -# CONFIG_NXFONTS_DISABLE_16BPP is not set -# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_FAT_LCNAMES=y @@ -22,33 +22,33 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_I2C_POLLED=y -CONFIG_INPUT_STMPE811=y CONFIG_INPUT=y +CONFIG_INPUT_STMPE811=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=12 CONFIG_NFILE_STREAMS=12 CONFIG_NSH_FILEIOSIZE=512 @@ -57,20 +57,18 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=325 CONFIG_NXTERM_NXKBDIN=y -CONFIG_NXTERM=y CONFIG_NXTK_BORDERCOLOR1=0x5cb7 CONFIG_NXTK_BORDERCOLOR2=0x21c9 CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y @@ -80,21 +78,23 @@ CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xd73e CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9 CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y CONFIG_NXWM_HEXCALCULATOR_FONTID=5 CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_ONEXIT=y @@ -106,11 +106,11 @@ CONFIG_STM32_FSMC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_STMPE811_ACTIVELOW=y diff --git a/configs/stm3240g-eval/scripts/kernel-space.ld b/configs/stm3240g-eval/scripts/kernel-space.ld index 12acb943d9..041f0f8975 100644 --- a/configs/stm3240g-eval/scripts/kernel-space.ld +++ b/configs/stm3240g-eval/scripts/kernel-space.ld @@ -38,6 +38,7 @@ */ OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm3240g-eval/scripts/ld.script b/configs/stm3240g-eval/scripts/ld.script index 2e3de10a63..5a2dceafcd 100644 --- a/configs/stm3240g-eval/scripts/ld.script +++ b/configs/stm3240g-eval/scripts/ld.script @@ -53,6 +53,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm3240g-eval/src/stm32_ostest.c b/configs/stm3240g-eval/src/stm32_ostest.c index 45601e8ac7..57952ef65e 100644 --- a/configs/stm3240g-eval/src/stm32_ostest.c +++ b/configs/stm3240g-eval/src/stm32_ostest.c @@ -58,8 +58,7 @@ #undef HAVE_FPU #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \ - defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) && \ - !defined(CONFIG_ARMV7M_CMNVECTOR) + defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_DISABLE_SIGNALS) # define HAVE_FPU 1 #endif diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index cf516f8717..c94c02a43f 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/configs/stm3240g-eval/telnetd/defconfig @@ -1,10 +1,10 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y @@ -14,24 +14,24 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_TELNETD=y CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128 CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128 CONFIG_EXAMPLES_TELNETD_NOMAC=y -CONFIG_EXAMPLES_TELNETD=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 CONFIG_MM_REGIONS=2 -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y CONFIG_NET=y CONFIG_NETUTILS_NETLIB=y CONFIG_NETUTILS_TELNETD=y +CONFIG_NET_ICMP=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -50,11 +50,11 @@ CONFIG_STM32_DFU=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_USART3=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig index f135ed7837..c7cdfff1d9 100644 --- a/configs/stm3240g-eval/webserver/defconfig +++ b/configs/stm3240g-eval/webserver/defconfig @@ -1,44 +1,43 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_NETTEST=y +CONFIG_EXAMPLES_NETTEST_NOMAC=y CONFIG_EXAMPLES_WEBSERVER=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y +CONFIG_I2C_POLLED=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 CONFIG_MTD=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_WEBSERVER=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_FILEIOSIZE=512 @@ -54,8 +53,8 @@ CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 -CONFIG_RTC_DATETIME=y CONFIG_RTC=y +CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y @@ -64,11 +63,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_SYMTAB_ORDEREDBYNAME=y diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index 71dd22a63c..90109b82fb 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -1,42 +1,42 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DISABLE_OS_API is not set -CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" +CONFIG_ARCH_BOARD_STM3240G_EVAL=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_ETH0_PHY_DP83848C=y +CONFIG_EXAMPLES_XMLRPC=y CONFIG_EXAMPLES_XMLRPC_DHCPC=y CONFIG_EXAMPLES_XMLRPC_NOMAC=y -CONFIG_EXAMPLES_XMLRPC=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C_POLLED=y CONFIG_I2C=y +CONFIG_I2C_POLLED=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 +CONFIG_NET=y +CONFIG_NETDB_DNSCLIENT_ENTRIES=4 CONFIG_NET_ARP_IPIN=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_MTU=650 -CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_MAX_LISTENPORTS=40 CONFIG_NET_SOCKOPTS=y CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=40 CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y +CONFIG_NET_TCP_CONNS=40 CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=4 +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 @@ -57,11 +57,11 @@ CONFIG_STM32_ETHMAC=y CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_MII=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_USART3=y CONFIG_SYSTEM_PING=y @@ -69,6 +69,6 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 -CONFIG_USER_ENTRYPOINT="xmlrpc_main" CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_USER_ENTRYPOINT="xmlrpc_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig index 787e85caff..a898706c19 100644 --- a/configs/stm32_tiny/nsh/defconfig +++ b/configs/stm32_tiny/nsh/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32_TINY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32_tiny" +CONFIG_ARCH_BOARD_STM32_TINY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y diff --git a/configs/stm32_tiny/scripts/ld.script b/configs/stm32_tiny/scripts/ld.script index c4ab5ea33d..a97be1a2fe 100644 --- a/configs/stm32_tiny/scripts/ld.script +++ b/configs/stm32_tiny/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig index 81d0fbaf52..a193b5a85c 100644 --- a/configs/stm32_tiny/usbnsh/defconfig +++ b/configs/stm32_tiny/usbnsh/defconfig @@ -1,5 +1,7 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -10,21 +12,19 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32_TINY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32_tiny" +CONFIG_ARCH_BOARD_STM32_TINY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y @@ -54,7 +54,7 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32butterfly2/nsh/defconfig b/configs/stm32butterfly2/nsh/defconfig index f3d16d1cbf..cf2f84be5f 100644 --- a/configs/stm32butterfly2/nsh/defconfig +++ b/configs/stm32butterfly2/nsh/defconfig @@ -6,32 +6,32 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" +CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y +CONFIG_EXAMPLES_HIDKBD=y CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50 CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024 -CONFIG_EXAMPLES_HIDKBD=y CONFIG_EXAMPLES_MOUNT=y CONFIG_EXAMPLES_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_STRERROR_SHORT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBC_STRERROR_SHORT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -39,16 +39,16 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_MOTD=y +CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMDISK=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMDISK=y CONFIG_RAW_BINARY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RR_INTERVAL=100 @@ -63,14 +63,14 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USBHOST=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y -CONFIG_USBHOST=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32butterfly2/nshnet/defconfig b/configs/stm32butterfly2/nshnet/defconfig index 1e8dafebc8..aa79b3e411 100644 --- a/configs/stm32butterfly2/nshnet/defconfig +++ b/configs/stm32butterfly2/nshnet/defconfig @@ -7,52 +7,52 @@ # CONFIG_STM32_AUTONEG is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" +CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y CONFIG_ETH0_PHY_DP83848C=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_MOUNT=y CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_STRERROR_SHORT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBC_STRERROR_SHORT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y +CONFIG_NET=y CONFIG_NET_ARP_IPIN=y CONFIG_NET_ETH_MTU=1500 CONFIG_NET_HOSTNAME="butterfly2" -CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_LOCAL=y -CONFIG_NET_TCP_SPLIT=y CONFIG_NET_TCP=y +CONFIG_NET_TCP_SPLIT=y CONFIG_NET_UDP=y -CONFIG_NET=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DRIPADDR=0x0a010101 CONFIG_NSH_IPADDR=0x0a010163 -CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_MOTD=y +CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y @@ -60,9 +60,9 @@ CONFIG_PL2303=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMDISK=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMDISK=y CONFIG_RAW_BINARY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RR_INTERVAL=100 @@ -73,25 +73,25 @@ CONFIG_SCHED_HPWORKSTACKSIZE=1024 CONFIG_SDCLONE_DISABLE=y CONFIG_START_YEAR=1970 CONFIG_STM32_ADC1=y -CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_ETH100MBPS=y CONFIG_STM32_ETHFD=y CONFIG_STM32_ETHMAC=y +CONFIG_STM32_ETH_REMAP=y CONFIG_STM32_JTAG_FULL_ENABLE=y -CONFIG_STM32_MII_EXTCLK=y CONFIG_STM32_MII=y +CONFIG_STM32_MII_EXTCLK=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 -CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32butterfly2/nshusbdev/defconfig b/configs/stm32butterfly2/nshusbdev/defconfig index c3c4d789a0..05f9a9469b 100644 --- a/configs/stm32butterfly2/nshusbdev/defconfig +++ b/configs/stm32butterfly2/nshusbdev/defconfig @@ -6,30 +6,30 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" +CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_MOUNT=y CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_USBSERIAL=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_STRERROR_SHORT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBC_STRERROR_SHORT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -37,17 +37,17 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_MOTD=y +CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PL2303=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMDISK=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMDISK=y CONFIG_RAW_BINARY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RR_INTERVAL=100 @@ -62,14 +62,14 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 -CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32butterfly2/nshusbhost/defconfig b/configs/stm32butterfly2/nshusbhost/defconfig index f3d16d1cbf..cf2f84be5f 100644 --- a/configs/stm32butterfly2/nshusbhost/defconfig +++ b/configs/stm32butterfly2/nshusbhost/defconfig @@ -6,32 +6,32 @@ # CONFIG_NSH_DISABLE_LOSMART is not set CONFIG_ADC=y CONFIG_ANALOG=y -CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" +CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y -CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_ADC=y +CONFIG_EXAMPLES_ADC_SWTRIG=y +CONFIG_EXAMPLES_HIDKBD=y CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50 CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024 -CONFIG_EXAMPLES_HIDKBD=y CONFIG_EXAMPLES_MOUNT=y CONFIG_EXAMPLES_NSH=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIBC_STRERROR_SHORT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBC_STRERROR_SHORT=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MMCSD=y @@ -39,16 +39,16 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_MOTD=y +CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAMDISK=y CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 -CONFIG_RAMDISK=y CONFIG_RAW_BINARY=y CONFIG_READLINE_TABCOMPLETION=y CONFIG_RR_INTERVAL=100 @@ -63,14 +63,14 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2_REMAP=y CONFIG_STM32_USART2=y +CONFIG_STM32_USART2_REMAP=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_RAMTEST=y CONFIG_SYSTEM_VI=y CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USBHOST=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y -CONFIG_USBHOST=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32f103-minimum/apds9960/defconfig b/configs/stm32f103-minimum/apds9960/defconfig index 29d75ae036..b78c75beba 100644 --- a/configs/stm32f103-minimum/apds9960/defconfig +++ b/configs/stm32f103-minimum/apds9960/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y @@ -44,8 +44,8 @@ CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKSTACKSIZE=3072 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y -CONFIG_SENSORS_APDS9960=y CONFIG_SENSORS=y +CONFIG_SENSORS_APDS9960=y CONFIG_SERIAL_TERMIOS=y CONFIG_START_DAY=5 CONFIG_START_MONTH=7 diff --git a/configs/stm32f103-minimum/audio_tone/defconfig b/configs/stm32f103-minimum/audio_tone/defconfig index 55448e27e6..47855343f0 100644 --- a/configs/stm32f103-minimum/audio_tone/defconfig +++ b/configs/stm32f103-minimum/audio_tone/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,19 +10,18 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_DRIVERS_AUDIO=y -CONFIG_AUDIO_TONE=y CONFIG_AUDIO=y +CONFIG_AUDIO_TONE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y +CONFIG_DRIVERS_AUDIO=y CONFIG_EXAMPLES_NSH=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -50,9 +50,9 @@ CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_FULL_ENABLE=y CONFIG_STM32_ONESHOT=y +CONFIG_STM32_TIM2=y CONFIG_STM32_TIM2_CHANNEL=2 CONFIG_STM32_TIM2_PWM=y -CONFIG_STM32_TIM2=y CONFIG_STM32_TIM3=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y diff --git a/configs/stm32f103-minimum/buttons/defconfig b/configs/stm32f103-minimum/buttons/defconfig index cb950d62a4..562f269e2e 100644 --- a/configs/stm32f103-minimum/buttons/defconfig +++ b/configs/stm32f103-minimum/buttons/defconfig @@ -1,5 +1,6 @@ # CONFIG_ARCH_LEDS is not set # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -10,20 +11,19 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y -CONFIG_BUTTONS_LOWER=y CONFIG_BUTTONS=y +CONFIG_BUTTONS_LOWER=y CONFIG_DEFAULT_SMALL=y CONFIG_EXAMPLES_BUTTONS=y CONFIG_EXAMPLES_NSH=y diff --git a/configs/stm32f103-minimum/hello/defconfig b/configs/stm32f103-minimum/hello/defconfig index 9348a747c6..c6d661ef77 100644 --- a/configs/stm32f103-minimum/hello/defconfig +++ b/configs/stm32f103-minimum/hello/defconfig @@ -1,14 +1,21 @@ +# CONFIG_ARCH_LEDS is not set +# CONFIG_DEV_NULL is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLE_DF is not set +# CONFIG_NSH_DISABLE_EXEC is not set +# CONFIG_NSH_DISABLE_EXIT is not set +# CONFIG_NSH_DISABLE_GET is not set +# CONFIG_NSH_DISABLE_HEXDUMP is not set +# CONFIG_NSH_DISABLE_PS is not set +# CONFIG_NSH_DISABLE_XD is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y -CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_CHIP_STM32=y -# CONFIG_ARCH_LEDS is not set -CONFIG_ARMV7M_CMNVECTOR=y +CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_DEFAULT_SMALL=y -# CONFIG_DEV_NULL is not set CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y @@ -22,23 +29,13 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_SMALL=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -# CONFIG_NSH_DISABLE_ADDROUTE is not set -# CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_DISABLE_CP=y -# CONFIG_NSH_DISABLE_DELROUTE is not set -# CONFIG_NSH_DISABLE_DF is not set -# CONFIG_NSH_DISABLE_EXEC is not set -# CONFIG_NSH_DISABLE_EXIT is not set -# CONFIG_NSH_DISABLE_GET is not set -# CONFIG_NSH_DISABLE_HEXDUMP is not set CONFIG_NSH_DISABLE_MKDIR=y CONFIG_NSH_DISABLE_MOUNT=y CONFIG_NSH_DISABLE_MV=y -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_RM=y +CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_UMOUNT=y -# CONFIG_NSH_DISABLE_XD is not set CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 @@ -62,6 +59,6 @@ CONFIG_STM32_USART1=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="hello_main" CONFIG_USERMAIN_STACKSIZE=1536 +CONFIG_USER_ENTRYPOINT="hello_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f103-minimum/mcp2515/defconfig b/configs/stm32f103-minimum/mcp2515/defconfig index db924870c1..faa4df62b2 100644 --- a/configs/stm32f103-minimum/mcp2515/defconfig +++ b/configs/stm32f103-minimum/mcp2515/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,23 +10,22 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y -CONFIG_CAN_MCP2515=y -CONFIG_CAN_TXREADY=y CONFIG_CAN=y CONFIG_CANUTILS_CANLIB=y +CONFIG_CAN_MCP2515=y +CONFIG_CAN_TXREADY=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_CAN_READ=y CONFIG_EXAMPLES_CAN=y +CONFIG_EXAMPLES_CAN_READ=y CONFIG_EXAMPLES_NSH=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig index 80dbd20ab4..5342ee1ae1 100644 --- a/configs/stm32f103-minimum/nsh/defconfig +++ b/configs/stm32f103-minimum/nsh/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y diff --git a/configs/stm32f103-minimum/pwm/defconfig b/configs/stm32f103-minimum/pwm/defconfig index 3543e576e5..c91c2b6085 100644 --- a/configs/stm32f103-minimum/pwm/defconfig +++ b/configs/stm32f103-minimum/pwm/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y @@ -47,9 +47,9 @@ CONFIG_START_MONTH=7 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_FULL_ENABLE=y +CONFIG_STM32_TIM3=y CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y -CONFIG_STM32_TIM3=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/stm32f103-minimum/rfid-rc522/defconfig b/configs/stm32f103-minimum/rfid-rc522/defconfig index 21f39f60fe..0cf8b6ae38 100644 --- a/configs/stm32f103-minimum/rfid-rc522/defconfig +++ b/configs/stm32f103-minimum/rfid-rc522/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_CL_MFRC522=y diff --git a/configs/stm32f103-minimum/rgbled/defconfig b/configs/stm32f103-minimum/rgbled/defconfig index a82a85cea0..c54470da67 100644 --- a/configs/stm32f103-minimum/rgbled/defconfig +++ b/configs/stm32f103-minimum/rgbled/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y @@ -48,17 +48,17 @@ CONFIG_START_MONTH=7 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y CONFIG_STM32_JTAG_FULL_ENABLE=y -CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_TIM1=y +CONFIG_STM32_TIM1_PWM=y +CONFIG_STM32_TIM2=y CONFIG_STM32_TIM2_CHANNEL=2 CONFIG_STM32_TIM2_PWM=y -CONFIG_STM32_TIM2=y +CONFIG_STM32_TIM3=y CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y -CONFIG_STM32_TIM3=y +CONFIG_STM32_TIM4=y CONFIG_STM32_TIM4_CHANNEL=4 CONFIG_STM32_TIM4_PWM=y -CONFIG_STM32_TIM4=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 diff --git a/configs/stm32f103-minimum/scripts/ld.script b/configs/stm32f103-minimum/scripts/ld.script index b596dd1f93..ec15a978f8 100644 --- a/configs/stm32f103-minimum/scripts/ld.script +++ b/configs/stm32f103-minimum/scripts/ld.script @@ -53,6 +53,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f103-minimum/scripts/ld.script.dfu b/configs/stm32f103-minimum/scripts/ld.script.dfu index 0159500940..9c9b0e6f4e 100644 --- a/configs/stm32f103-minimum/scripts/ld.script.dfu +++ b/configs/stm32f103-minimum/scripts/ld.script.dfu @@ -47,6 +47,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig index 0ce5333f50..ff012c90ef 100644 --- a/configs/stm32f103-minimum/usbnsh/defconfig +++ b/configs/stm32f103-minimum/usbnsh/defconfig @@ -1,5 +1,7 @@ # CONFIG_DEV_CONSOLE is not set # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -10,21 +12,19 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_NSH=y @@ -53,7 +53,7 @@ CONFIG_STM32_USART1=y CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f103-minimum/userled/defconfig b/configs/stm32f103-minimum/userled/defconfig index ef53ac944d..cadfb4ef2f 100644 --- a/configs/stm32f103-minimum/userled/defconfig +++ b/configs/stm32f103-minimum/userled/defconfig @@ -1,5 +1,6 @@ # CONFIG_ARCH_LEDS is not set # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -10,13 +11,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -52,7 +52,7 @@ CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_USERLED_LOWER=y CONFIG_USERLED=y +CONFIG_USERLED_LOWER=y +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f103-minimum/veml6070/defconfig b/configs/stm32f103-minimum/veml6070/defconfig index a077d0c0d3..62e7c4659f 100644 --- a/configs/stm32f103-minimum/veml6070/defconfig +++ b/configs/stm32f103-minimum/veml6070/defconfig @@ -1,4 +1,5 @@ # CONFIG_DISABLE_OS_API is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -9,13 +10,12 @@ # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" +CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -41,6 +41,7 @@ CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_SENSORS=y +CONFIG_SENSORS_VEML6070=y CONFIG_SERIAL_TERMIOS=y CONFIG_START_DAY=5 CONFIG_START_MONTH=7 @@ -53,5 +54,4 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_SENSORS_VEML6070=y CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f334-disco/buckboost/defconfig b/configs/stm32f334-disco/buckboost/defconfig index 3276eb9880..68a0c389dd 100644 --- a/configs/stm32f334-disco/buckboost/defconfig +++ b/configs/stm32f334-disco/buckboost/defconfig @@ -1,20 +1,20 @@ +# CONFIG_DEV_NULL is not set CONFIG_ADC=y CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_CHIP_STM32=y +CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y -# CONFIG_DEV_NULL is not set CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y @@ -22,6 +22,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_DRIVERS_SMPS=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_SMPS=y CONFIG_EXAMPLES_SMPS_DEVPATH="/dev/smps0" CONFIG_EXAMPLES_SMPS_IN_VOLTAGE_LIMIT=10000 CONFIG_EXAMPLES_SMPS_OUT_CURRENT_LIMIT=100 @@ -29,12 +30,11 @@ CONFIG_EXAMPLES_SMPS_OUT_POWER_LIMIT=100 CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_DEFAULT=5000 CONFIG_EXAMPLES_SMPS_OUT_VOLTAGE_LIMIT=10000 CONFIG_EXAMPLES_SMPS_TIME_DEFAULT=10 -CONFIG_EXAMPLES_SMPS=y CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBM=y CONFIG_LIBDSP=y +CONFIG_LIBM=y CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=1 CONFIG_NAME_MAX=16 @@ -69,8 +69,8 @@ CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_MW=y CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_PWD=y -CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_RM=y +CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y CONFIG_NSH_DISABLE_SH=y CONFIG_NSH_DISABLE_SLEEP=y @@ -104,8 +104,8 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STDIO_BUFFER_SIZE=128 -CONFIG_STM32_ADC1_INJECTED=y CONFIG_STM32_ADC1=y +CONFIG_STM32_ADC1_INJECTED=y CONFIG_STM32_ADC_NOIRQ=y CONFIG_STM32_CCMEXCLUDE=y CONFIG_STM32_HRTIM1=y @@ -115,22 +115,22 @@ CONFIG_STM32_HRTIM_CLK_FROM_PLL=y CONFIG_STM32_HRTIM_DEADTIME=y CONFIG_STM32_HRTIM_DISABLE_CHARDRV=y CONFIG_STM32_HRTIM_PWM=y +CONFIG_STM32_HRTIM_TIMA=y CONFIG_STM32_HRTIM_TIMA_DT=y +CONFIG_STM32_HRTIM_TIMA_PWM=y CONFIG_STM32_HRTIM_TIMA_PWM_CH1=y CONFIG_STM32_HRTIM_TIMA_PWM_CH2=y -CONFIG_STM32_HRTIM_TIMA_PWM=y -CONFIG_STM32_HRTIM_TIMA=y +CONFIG_STM32_HRTIM_TIMB=y CONFIG_STM32_HRTIM_TIMB_DT=y +CONFIG_STM32_HRTIM_TIMB_PWM=y CONFIG_STM32_HRTIM_TIMB_PWM_CH1=y CONFIG_STM32_HRTIM_TIMB_PWM_CH2=y -CONFIG_STM32_HRTIM_TIMB_PWM=y -CONFIG_STM32_HRTIM_TIMB=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f334-disco/nsh/defconfig b/configs/stm32f334-disco/nsh/defconfig index c5317b2dba..a38ae7df19 100644 --- a/configs/stm32f334-disco/nsh/defconfig +++ b/configs/stm32f334-disco/nsh/defconfig @@ -1,19 +1,21 @@ +# CONFIG_ARCH_FPU is not set +# CONFIG_DEV_NULL is not set +# CONFIG_LIBC_LONG_LONG is not set +# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_CHIP_STM32=y -# CONFIG_ARCH_FPU is not set +CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y -# CONFIG_DEV_NULL is not set CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y @@ -24,21 +26,18 @@ CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_NSH=y CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y -# CONFIG_LIBC_LONG_LONG is not set CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=1 CONFIG_NAME_MAX=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_DISABLE_ADDROUTE=y CONFIG_NSH_DISABLE_BASENAME=y CONFIG_NSH_DISABLE_CAT=y CONFIG_NSH_DISABLE_CD=y CONFIG_NSH_DISABLE_CMP=y CONFIG_NSH_DISABLE_CP=y CONFIG_NSH_DISABLE_DD=y -CONFIG_NSH_DISABLE_DELROUTE=y CONFIG_NSH_DISABLE_DF=y CONFIG_NSH_DISABLE_DIRNAME=y CONFIG_NSH_DISABLE_EXEC=y @@ -55,11 +54,10 @@ CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_MOUNT=y CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_MW=y -# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_PWD=y -CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_RM=y +CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y CONFIG_NSH_DISABLE_SH=y CONFIG_NSH_DISABLE_SLEEP=y @@ -96,6 +94,6 @@ CONFIG_SYSLOG_NONE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f334-disco/powerled/defconfig b/configs/stm32f334-disco/powerled/defconfig index cde38123b1..40c7779b91 100644 --- a/configs/stm32f334-disco/powerled/defconfig +++ b/configs/stm32f334-disco/powerled/defconfig @@ -1,34 +1,35 @@ +# CONFIG_ARCH_FPU is not set +# CONFIG_DEV_NULL is not set +# CONFIG_LIBC_LONG_LONG is not set +# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_CHIP_STM32=y -# CONFIG_ARCH_FPU is not set +CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_BUILTIN=y +CONFIG_BUILTIN_PROXY_STACKSIZE=512 CONFIG_COMP=y CONFIG_DAC=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y -# CONFIG_DEV_NULL is not set CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_DRIVERS_POWERLED=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_POWERLED=y CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT=100 CONFIG_EXAMPLES_POWERLED_DEVPATH="/dev/powerled0" -CONFIG_EXAMPLES_POWERLED=y CONFIG_FDCLONE_STDIO=y CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_FLOATINGPOINT=y -# CONFIG_LIBC_LONG_LONG is not set CONFIG_LIBM=y CONFIG_MAX_TASKS=4 CONFIG_MAX_WDOGPARMS=1 @@ -58,11 +59,10 @@ CONFIG_NSH_DISABLE_MKRD=y CONFIG_NSH_DISABLE_MOUNT=y CONFIG_NSH_DISABLE_MV=y CONFIG_NSH_DISABLE_MW=y -# CONFIG_NSH_DISABLE_PRINTF is not set CONFIG_NSH_DISABLE_PUT=y CONFIG_NSH_DISABLE_PWD=y -CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_RM=y +CONFIG_NSH_DISABLE_RMDIR=y CONFIG_NSH_DISABLE_SET=y CONFIG_NSH_DISABLE_SH=y CONFIG_NSH_DISABLE_SLEEP=y @@ -94,11 +94,11 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_COMP4=y CONFIG_STM32_COMP=y +CONFIG_STM32_DAC1=y +CONFIG_STM32_DAC1CH1=y +CONFIG_STM32_DAC1CH1_DMA=y CONFIG_STM32_DAC1CH1_DMA_BUFFER_SIZE=5 CONFIG_STM32_DAC1CH1_DMA_EXTERNAL=y -CONFIG_STM32_DAC1CH1_DMA=y -CONFIG_STM32_DAC1CH1=y -CONFIG_STM32_DAC1=y CONFIG_STM32_DMA1=y CONFIG_STM32_HRTIM1=y CONFIG_STM32_HRTIM_BURST=y @@ -108,18 +108,18 @@ CONFIG_STM32_HRTIM_DMA=y CONFIG_STM32_HRTIM_EEV2=y CONFIG_STM32_HRTIM_EVENTS=y CONFIG_STM32_HRTIM_PWM=y -CONFIG_STM32_HRTIM_TIMC_BURST_CH1=y -CONFIG_STM32_HRTIM_TIMC_BURST=y -CONFIG_STM32_HRTIM_TIMC_DMA=y -CONFIG_STM32_HRTIM_TIMC_PWM_CH1=y -CONFIG_STM32_HRTIM_TIMC_PWM=y CONFIG_STM32_HRTIM_TIMC=y +CONFIG_STM32_HRTIM_TIMC_BURST=y +CONFIG_STM32_HRTIM_TIMC_BURST_CH1=y +CONFIG_STM32_HRTIM_TIMC_DMA=y +CONFIG_STM32_HRTIM_TIMC_PWM=y +CONFIG_STM32_HRTIM_TIMC_PWM_CH1=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f334-disco/scripts/ld.script b/configs/stm32f334-disco/scripts/ld.script index 1720345916..b617acf71b 100644 --- a/configs/stm32f334-disco/scripts/ld.script +++ b/configs/stm32f334-disco/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt index 0c4956715a..672dc22e67 100644 --- a/configs/stm32f3discovery/README.txt +++ b/configs/stm32f3discovery/README.txt @@ -88,35 +88,29 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig index d2b15ce178..0833fa366d 100644 --- a/configs/stm32f3discovery/nsh/defconfig +++ b/configs/stm32f3discovery/nsh/defconfig @@ -1,23 +1,22 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f3discovery" +CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y diff --git a/configs/stm32f3discovery/scripts/ld.script b/configs/stm32f3discovery/scripts/ld.script index 29830c5ef9..b4e38e8845 100644 --- a/configs/stm32f3discovery/scripts/ld.script +++ b/configs/stm32f3discovery/scripts/ld.script @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig index 29420d912e..77b17f3360 100644 --- a/configs/stm32f3discovery/usbnsh/defconfig +++ b/configs/stm32f3discovery/usbnsh/defconfig @@ -1,26 +1,25 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f3discovery" +CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=6522 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig index 0701bd787b..21d2fc486b 100644 --- a/configs/stm32f411e-disco/nsh/defconfig +++ b/configs/stm32f411e-disco/nsh/defconfig @@ -2,19 +2,18 @@ # CONFIG_ARCH_LEDS is not set # CONFIG_DISABLE_OS_API is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_STM32_SYSCFG is not set -CONFIG_ARCH_BOARD_STM32F411E_DISCO=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f411e-disco" +CONFIG_ARCH_BOARD_STM32F411E_DISCO=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F411VE=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y diff --git a/configs/stm32f411e-disco/scripts/f411ve.ld b/configs/stm32f411e-disco/scripts/f411ve.ld index ea38ac3c27..0516ce3751 100644 --- a/configs/stm32f411e-disco/scripts/f411ve.ld +++ b/configs/stm32f411e-disco/scripts/f411ve.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f429i-disco/README.txt b/configs/stm32f429i-disco/README.txt index 43e67f5574..7af95073ad 100644 --- a/configs/stm32f429i-disco/README.txt +++ b/configs/stm32f429i-disco/README.txt @@ -256,35 +256,29 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig index e953e10a8b..f5fe74fec6 100644 --- a/configs/stm32f429i-disco/extflash/defconfig +++ b/configs/stm32f429i-disco/extflash/defconfig @@ -1,19 +1,19 @@ # CONFIG_ARCH_FPU is not set # CONFIG_STM32_FLASH_PREFETCH is not set -CONFIG_ARCH_BOARD_STM32F429I_DISCO=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" +CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -23,10 +23,10 @@ CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=3 -CONFIG_MTD_CONFIG_RAM_CONSOLIDATE=y CONFIG_MTD_CONFIG=y -CONFIG_MTD_PARTITION_NAMES=y +CONFIG_MTD_CONFIG_RAM_CONSOLIDATE=y CONFIG_MTD_PARTITION=y +CONFIG_MTD_PARTITION_NAMES=y CONFIG_MTD_SMART_SECTOR_SIZE=512 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 @@ -49,18 +49,18 @@ CONFIG_SMARTFS_MULTI_ROOT_DIRS=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 +CONFIG_STM32F429I_DISCO_FLASH=y +CONFIG_STM32F429I_DISCO_FLASH_PART=y +CONFIG_STM32F429I_DISCO_RAMMTD=y +CONFIG_STM32F429I_DISCO_RAMMTD_SIZE=256 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_RNG=y CONFIG_STM32_SPI5=y CONFIG_STM32_USART1=y -CONFIG_STM32F429I_DISCO_FLASH_PART=y -CONFIG_STM32F429I_DISCO_FLASH=y -CONFIG_STM32F429I_DISCO_RAMMTD_SIZE=256 -CONFIG_STM32F429I_DISCO_RAMMTD=y CONFIG_SYSTEM_FLASH_ERASEALL=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/configs/stm32f429i-disco/fb/defconfig b/configs/stm32f429i-disco/fb/defconfig index bc1f8aa1df..6502345de8 100644 --- a/configs/stm32f429i-disco/fb/defconfig +++ b/configs/stm32f429i-disco/fb/defconfig @@ -19,7 +19,6 @@ CONFIG_EXAMPLES_FBOVERLAY=y CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_TOUCHSCREEN=y -CONFIG_FB_OVERLAY=y CONFIG_FB_OVERLAY_BLIT=y CONFIG_FB_SYNC=y CONFIG_FS_PROCFS=y diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig index 645971ebbd..4d031e51c6 100644 --- a/configs/stm32f429i-disco/lcd/defconfig +++ b/configs/stm32f429i-disco/lcd/defconfig @@ -1,14 +1,14 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_STM32_FLASH_PREFETCH is not set -CONFIG_ARCH_BOARD_STM32F429I_DISCO=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" +CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -16,19 +16,19 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_CUSTOMOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y -CONFIG_EXAMPLES_NX_BPP=16 +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NX=y +CONFIG_EXAMPLES_NX_BPP=16 CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HEAP2_BASE=0xD0000000 CONFIG_HEAP2_SIZE=8388608 CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_ILI9341_IFACE0=y -CONFIG_LCD_ILI9341=y CONFIG_LCD=y +CONFIG_LCD_ILI9341=y +CONFIG_LCD_ILI9341_IFACE0=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=3 @@ -39,9 +39,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y +CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 @@ -54,15 +54,15 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 +CONFIG_STM32F429I_DISCO_ILI9341=y +CONFIG_STM32F429I_DISCO_ILI9341_SPIBITS16=y +CONFIG_STM32F429I_DISCO_ILI9341_SPIFREQUENCY=20000000 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y -CONFIG_STM32F429I_DISCO_ILI9341_SPIBITS16=y -CONFIG_STM32F429I_DISCO_ILI9341_SPIFREQUENCY=20000000 -CONFIG_STM32F429I_DISCO_ILI9341=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig index bd5a68a343..7f8538402b 100644 --- a/configs/stm32f429i-disco/nsh/defconfig +++ b/configs/stm32f429i-disco/nsh/defconfig @@ -1,20 +1,18 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set # CONFIG_STM32_FLASH_PREFETCH is not set -CONFIG_ARCH_BOARD_STM32F429I_DISCO=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" +CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -44,8 +42,8 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y diff --git a/configs/stm32f429i-disco/scripts/kernel-space.ld b/configs/stm32f429i-disco/scripts/kernel-space.ld index 343eb181e6..4ba0a37fa0 100644 --- a/configs/stm32f429i-disco/scripts/kernel-space.ld +++ b/configs/stm32f429i-disco/scripts/kernel-space.ld @@ -38,6 +38,7 @@ */ OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f429i-disco/scripts/ld.script b/configs/stm32f429i-disco/scripts/ld.script index f9fee5ee09..545afbe7b5 100644 --- a/configs/stm32f429i-disco/scripts/ld.script +++ b/configs/stm32f429i-disco/scripts/ld.script @@ -56,6 +56,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig index 7f6e1cd8e5..f180f3f4c6 100644 --- a/configs/stm32f429i-disco/usbmsc/defconfig +++ b/configs/stm32f429i-disco/usbmsc/defconfig @@ -1,20 +1,18 @@ # CONFIG_ARCH_FPU is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set # CONFIG_STM32_FLASH_PREFETCH is not set -CONFIG_ARCH_BOARD_STM32F429I_DISCO=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" +CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -48,15 +46,15 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_FSMC=y +CONFIG_STM32_FSMC_SRAM=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGHS=y CONFIG_STM32_PWR=y CONFIG_STM32_USART1=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USBHOST_MSC=y CONFIG_USBHOST=y +CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index afe71e61c9..eaf0364ee4 100644 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -309,35 +309,29 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an untested implementation that saves and restores FPU registers - only on context switches. This means: (1) floating point registers are - not stored on each context switch and, hence, possibly better interrupt + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not + stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y CFLAGS ------ diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig index 393eeef596..914d4975ad 100644 --- a/configs/stm32f4discovery/canard/defconfig +++ b/configs/stm32f4discovery/canard/defconfig @@ -1,24 +1,23 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_CAN_EXTID=y CONFIG_CAN1_BAUD=500000 CONFIG_CANUTILS_LIBCANARD=y +CONFIG_CAN_EXTID=y CONFIG_CLOCK_MONOTONIC=y CONFIG_EXAMPLES_LIBCANARD=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig index 3df39670bd..47a35cc25a 100644 --- a/configs/stm32f4discovery/cxxtest/defconfig +++ b/configs/stm32f4discovery/cxxtest/defconfig @@ -1,11 +1,11 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_C99_BOOL8=y @@ -30,8 +30,8 @@ CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_ONEXIT=y +CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=2 CONFIG_START_MONTH=11 diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig index ca9f058bd2..d64afa458f 100644 --- a/configs/stm32f4discovery/elf/defconfig +++ b/configs/stm32f4discovery/elf/defconfig @@ -1,10 +1,10 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BINFMT_CONSTRUCTORS=y @@ -12,8 +12,8 @@ CONFIG_BINFMT_EXEPATH=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y -CONFIG_ELF_STACKSIZE=4096 CONFIG_ELF=y +CONFIG_ELF_STACKSIZE=4096 CONFIG_EXAMPLES_ELF=y CONFIG_EXECFUNCS_SYMTAB="exports" CONFIG_FS_ROMFS=y @@ -41,6 +41,6 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USER_ENTRYPOINT="elf_main" CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_USER_ENTRYPOINT="elf_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig index 9d81a71f6e..fcdc3842b5 100644 --- a/configs/stm32f4discovery/ipv6/defconfig +++ b/configs/stm32f4discovery/ipv6/defconfig @@ -3,22 +3,21 @@ # CONFIG_MMCSD_SPI is not set # CONFIG_NET_IPv4 is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_LAN8720=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -29,24 +28,24 @@ CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y +CONFIG_NET=y CONFIG_NET_BROADCAST=y CONFIG_NET_ETH_MTU=590 CONFIG_NET_ETH_TCP_RECVWNDO=536 CONFIG_NET_HOSTNAME="STM32F4-Discovery" +CONFIG_NET_ICMPv6=y CONFIG_NET_ICMPv6_NEIGHBOR=y CONFIG_NET_ICMPv6_SOCKET=y -CONFIG_NET_ICMPv6=y CONFIG_NET_IPv6=y CONFIG_NET_SOCKOPTS=y CONFIG_NET_SOLINGER=y -CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_TCP=y CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y CONFIG_NET_UDP=y -CONFIG_NET=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -70,24 +69,24 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=13 CONFIG_START_MONTH=9 CONFIG_START_YEAR=2014 +CONFIG_STM32F4DISBB=y CONFIG_STM32_DMA2=y CONFIG_STM32_DMACAPABLE=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_SDIO=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART6=y -CONFIG_STM32F4DISBB=y CONFIG_SYSTEM_PING6=y CONFIG_USART6_RXBUFSIZE=64 CONFIG_USART6_SERIAL_CONSOLE=y diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig index e3f3203f90..f72adc4ca6 100644 --- a/configs/stm32f4discovery/kostest/defconfig +++ b/configs/stm32f4discovery/kostest/defconfig @@ -1,12 +1,12 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_ARM_MPU=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y +CONFIG_ARM_MPU=y CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILD_PROTECTED=y @@ -14,9 +14,9 @@ CONFIG_DEV_LOWCONSOLE=y CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y +CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 -CONFIG_EXAMPLES_OSTEST=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 diff --git a/configs/stm32f4discovery/max7219/defconfig b/configs/stm32f4discovery/max7219/defconfig index a71d233650..843ebf74b0 100644 --- a/configs/stm32f4discovery/max7219/defconfig +++ b/configs/stm32f4discovery/max7219/defconfig @@ -1,6 +1,8 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DISABLE_OS_API is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_BASENAME is not set # CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set @@ -20,44 +22,42 @@ # CONFIG_NSH_DISABLE_UNAME is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NX_DISABLE_1BPP is not set # CONFIG_NX_WRITEONLY is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEFAULT_SMALL=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NXHELLO=y CONFIG_EXAMPLES_NXHELLO_BPP=1 CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE=1536 CONFIG_EXAMPLES_NXHELLO_STACKSIZE=1536 -CONFIG_EXAMPLES_NXHELLO=y CONFIG_FS_PROCFS=y +CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y CONFIG_LCD_MAX7219=y CONFIG_LCD_NOGETRUN=y -CONFIG_LCD=y CONFIG_LIBC_LONG_LONG=y +CONFIG_MAX7219_NHORIZONTALBLKS=4 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_MAX7219_NHORIZONTALBLKS=4 CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_MXCLIENTMSGS=32 CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NXSTART_SERVERSTACK=1536 +CONFIG_NX_BLOCKING=y +CONFIG_NX_MXCLIENTMSGS=32 CONFIG_PREALLOC_MQ_MSGS=16 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=16 @@ -72,7 +72,6 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_SERIAL_TERMIOS=y CONFIG_START_DAY=21 CONFIG_START_MONTH=4 -CONFIG_START_YEAR=2018 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig index c9e4c765eb..a669d6f80a 100644 --- a/configs/stm32f4discovery/netnsh/defconfig +++ b/configs/stm32f4discovery/netnsh/defconfig @@ -2,23 +2,22 @@ # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_MMCSD_SPI is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_RESET=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_ETH0_PHY_LAN8720=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -29,21 +28,9 @@ CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y -CONFIG_NET_ARP_SEND=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_HOSTNAME="STM32F4-Discovery" -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_SOLINGER=y -CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y @@ -51,6 +38,18 @@ CONFIG_NETDEV_PHY_IOCTL=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ARP_SEND=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_HOSTNAME="STM32F4-Discovery" +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_SOLINGER=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y +CONFIG_NET_UDP=y +CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -74,24 +73,24 @@ CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=13 CONFIG_START_MONTH=9 CONFIG_START_YEAR=2014 +CONFIG_STM32F4DISBB=y CONFIG_STM32_DMA2=y CONFIG_STM32_DMACAPABLE=y CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PHYADDR=0 +CONFIG_STM32_PHYSR=31 CONFIG_STM32_PHYSR_100FD=0x0018 CONFIG_STM32_PHYSR_100HD=0x0008 CONFIG_STM32_PHYSR_10FD=0x0014 CONFIG_STM32_PHYSR_10HD=0x0004 CONFIG_STM32_PHYSR_ALTCONFIG=y CONFIG_STM32_PHYSR_ALTMODE=0x001c -CONFIG_STM32_PHYSR=31 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_SDIO=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART6=y -CONFIG_STM32F4DISBB=y CONFIG_SYSTEM_PING=y CONFIG_USART6_RXBUFSIZE=64 CONFIG_USART6_SERIAL_CONSOLE=y diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index 835c2f692e..96df6c971e 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -1,35 +1,35 @@ # CONFIG_ARCH_FPU is not set # CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS is not set -# CONFIG_NX_DISABLE_16BPP is not set -# CONFIG_NX_PACKEDMSFIRST is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +# CONFIG_NX_DISABLE_16BPP is not set +# CONFIG_NX_PACKEDMSFIRST is not set +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DISABLE_POLL=y +CONFIG_EXAMPLES_NXLINES=y CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320 CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0 -CONFIG_EXAMPLES_NXLINES=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LCD=y CONFIG_LCD_MAXCONTRAST=1 CONFIG_LCD_MAXPOWER=255 CONFIG_LCD_SSD1289=y -CONFIG_LCD=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 @@ -40,15 +40,15 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LIBRARY=y CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_MOUSE=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXTK_BORDERCOLOR1=0x5cb7 CONFIG_NXTK_BORDERCOLOR2=0x21c9 CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig index 5d6cb0ae49..a8f7e55d64 100644 --- a/configs/stm32f4discovery/pm/defconfig +++ b/configs/stm32f4discovery/pm/defconfig @@ -1,7 +1,8 @@ # CONFIG_ARCH_FPU is not set # CONFIG_ARCH_LEDS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y @@ -9,13 +10,12 @@ CONFIG_ARCH_CUSTOM_PMINIT=y CONFIG_ARCH_IDLE_CUSTOM=y CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -30,8 +30,8 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PM_BUTTONS=y CONFIG_PM=y +CONFIG_PM_BUTTONS=y CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=4 CONFIG_PREALLOC_WDOGS=4 @@ -39,9 +39,9 @@ CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_RTC=y CONFIG_RTC_ALARM=y CONFIG_RTC_DATETIME=y -CONFIG_RTC=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKSTACKSIZE=1024 diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig index bf0a3626e5..d59fbd0d45 100644 --- a/configs/stm32f4discovery/posix_spawn/defconfig +++ b/configs/stm32f4discovery/posix_spawn/defconfig @@ -1,15 +1,15 @@ # CONFIG_ARCH_FPU is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BINFMT_CONSTRUCTORS=y CONFIG_BINFMT_EXEPATH=y -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_APP_SYMTAB=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DEV_LOWCONSOLE=y CONFIG_ELF=y CONFIG_EXAMPLES_POSIXSPAWN=y @@ -19,8 +19,8 @@ CONFIG_FS_ROMFS=y CONFIG_HAVE_CXX=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_REGIONS=2 diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig index 6684e3496b..eb32837ad0 100644 --- a/configs/stm32f4discovery/rgbled/defconfig +++ b/configs/stm32f4discovery/rgbled/defconfig @@ -1,21 +1,20 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_RGBLED=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y @@ -48,14 +47,14 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_TIM1=y +CONFIG_STM32_TIM1_PWM=y +CONFIG_STM32_TIM2=y CONFIG_STM32_TIM2_CHANNEL=2 CONFIG_STM32_TIM2_PWM=y -CONFIG_STM32_TIM2=y +CONFIG_STM32_TIM3=y CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y -CONFIG_STM32_TIM3=y CONFIG_STM32_USART2=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/configs/stm32f4discovery/testlibcxx/defconfig b/configs/stm32f4discovery/testlibcxx/defconfig index fe7e94e583..604583fc7d 100644 --- a/configs/stm32f4discovery/testlibcxx/defconfig +++ b/configs/stm32f4discovery/testlibcxx/defconfig @@ -1,10 +1,10 @@ +# CONFIG_ARCH_FPU is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y -CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_CHIP_STM32=y +CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_FLOAT_H=y -# CONFIG_ARCH_FPU is not set CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_BOARD_LOOPSPERMSEC=16717 @@ -13,17 +13,17 @@ CONFIG_C99_BOOL8=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_POLL=y CONFIG_EXAMPLES_HELLOXX=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y -CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y +CONFIG_LIBCXX=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_LOCALE=y CONFIG_LIBC_LOCALTIME=y CONFIG_LIBC_WCHAR=y -CONFIG_LIBCXX=y CONFIG_LIBM=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -39,8 +39,8 @@ CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_ONEXIT=y +CONFIG_SCHED_ONEXIT_MAX=4 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=2 diff --git a/configs/stm32f4discovery/usbmsc/defconfig b/configs/stm32f4discovery/usbmsc/defconfig index f3b992915c..336b985654 100644 --- a/configs/stm32f4discovery/usbmsc/defconfig +++ b/configs/stm32f4discovery/usbmsc/defconfig @@ -1,23 +1,23 @@ +# CONFIG_ARCH_FPU is not set CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_CHIP_STM32=y -# CONFIG_ARCH_FPU is not set +CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 @@ -38,8 +38,8 @@ CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=27 @@ -51,12 +51,12 @@ CONFIG_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" -CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0" CONFIG_SYSTEM_USBMSC=y +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0" CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBDEV=y -CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC=y +CONFIG_USBMSC_REMOVABLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=1 diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig index b7e410aa33..dbff9c3875 100644 --- a/configs/stm32f4discovery/usbnsh/defconfig +++ b/configs/stm32f4discovery/usbnsh/defconfig @@ -1,23 +1,23 @@ # CONFIG_ARCH_FPU is not set # CONFIG_DEV_CONSOLE is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y -CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARDCTL_USBDEVCTRL=y +CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y +CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_TXBUFSIZE=256 -CONFIG_CDCACM=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/configs/stm32f4discovery/xen1210/defconfig b/configs/stm32f4discovery/xen1210/defconfig index e750761a26..b2a7a2d228 100644 --- a/configs/stm32f4discovery/xen1210/defconfig +++ b/configs/stm32f4discovery/xen1210/defconfig @@ -1,21 +1,20 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DISABLE_POLL=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y @@ -41,17 +40,17 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_SENSORS=y +CONFIG_SENSORS_XEN1210=y CONFIG_START_DAY=17 CONFIG_START_MONTH=8 CONFIG_START_YEAR=2016 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_TIM1=y +CONFIG_STM32_TIM1_PWM=y CONFIG_STM32_USART2=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_SENSORS_XEN1210=y diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt index e0b4589cb5..377f779b85 100644 --- a/configs/stm32f746g-disco/README.txt +++ b/configs/stm32f746g-disco/README.txt @@ -146,10 +146,20 @@ FPU Configuration Options There are two version of the FPU support built into the STM32 port. -1. Lazy Floating Point Register Save. +1. Non-Lazy Floating Point Register Save - This is an implementation that saves and restores FPU registers only on - context switches. This means: (1) floating point registers are not + In this configuration floating point register save and restore is + implemented on interrupt entry and return, respectively. In this + case, you may use floating point operations for interrupt handling + logic if necessary. This FPU behavior logic is enabled by default + with: + + CONFIG_ARCH_FPU=y + +2. Lazy Floating Point Register Save. + + An alternative mplementation only saves and restores FPU registers only + on context switches. This means: (1) floating point registers are not stored on each context switch and, hence, possibly better interrupt performance. But, (2) since floating point registers are not saved, you cannot use floating point operations within interrupt handlers. @@ -157,26 +167,8 @@ There are two version of the FPU support built into the STM32 port. This logic can be enabled by simply adding the following to your .config file: - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - CONFIG_ARMV7M_LAZYFPU=y - -2. Non-Lazy Floating Point Register Save - - Mike Smith has contributed an extensive re-write of the ARMv7-M exception - handling logic. This includes verified support for the FPU. These changes - have not yet been incorporated into the mainline and are still considered - experimental. These FPU logic can be enabled with: - - CONFIG_ARCH_FPU=y - CONFIG_ARMV7M_CMNVECTOR=y - - You will probably also changes to the ld.script in if this option is selected. - This should work: - - -ENTRY(_stext) - +ENTRY(__start) /* Treat __start as the anchor for dead code stripping */ - +EXTERN(_vectors) /* Force the vectors to be included in the output */ + CONFIG_ARCH_FPU=y + CONFIG_ARMV7M_LAZYFPU=y STM32F746G-DISCO-specific Configuration Options =============================================== diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig index d313e89397..51482cf46d 100644 --- a/configs/stm32ldiscovery/nsh/defconfig +++ b/configs/stm32ldiscovery/nsh/defconfig @@ -1,15 +1,15 @@ +# CONFIG_NSH_DISABLEBG is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_HEXDUMP is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -CONFIG_ARCH_BOARD_STM32L_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32ldiscovery" +CONFIG_ARCH_BOARD_STM32L_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32L152RB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BINFMT_DISABLE=y CONFIG_BOARD_LOOPSPERMSEC=2796 @@ -57,6 +57,6 @@ CONFIG_USART1_BAUD=57600 CONFIG_USART1_RXBUFSIZE=64 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=64 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1536 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/configs/stm32ldiscovery/scripts/stm32l152rb.ld b/configs/stm32ldiscovery/scripts/stm32l152rb.ld index 2dcfec5210..0dc71989cf 100644 --- a/configs/stm32ldiscovery/scripts/stm32l152rb.ld +++ b/configs/stm32ldiscovery/scripts/stm32l152rb.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32ldiscovery/scripts/stm32l152rc.ld b/configs/stm32ldiscovery/scripts/stm32l152rc.ld index cd32d17434..935e12bb1b 100644 --- a/configs/stm32ldiscovery/scripts/stm32l152rc.ld +++ b/configs/stm32ldiscovery/scripts/stm32l152rc.ld @@ -48,6 +48,7 @@ MEMORY } OUTPUT_ARCH(arm) +EXTERN(_vectors) ENTRY(_stext) SECTIONS { diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig index 8dcea55d6a..9b1a106603 100644 --- a/configs/stm32vldiscovery/nsh/defconfig +++ b/configs/stm32vldiscovery/nsh/defconfig @@ -1,26 +1,24 @@ # CONFIG_DISABLE_ENVIRON is not set # CONFIG_DISABLE_POSIX_TIMERS is not set +# CONFIG_NSH_DISABLEBG is not set +# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_DD is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set # CONFIG_NSH_DISABLE_GET is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_LOSETUP is not set -# CONFIG_NSH_DISABLE_MKFATFS is not set # CONFIG_NSH_DISABLE_MKRD is not set # CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -CONFIG_ARCH_BOARD_STM32VL_DISCOVERY=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32vldiscovery" +CONFIG_ARCH_BOARD_STM32VL_DISCOVERY=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F100RB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_ARMV7M_CMNVECTOR=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=2398 CONFIG_BUILTIN=y diff --git a/configs/viewtool-stm32f107/ft80x/defconfig b/configs/viewtool-stm32f107/ft80x/defconfig index 1e38801f02..b861d541c9 100644 --- a/configs/viewtool-stm32f107/ft80x/defconfig +++ b/configs/viewtool-stm32f107/ft80x/defconfig @@ -1,11 +1,11 @@ # CONFIG_NSH_CMDOPT_HEXDUMP is not set -CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" +CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y CONFIG_EXAMPLES_FT80X=y @@ -13,9 +13,9 @@ CONFIG_EXAMPLES_NSH=y CONFIG_FS_PROCFS=y CONFIG_HOST_WINDOWS=y CONFIG_INTELHEX_BINARY=y -CONFIG_LCD_FT80X_AUDIO_GPIOSHUTDOWN=y -CONFIG_LCD_FT80X=y CONFIG_LCD=y +CONFIG_LCD_FT80X=y +CONFIG_LCD_FT80X_AUDIO_GPIOSHUTDOWN=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig index 048989b2df..82a19ac6ae 100644 --- a/configs/viewtool-stm32f107/highpri/defconfig +++ b/configs/viewtool-stm32f107/highpri/defconfig @@ -1,13 +1,12 @@ -CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" +CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_HIPRI_INTERRUPT=y CONFIG_ARCH_RAMVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" -CONFIG_ARMV7M_CMNVECTOR=y CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_HOST_WINDOWS=y diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig index 72a2921d02..2752311c24 100644 --- a/configs/viewtool-stm32f107/netnsh/defconfig +++ b/configs/viewtool-stm32f107/netnsh/defconfig @@ -1,12 +1,12 @@ # CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" +CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y @@ -18,24 +18,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 -CONFIG_NET_ARP_SEND=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_MTU=650 -CONFIG_NET_ETH_TCP_RECVWNDO=624 -CONFIG_NET_HOSTNAME="Viewtool-STM32F107" -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_ICMPv6_NEIGHBOR=y -CONFIG_NET_ICMPv6_SOCKET=y -CONFIG_NET_ICMPv6=y -CONFIG_NET_IPv6=y -CONFIG_NET_MAX_LISTENPORTS=40 -CONFIG_NET_ROUTE=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_TCP_CONNS=40 -CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y @@ -43,6 +25,24 @@ CONFIG_NETUTILS_DHCPC=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ARP_SEND=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ETH_MTU=650 +CONFIG_NET_ETH_TCP_RECVWNDO=624 +CONFIG_NET_HOSTNAME="Viewtool-STM32F107" +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_ICMPv6=y +CONFIG_NET_ICMPv6_NEIGHBOR=y +CONFIG_NET_ICMPv6_SOCKET=y +CONFIG_NET_IPv6=y +CONFIG_NET_MAX_LISTENPORTS=40 +CONFIG_NET_ROUTE=y +CONFIG_NET_SOCKOPTS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCP_CONNS=40 +CONFIG_NET_TCP_WRITE_BUFFERS=y +CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -62,20 +62,18 @@ CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKSTACKSIZE=1024 CONFIG_SDCLONE_DISABLE=y CONFIG_START_DAY=23 -CONFIG_START_MONTH=1 -CONFIG_START_YEAR=2018 CONFIG_STM32_ETHMAC=y CONFIG_STM32_JTAG_FULL_ENABLE=y +CONFIG_STM32_PHYSR=16 CONFIG_STM32_PHYSR_100MBPS=0x0000 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004 CONFIG_STM32_PHYSR_MODE=0x0004 CONFIG_STM32_PHYSR_SPEED=0x0002 -CONFIG_STM32_PHYSR=16 CONFIG_STM32_PWR=y CONFIG_STM32_RMII_EXTCLK=y CONFIG_STM32_USART1=y -CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_PING6=y +CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig index c0b4eb7dd3..29bd696974 100644 --- a/configs/viewtool-stm32f107/nsh/defconfig +++ b/configs/viewtool-stm32f107/nsh/defconfig @@ -1,14 +1,11 @@ -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" +CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARD_LOOPSPERMSEC=5483 CONFIG_BUILTIN=y