From 08d41ecff52b558852121956c80ce7fa9509edab Mon Sep 17 00:00:00 2001
From: Erwan Gouriou <erwan.gouriou@linaro.org>
Date: Fri, 22 Mar 2019 14:14:02 +0100
Subject: [PATCH] dts: stm32f412Xg: Factorize package definitions

2 identical packages were defined for stm32f412 SoC, invariant "g".
Merge them in new sinclge stm32f412Xg.dtsi.
Update matching boards accordinlgy.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
---
 boards/arm/96b_argonkey/96b_argonkey.dts      |  2 +-
 boards/arm/nucleo_f412zg/nucleo_f412zg.dts    |  2 +-
 .../arm/stm32f412g_disco/stm32f412g_disco.dts |  2 +-
 .../f4/{stm32f412cg.dtsi => stm32f412Xg.dtsi} |  0
 dts/arm/st/f4/stm32f412zg.dtsi                | 22 -------------------
 5 files changed, 3 insertions(+), 25 deletions(-)
 rename dts/arm/st/f4/{stm32f412cg.dtsi => stm32f412Xg.dtsi} (100%)
 delete mode 100644 dts/arm/st/f4/stm32f412zg.dtsi

diff --git a/boards/arm/96b_argonkey/96b_argonkey.dts b/boards/arm/96b_argonkey/96b_argonkey.dts
index f9316f56b9d..9c9e45adb49 100644
--- a/boards/arm/96b_argonkey/96b_argonkey.dts
+++ b/boards/arm/96b_argonkey/96b_argonkey.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <st/f4/stm32f412cg.dtsi>
+#include <st/f4/stm32f412Xg.dtsi>
 
 / {
 	model = "Tocoding Argonkey 96boards";
diff --git a/boards/arm/nucleo_f412zg/nucleo_f412zg.dts b/boards/arm/nucleo_f412zg/nucleo_f412zg.dts
index 9c605b6c471..83a6635c323 100644
--- a/boards/arm/nucleo_f412zg/nucleo_f412zg.dts
+++ b/boards/arm/nucleo_f412zg/nucleo_f412zg.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <st/f4/stm32f412zg.dtsi>
+#include <st/f4/stm32f412Xg.dtsi>
 
 / {
 	model = "STMicroelectronics STM32F412ZG-NUCLEO board";
diff --git a/boards/arm/stm32f412g_disco/stm32f412g_disco.dts b/boards/arm/stm32f412g_disco/stm32f412g_disco.dts
index 1e5c1ac360c..9f4e8cfd7c5 100644
--- a/boards/arm/stm32f412g_disco/stm32f412g_disco.dts
+++ b/boards/arm/stm32f412g_disco/stm32f412g_disco.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <st/f4/stm32f412zg.dtsi>
+#include <st/f4/stm32f412Xg.dtsi>
 
 / {
 	model = "STMicroelectronics STM32F412G-DISCO board";
diff --git a/dts/arm/st/f4/stm32f412cg.dtsi b/dts/arm/st/f4/stm32f412Xg.dtsi
similarity index 100%
rename from dts/arm/st/f4/stm32f412cg.dtsi
rename to dts/arm/st/f4/stm32f412Xg.dtsi
diff --git a/dts/arm/st/f4/stm32f412zg.dtsi b/dts/arm/st/f4/stm32f412zg.dtsi
deleted file mode 100644
index a6958857dbc..00000000000
--- a/dts/arm/st/f4/stm32f412zg.dtsi
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2018 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <mem.h>
-#include <st/f4/stm32f412.dtsi>
-
-/ {
-	sram0: memory@20000000 {
-		reg = <0x20000000 DT_SIZE_K(256)>;
-	};
-
-	soc {
-		flash-controller@40023c00 {
-			flash0: flash@8000000 {
-				reg = <0x08000000 DT_SIZE_K(1024)>;
-			};
-		};
-	};
-};