aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-08-05 12:40:57 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-08-05 12:40:57 +0000
commitb736858c5bbed206d2f40dcdf8052646b096db86 (patch)
tree48583241d1933a60645ca5aaaf6e775d5db43058
parent0775f8a0dfbaef3516555e02fbca2c0d8379c06e (diff)
downloadChibiOS-b736858c5bbed206d2f40dcdf8052646b096db86.tar.gz
ChibiOS-b736858c5bbed206d2f40dcdf8052646b096db86.tar.bz2
ChibiOS-b736858c5bbed206d2f40dcdf8052646b096db86.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4534 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--boards/ST_STM32L_DISCOVERY/board.c8
-rw-r--r--boards/ST_STM32L_DISCOVERY/board.h7
-rw-r--r--boards/ST_STM32L_DISCOVERY/cfg/board.chxml6
-rw-r--r--tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.c.ftl2
-rw-r--r--tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32l1xx/templates/board.c.ftl8
-rw-r--r--tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.3.jarbin1852693 -> 1852636 bytes
6 files changed, 10 insertions, 21 deletions
diff --git a/boards/ST_STM32L_DISCOVERY/board.c b/boards/ST_STM32L_DISCOVERY/board.c
index b8f1272f9..2148fa754 100644
--- a/boards/ST_STM32L_DISCOVERY/board.c
+++ b/boards/ST_STM32L_DISCOVERY/board.c
@@ -39,14 +39,8 @@ const PALConfig pal_default_config =
VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH},
{VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH},
- {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
- VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH},
- {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
- VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH},
{VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
- VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH},
- {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
- VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH}
+ VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH}
};
#endif
diff --git a/boards/ST_STM32L_DISCOVERY/board.h b/boards/ST_STM32L_DISCOVERY/board.h
index 6a648deb1..7ff3022dd 100644
--- a/boards/ST_STM32L_DISCOVERY/board.h
+++ b/boards/ST_STM32L_DISCOVERY/board.h
@@ -34,16 +34,17 @@
/*
* Board oscillators-related settings.
- * NOTE: LSE not fitted.
+ * NOTE: HSE not fitted.
*/
#if !defined(STM32_LSECLK)
-#define STM32_LSECLK 0
+#define STM32_LSECLK 32768
#endif
#if !defined(STM32_HSECLK)
-#define STM32_HSECLK 8000000
+#define STM32_HSECLK 0
#endif
+#define STM32_HSE_BYPASS
/*
* MCU type as defined in the ST header file stm32l1xx.h.
diff --git a/boards/ST_STM32L_DISCOVERY/cfg/board.chxml b/boards/ST_STM32L_DISCOVERY/cfg/board.chxml
index 3117b23be..b9f27b8b9 100644
--- a/boards/ST_STM32L_DISCOVERY/cfg/board.chxml
+++ b/boards/ST_STM32L_DISCOVERY/cfg/board.chxml
@@ -7,9 +7,9 @@
<board_id>ST_STM32L_DISCOVERY</board_id>
<board_functions></board_functions>
<clocks
- HSEFrequency="8000000"
- HSEBypass="false"
- LSEFrequency="0" />
+ HSEFrequency="0"
+ HSEBypass="true"
+ LSEFrequency="32768" />
<ports>
<GPIOA>
<pin0
diff --git a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.c.ftl b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.c.ftl
index 4cb9adaab..22510cb2b 100644
--- a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.c.ftl
+++ b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.c.ftl
@@ -46,7 +46,7 @@ const PALConfig pal_default_config =
{VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH},
{VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
- VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH},
+ VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH}
};
#endif
diff --git a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32l1xx/templates/board.c.ftl b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32l1xx/templates/board.c.ftl
index f38fd106a..b46be86a2 100644
--- a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32l1xx/templates/board.c.ftl
+++ b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32l1xx/templates/board.c.ftl
@@ -47,14 +47,8 @@ const PALConfig pal_default_config =
VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH},
{VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH},
- {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
- VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH},
- {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
- VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH},
{VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
- VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH},
- {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
- VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH}
+ VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH}
};
#endif
diff --git a/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.3.jar b/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.3.jar
index 76a03b3c3..966ffbc5d 100644
--- a/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.3.jar
+++ b/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.3.jar
Binary files differ