summaryrefslogtreecommitdiffstats
path: root/nuttx/arch/arm/src/stm32
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-06-28 00:48:00 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-06-28 00:48:00 +0000
commit0d1b2d23a46cbe6a21a7eded31183d2c015f46ce (patch)
treefbe49ae4214b4d3c13d01a00e6d95b281da19b2b /nuttx/arch/arm/src/stm32
parent0c12af00bb3b6d1727c0cd1e0e49e17b5da7c093 (diff)
ST3210E-EVAL: Add power management configuration; move all linker scripts to common files
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4879 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/stm32')
-rw-r--r--nuttx/arch/arm/src/stm32/Make.defs3
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_bkp.h8
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_pwr.c4
-rw-r--r--nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c3
-rw-r--r--nuttx/arch/arm/src/stm32/stm32f40xxx_rtc.c2
5 files changed, 14 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index cae6bfc577..cff2546ee2 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 8436dbf62b..21399c38bd 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 <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -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 6a4e62d662..bada048e3e 100644
--- a/nuttx/arch/arm/src/stm32/stm32_pwr.c
+++ b/nuttx/arch/arm/src/stm32/stm32_pwr.c
@@ -49,6 +49,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 0b01ecd690..03be0ee3f0 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 <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdio.h>
+#include <errno.h>
#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 c19521695d..f92d46b166 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;
}