From 78b440f4520f4fc7f6d4e5bdda2a157382e7096b Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 28 Jun 2012 00:48:00 +0000 Subject: ST3210E-EVAL: Add power management configuration; move all linker scripts to common files git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4879 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/stm32/Make.defs | 3 +-- nuttx/arch/arm/src/stm32/stm32_bkp.h | 8 ++++++-- nuttx/arch/arm/src/stm32/stm32_pwr.c | 4 ++++ nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c | 3 ++- nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) (limited to 'nuttx/arch/arm/src/stm32') diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index cae6bfc57..cff2546ee 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -85,11 +85,10 @@ CHIP_CSRCS += stm32_idle.c endif CHIP_CSRCS += stm32_pmstop.c stm32_pmstandby.c -ifeq ($(CONFIG_PM),y) + ifneq ($(CONFIG_PM_CUSTOMINIT),y) CHIP_CSRCS += stm32_pminitialize.c endif -endif ifeq ($(CONFIG_STM32_ETHMAC),y) CHIP_CSRCS += stm32_eth.c diff --git a/nuttx/arch/arm/src/stm32/stm32_bkp.h b/nuttx/arch/arm/src/stm32/stm32_bkp.h index 8436dbf62..21399c38b 100644 --- a/nuttx/arch/arm/src/stm32/stm32_bkp.h +++ b/nuttx/arch/arm/src/stm32/stm32_bkp.h @@ -1,8 +1,8 @@ /************************************************************************************ * arch/arm/src/stm32/stm32_bkp.h * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2009, 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 @@ -45,4 +45,8 @@ #include "chip.h" #include "chip/stm32_bkp.h" +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + #endif /* __ARCH_ARM_SRC_STM32_STM32_BKP_H */ diff --git a/nuttx/arch/arm/src/stm32/stm32_pwr.c b/nuttx/arch/arm/src/stm32/stm32_pwr.c index 6a4e62d66..bada048e3 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pwr.c +++ b/nuttx/arch/arm/src/stm32/stm32_pwr.c @@ -48,6 +48,10 @@ #if defined(CONFIG_STM32_PWR) +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + /************************************************************************************ * Private Functions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c b/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c index 0b01ecd69..03be0ee3f 100644 --- a/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c +++ b/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c @@ -6,7 +6,7 @@ * * With extensions, modifications by: * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregroy Nutt * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,7 @@ #include #include #include +#include #include "up_arch.h" diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c index c19521695..f92d46b16 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c +++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c @@ -631,7 +631,7 @@ int up_rtcinitialize(void) #endif g_rtc_enabled = true; - rtc_dumpregs("After Initialzation"); + rtc_dumpregs("After Initialization"); return OK; } -- cgit v1.2.3