From 3ba8234cecde90467fb75d72055fa0c226ed16df Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 13 Jul 2015 16:45:32 +0900
Subject: sys_board and stm32 primer2

---
 board/board-cq-starm.h          |  3 +++
 board/board-fst-01-00.h         |  3 +++
 board/board-fst-01.h            |  3 +++
 board/board-maple-mini.h        |  3 +++
 board/board-olimex-stm32-h103.h |  3 +++
 board/board-stbee-mini.h        |  3 +++
 board/board-stbee.h             |  2 ++
 board/board-stm32-primer2.h     | 13 ++++++++++---
 board/board-stm8s-discovery.h   |  3 +++
 9 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'board')

diff --git a/board/board-cq-starm.h b/board/board-cq-starm.h
index 980791f..54c53ff 100644
--- a/board/board-cq-starm.h
+++ b/board/board-cq-starm.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "CQ STARM"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              9
diff --git a/board/board-fst-01-00.h b/board/board-fst-01-00.h
index 5af9f56..30a9311 100644
--- a/board/board-fst-01-00.h
+++ b/board/board-fst-01-00.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "FST-01-00"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              9
diff --git a/board/board-fst-01.h b/board/board-fst-01.h
index efd4761..aecb9db 100644
--- a/board/board-fst-01.h
+++ b/board/board-fst-01.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "FST-01"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              6
diff --git a/board/board-maple-mini.h b/board/board-maple-mini.h
index 5e17118..5e19dee 100644
--- a/board/board-maple-mini.h
+++ b/board/board-maple-mini.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "Maple Mini"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              9
diff --git a/board/board-olimex-stm32-h103.h b/board/board-olimex-stm32-h103.h
index 4ad6bfc..26c3dd3 100644
--- a/board/board-olimex-stm32-h103.h
+++ b/board/board-olimex-stm32-h103.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "Olimex STM32-H103"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              9
diff --git a/board/board-stbee-mini.h b/board/board-stbee-mini.h
index 29afd6a..51aee57 100644
--- a/board/board-stbee-mini.h
+++ b/board/board-stbee-mini.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "STBee Mini"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              6
diff --git a/board/board-stbee.h b/board/board-stbee.h
index 8104b5c..c7835a0 100644
--- a/board/board-stbee.h
+++ b/board/board-stbee.h
@@ -1,3 +1,5 @@
+#define BOARD_NAME "STBee"
+
 #define FLASH_PAGE_SIZE 2048
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
diff --git a/board/board-stm32-primer2.h b/board/board-stm32-primer2.h
index 9f6cc67..2d56f90 100644
--- a/board/board-stm32-primer2.h
+++ b/board/board-stm32-primer2.h
@@ -1,3 +1,5 @@
+#define BOARD_NAME "STM32 Primer2"
+
 #define FLASH_PAGE_SIZE 2048
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
@@ -5,7 +7,7 @@
 #define STM32_HSECLK                    12000000
 
 #define GPIO_LED_BASE   GPIOE_BASE
-#define GPIO_LED_CLEAR_TO_EMIT          0
+#define GPIO_LED_SET_TO_EMIT            0
 #define GPIO_USB_BASE   GPIOD_BASE
 #define GPIO_USB_CLEAR_TO_ENABLE        3
 #define GPIO_OTHER_BASE GPIOA_BASE
@@ -14,12 +16,13 @@
  * Port A setup.
  * PA0  - input with pull-up.  AN0
  * PA1  - input with pull-up.  AN1
+ * PA8  - Input with pull-down (PBUTTON).
  * PA11 - Push Pull output 10MHz 0 default (until USB enabled) (USBDM) 
  * PA12 - Push Pull output 10MHz 0 default (until USB enabled) (USBDP)
  * ------------------------ Default
  * PAx  - input with pull-up
  */
-#define VAL_GPIO_OTHER_ODR            0xFFFFE7FF
+#define VAL_GPIO_OTHER_ODR            0xFFFFE6FF
 #define VAL_GPIO_OTHER_CRL            0x88888888      /*  PA7...PA0 */
 #define VAL_GPIO_OTHER_CRH            0x88811888      /* PA15...PA8 */
 
@@ -37,10 +40,14 @@
  * Port E setup.
  * PE0  - Push pull output   (LED 1:ON 0:OFF)
  * PE1  - Push pull output   (LED 1:ON 0:OFF)
+ * PE3  - Input with pull-down (JOYSTICK L).
+ * PE4  - Input with pull-down (JOYSTICK R).
+ * PE5  - Input with pull-down (JOYSTICK U).
+ * PE6  - Input with pull-down (JOYSTICK D).
  * ------------------------ Default
  * PEx  - input with pull-up
  */
-#define VAL_GPIO_LED_ODR            0xFFFFFFFF
+#define VAL_GPIO_LED_ODR            0xFFFFFF87
 #define VAL_GPIO_LED_CRL            0x88888833      /*  PE7...PE0 */
 #define VAL_GPIO_LED_CRH            0x88888888      /* PE15...PE8 */
 
diff --git a/board/board-stm8s-discovery.h b/board/board-stm8s-discovery.h
index 79d1889..08942ef 100644
--- a/board/board-stm8s-discovery.h
+++ b/board/board-stm8s-discovery.h
@@ -1,4 +1,7 @@
+#define BOARD_NAME "STM8S Discovery"
+
 #define FLASH_PAGE_SIZE 1024
+#define STM32F10X_MD		/* Medium-density device */
 
 #define STM32_PLLXTPRE                  STM32_PLLXTPRE_DIV1
 #define STM32_PLLMUL_VALUE              9
-- 
cgit v1.2.3