From 09fb996c70a45405a09f93afe194523bb732e625 Mon Sep 17 00:00:00 2001
From: Siddharth Chandrasekaran <siddharth@embedjournal.com>
Date: Sun, 21 May 2017 18:13:59 +0530
Subject: [PATCH] arm: stm32f1: Add support for STM32F103x8 SoC

Add configuration and memory definitions to support STM32F103x8
Medium-density performance line SoC with 64 KB Flash.

Merge multiple files into single Kconfig.defconfig.stm32f103xx

Signed-off-by: Siddharth Chandrasekaran <siddharth@embedjournal.com>
---
 .../stm32f1/Kconfig.defconfig.stm32f103xb     | 19 ------------
 .../stm32f1/Kconfig.defconfig.stm32f103xe     | 19 ------------
 .../stm32f1/Kconfig.defconfig.stm32f103xx     | 31 +++++++++++++++++++
 arch/arm/soc/st_stm32/stm32f1/Kconfig.soc     |  4 +++
 dts/arm/st/mem.h                              |  5 ++-
 5 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb
 delete mode 100644 arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe
 create mode 100644 arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx

diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb
deleted file mode 100644
index f7c1da75182..00000000000
--- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Kconfig - ST Microelectronics STM32F103RB MCU
-#
-# Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if SOC_STM32F103XB
-
-config SOC
-	string
-	default stm32f103xb
-
-config NUM_IRQS
-	int
-	default 59
-
-endif # SOC_STM32F103XB
-
diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe
deleted file mode 100644
index a87b3d21f4e..00000000000
--- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe
+++ /dev/null
@@ -1,19 +0,0 @@
-# Kconfig - ST Microelectronics STM32F103VE MCU
-#
-# Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if SOC_STM32F103XE
-
-config SOC
-	string
-	default stm32f103xe
-
-config NUM_IRQS
-	int
-	default 68
-
-endif # SOC_STM32F103XE
-
diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
new file mode 100644
index 00000000000..64c33cabf78
--- /dev/null
+++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
@@ -0,0 +1,31 @@
+# Kconfig - ST Microelectronics STM32F103RB MCU
+#
+# Copyright (c) 2017, embedjournal.com
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if SOC_STM32F103XB || SOC_STM32F103X8
+
+config SOC
+	string
+	default stm32f103xb
+
+config NUM_IRQS
+	int
+	default 59
+
+endif # SOC_STM32F103XB || SOC_STM32F103X8
+
+if SOC_STM32F103XE
+
+config SOC
+	string
+	default stm32f103xe
+
+config NUM_IRQS
+	int
+	default 68
+
+endif # SOC_STM32F103XE
+
diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc b/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc
index d1648357ac3..72b6b133a2e 100644
--- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc
+++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc
@@ -18,6 +18,10 @@ config SOC_STM32F103XB
 	bool "STM32F103XB"
 	select SOC_STM32F10X_DENSITY_DEVICE
 
+config SOC_STM32F103X8
+	bool "STM32F103X8"
+	select SOC_STM32F10X_DENSITY_DEVICE
+
 config SOC_STM32F107XC
 	bool "STM32F107XC"
 	select SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE
diff --git a/dts/arm/st/mem.h b/dts/arm/st/mem.h
index ccc2ce8aee3..69baf71587a 100644
--- a/dts/arm/st/mem.h
+++ b/dts/arm/st/mem.h
@@ -8,7 +8,10 @@
 
 #define __SIZE_K(x) (x * 1024)
 
-#if defined(CONFIG_SOC_STM32F103XB)
+#if defined(CONFIG_SOC_STM32F103X8)
+#define DT_FLASH_SIZE		__SIZE_K(64)
+#define DT_SRAM_SIZE		__SIZE_K(20)
+#elif defined(CONFIG_SOC_STM32F103XB)
 #define DT_FLASH_SIZE		__SIZE_K(128)
 #define DT_SRAM_SIZE		__SIZE_K(20)
 #elif defined(CONFIG_SOC_STM32F103XE)