michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: arm: st: Remove use of CONFIG_SOC_* from STM32 F4 dts files

Browse source 
To move forward and remove use of Kconfig in dts files lets just create
SoC specific dtsi files that the boards can include.  We also seperate
out the F4 dtsi files into their own dir.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2018-09-27 08:23:16 -05:00 • committed by Kumar Gala
commit 52646287fd
45 changed files with 326 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/96b_argonkey/96b_argonkey.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f412.dtsi>
#include <st/f4/stm32f412cg.dtsi>
/ {
model = "Tocoding Argonkey 96boards";

2
boards/arm/96b_carbon/96b_carbon.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f401.dtsi>
#include <st/f4/stm32f401Xe.dtsi>
/ {
model = "Seeed Studio Carbon 96boards";

2
boards/arm/96b_neonkey/96b_neonkey.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f411.dtsi>
#include <st/f4/stm32f411Xe.dtsi>
/ {
model = "Tocoding Neonkey 96boards";

2
boards/arm/nucleo_f401re/nucleo_f401re.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f401.dtsi>
#include <st/f4/stm32f401Xe.dtsi>
/ {
model = "STMicroelectronics STM32F401RE-NUCLEO board";

2
boards/arm/nucleo_f411re/nucleo_f411re.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f411.dtsi>
#include <st/f4/stm32f411Xe.dtsi>
/ {
model = "STMicroelectronics STM32F411RE-NUCLEO board";

2
boards/arm/nucleo_f412zg/nucleo_f412zg.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f412.dtsi>
#include <st/f4/stm32f412zg.dtsi>
/ {
model = "STMicroelectronics STM32F412ZG-NUCLEO board";

2
boards/arm/nucleo_f413zh/nucleo_f413zh.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f413.dtsi>
#include <st/f4/stm32f413Xh.dtsi>
/ {
model = "STMicroelectronics STM32F413ZH-NUCLEO board";

2
boards/arm/nucleo_f429zi/nucleo_f429zi.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f429.dtsi>
#include <st/f4/stm32f429Xi.dtsi>
/ {
model = "STMicroelectronics STM32F429ZI-NUCLEO board";

2
boards/arm/nucleo_f446re/nucleo_f446re.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f446.dtsi>
#include <st/f4/stm32f446Xe.dtsi>
/ {
model = "STMicroelectronics STM32F446RE-NUCLEO board";

2
boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f407.dtsi>
#include <st/f4/stm32f407Xg.dtsi>
/ {
model = "Olimex STM32-E407 board";

2
boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f407.dtsi>
#include <st/f4/stm32f407Xg.dtsi>
/ {
model = "Olimex STM32-H407 board";

2
boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f405.dtsi>
#include <st/f4/stm32f405Xg.dtsi>
/ {
model = "Olimex STM32-P405 board";

2
boards/arm/stm32f411e_disco/stm32f411e_disco.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f411.dtsi>
#include <st/f4/stm32f411Xe.dtsi>
/ {
model = "STMicroelectronics STM32F411E-DISCO board";

2
boards/arm/stm32f412g_disco/stm32f412g_disco.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f412.dtsi>
#include <st/f4/stm32f412zg.dtsi>
/ {
model = "STMicroelectronics STM32F412G-DISCO board";

2
boards/arm/stm32f429i_disc1/stm32f429i_disc1.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f429.dtsi>
#include <st/f4/stm32f429Xi.dtsi>
/ {
model = "STMicroelectronics STM32F429I_DISC1 board";

2
boards/arm/stm32f469i_disco/stm32f469i_disco.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f469.dtsi>
#include <st/f4/stm32f469Xi.dtsi>
/ {
model = "STMicroelectronics STM32F469I-DISCO board";

2
boards/arm/stm32f4_disco/stm32f4_disco.dts
View file

@ -5,7 +5,7 @@
*/
/dts-v1/;
#include <st/stm32f407.dtsi>
#include <st/f4/stm32f407Xg.dtsi>
/ {
model = "STMicroelectronics STM32F4DISCOVERY board";

0
dts/arm/st/stm32f4-pinctrl.dtsi → dts/arm/st/f4/stm32f4-pinctrl.dtsi
View file

5
dts/arm/st/stm32f4.dtsi → dts/arm/st/f4/stm32f4.dtsi
View file

@ -5,8 +5,7 @@
*/
#include <arm/armv7-m.dtsi>
#include <st/stm32f4-pinctrl.dtsi>
#include <st/mem.h>
#include <st/f4/stm32f4-pinctrl.dtsi>
#include <dt-bindings/clock/stm32_clock.h>
#include <dt-bindings/i2c/i2c.h>
#include <dt-bindings/gpio/gpio.h>
@ -26,7 +25,6 @@
sram0: memory@20000000 {
device_type = "memory";
compatible = "mmio-sram";
reg = <0x20000000 DT_SRAM_SIZE>;
};
soc {
@ -42,7 +40,6 @@
flash0: flash@8000000 {
compatible = "soc-nv-flash";
label = "FLASH_STM32";
reg = <0x08000000 DT_FLASH_SIZE>;
write-block-size = <1>;
};

2
dts/arm/st/stm32f401.dtsi → dts/arm/st/f4/stm32f401.dtsi
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f4.dtsi>
#include <st/f4/stm32f4.dtsi>
/ {
soc {

22
dts/arm/st/f4/stm32f401Xe.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f401.dtsi>
/ {
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(96)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(512)>;
};
};
};
};

0
dts/arm/st/stm32f405-pinctrl.dtsi → dts/arm/st/f4/stm32f405-pinctrl.dtsi
View file

9
dts/arm/st/stm32f405.dtsi → dts/arm/st/f4/stm32f405.dtsi
View file

@ -4,15 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f405-pinctrl.dtsi>
#include <st/stm32f401.dtsi>
#include <st/f4/stm32f405-pinctrl.dtsi>
#include <st/f4/stm32f401.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_CCM_SIZE>;
};
soc {
pinctrl: pin-controller@40020000 {
reg = <0x40020000 0x2400>;

27
dts/arm/st/f4/stm32f405Xg.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f405.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(192)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(1024)>;
};
};
};
};

2
dts/arm/st/stm32f407.dtsi → dts/arm/st/f4/stm32f407.dtsi
View file

@ -4,4 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f405.dtsi>
#include <st/f4/stm32f405.dtsi>

27
dts/arm/st/f4/stm32f407Xg.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f407.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(192)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(1024)>;
};
};
};
};

2
dts/arm/st/stm32f411.dtsi → dts/arm/st/f4/stm32f411.dtsi
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f401.dtsi>
#include <st/f4/stm32f401.dtsi>
/ {
soc {

22
dts/arm/st/f4/stm32f411Xe.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f411.dtsi>
/ {
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(128)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(512)>;
};
};
};
};

0
dts/arm/st/stm32f412-pinctrl.dtsi → dts/arm/st/f4/stm32f412-pinctrl.dtsi
View file

4
dts/arm/st/stm32f412.dtsi → dts/arm/st/f4/stm32f412.dtsi
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f412-pinctrl.dtsi>
#include <st/stm32f411.dtsi>
#include <st/f4/stm32f412-pinctrl.dtsi>
#include <st/f4/stm32f411.dtsi>
/ {
soc {

22
dts/arm/st/f4/stm32f412cg.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* 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)>;
};
};
};
};

22
dts/arm/st/f4/stm32f412zg.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* 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)>;
};
};
};
};

0
dts/arm/st/stm32f413-pinctrl.dtsi → dts/arm/st/f4/stm32f413-pinctrl.dtsi
View file

4
dts/arm/st/stm32f413.dtsi → dts/arm/st/f4/stm32f413.dtsi
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f413-pinctrl.dtsi>
#include <st/stm32f411.dtsi>
#include <st/f4/stm32f413-pinctrl.dtsi>
#include <st/f4/stm32f411.dtsi>
/ {
soc {

22
dts/arm/st/f4/stm32f413Xh.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f413.dtsi>
/ {
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(320)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(1536)>;
};
};
};
};

2
dts/arm/st/stm32f417.dtsi → dts/arm/st/f4/stm32f417.dtsi
View file

@ -4,5 +4,5 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f407.dtsi>
#include <st/f4/stm32f407.dtsi>

27
dts/arm/st/f4/stm32f417Xe.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f405.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(192)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(512)>;
};
};
};
};

27
dts/arm/st/f4/stm32f417Xg.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f405.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(192)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(1024)>;
};
};
};
};

2
dts/arm/st/stm32f429.dtsi → dts/arm/st/f4/stm32f429.dtsi
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f407.dtsi>
#include <st/f4/stm32f407.dtsi>
/ {
soc {

27
dts/arm/st/f4/stm32f429Xi.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f429.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(256)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(2048)>;
};
};
};
};

2
dts/arm/st/stm32f429vX.dtsi → dts/arm/st/f4/stm32f429vX.dtsi
View file

@ -14,7 +14,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f429.dtsi>
#include <st/f4/stm32f429.dtsi>
/delete-node/ &spi5;

2
dts/arm/st/stm32f446.dtsi → dts/arm/st/f4/stm32f446.dtsi
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f401.dtsi>
#include <st/f4/stm32f401.dtsi>
/ {
soc {

22
dts/arm/st/f4/stm32f446Xe.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f446.dtsi>
/ {
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(128)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(512)>;
};
};
};
};

2
dts/arm/st/stm32f469.dtsi → dts/arm/st/f4/stm32f469.dtsi
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <st/stm32f429.dtsi>
#include <st/f4/stm32f429.dtsi>
/ {
soc {

27
dts/arm/st/f4/stm32f469Xi.dtsi Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <mem.h>
#include <st/f4/stm32f469.dtsi>
/ {
ccm0: memory@10000000 {
compatible = "st,stm32-ccm";
reg = <0x10000000 DT_SIZE_K(64)>;
};
sram0: memory@20000000 {
reg = <0x20000000 DT_SIZE_K(384)>;
};
soc {
flash-controller@40023c00 {
flash0: flash@8000000 {
reg = <0x08000000 DT_SIZE_K(2048)>;
};
};
};
};