Skip to content

Commit 3cd6671

Browse files
VynDragonnashif
VynDragon
authored and
nashif
committed
boards: ai_m62_12f: clear up module/board confusion
Clears module and board being confused Signed-off-by: Camille BAUD <mail@massdriver.space>
1 parent b73fedd commit 3cd6671

File tree

14 files changed

+108
-88
lines changed

14 files changed

+108
-88
lines changed

boards/aithinker/ai_m62_12f/Kconfig.ai_m62_12f renamed to boards/aithinker/ai_m62_12f_kit/Kconfig.ai_m62_12f_kit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
config BOARD_AI_M62_12F
5+
config BOARD_AI_M62_12F_KIT
66
select SOC_BL616C50Q2I

boards/aithinker/ai_m62_12f/ai_m62_12f-pinctrl.dtsi renamed to boards/aithinker/ai_m62_12f_kit/ai_m62_12f-pinctrl.dtsi

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,4 @@
2323
bias-high-impedance;
2424
};
2525
};
26-
27-
i2c0_default: i2c0_default {
28-
group1 {
29-
pinmux = <GPIO0_I2C0_SCL>,
30-
<GPIO1_I2C0_SDA>;
31-
bias-pull-up;
32-
input-schmitt-enable;
33-
};
34-
};
35-
36-
spi0_default: spi0_default {
37-
group1 {
38-
pinmux = <GPIO27_SPI_MOSI>,
39-
<GPIO29_SPI_SCLK>,
40-
<GPIO30_SPI_MISO>;
41-
bias-pull-up;
42-
input-schmitt-enable;
43-
};
44-
};
4526
};

‎boards/aithinker/ai_m62_12f_kit/ai_m62_12f.dtsi‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include <bflb/bl616.dtsi>
8+
#include "ai_m62_12f-pinctrl.dtsi"
9+
10+
/ {
11+
model = "Ai-Thinker M62-12F Module";
12+
compatible = "bflb,bl616";
13+
14+
chosen {
15+
zephyr,flash = &flash0;
16+
zephyr,code-partition = &slot0_partition;
17+
zephyr,itcm = &sram1;
18+
zephyr,sram = &sram0;
19+
zephyr,console = &uart0;
20+
zephyr,shell-uart = &uart0;
21+
};
22+
};
23+
24+
&cpu0 {
25+
clock-frequency = <DT_FREQ_M(320)>;
26+
};
27+
28+
&flashctrl {
29+
flash0: flash@A0000000 {
30+
compatible = "soc-nv-flash", "gd,gd25lq32d";
31+
reg = <0xA0000000 (0x400000 - 0x2000)>;
32+
write-block-size = <256>;
33+
erase-block-size = <DT_SIZE_K(4)>;
34+
35+
partitions {
36+
compatible = "fixed-partitions";
37+
#address-cells = <1>;
38+
#size-cells = <1>;
39+
40+
slot0_partition: partition@0 {
41+
label = "image-0";
42+
reg = <0x00000000 0x00100000>;
43+
read-only;
44+
};
45+
46+
storage_partition: partition@100000 {
47+
label = "storage";
48+
reg = <0x00100000 (0x300000 - 0x2000)>;
49+
};
50+
};
51+
};
52+
};
53+
54+
&uart0 {
55+
status = "okay";
56+
current-speed = <115200>;
57+
58+
pinctrl-0 = <&uart0_default>;
59+
pinctrl-1 = <&uart0_sleep>;
60+
pinctrl-names = "default", "sleep";
61+
};
62+
63+
&gpio0 {
64+
status = "okay";
65+
};

‎boards/aithinker/ai_m62_12f_kit/ai_m62_12f_kit-pinctrl.dtsi‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright (c) 2024-2025 MASSDRIVER EI (massdriver.space)
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
&pinctrl {
8+
i2c0_default: i2c0_default {
9+
group1 {
10+
pinmux = <GPIO0_I2C0_SCL>,
11+
<GPIO1_I2C0_SDA>;
12+
bias-pull-up;
13+
input-schmitt-enable;
14+
};
15+
};
16+
17+
spi0_default: spi0_default {
18+
group1 {
19+
pinmux = <GPIO27_SPI_MOSI>,
20+
<GPIO29_SPI_SCLK>,
21+
<GPIO30_SPI_MISO>;
22+
bias-pull-up;
23+
input-schmitt-enable;
24+
};
25+
};
26+
};

boards/aithinker/ai_m62_12f/ai_m62_12f.dts renamed to boards/aithinker/ai_m62_12f_kit/ai_m62_12f_kit.dts

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,11 @@
66

77
/dts-v1/;
88

9-
#include <bflb/bl616.dtsi>
10-
#include "ai_m62_12f-pinctrl.dtsi"
9+
#include "ai_m62_12f.dtsi"
10+
#include "ai_m62_12f_kit-pinctrl.dtsi"
1111

1212
/ {
1313
model = "Ai-Thinker M62-12F development board";
14-
compatible = "bflb,bl616";
15-
16-
chosen {
17-
zephyr,flash = &flash0;
18-
zephyr,code-partition = &slot0_partition;
19-
zephyr,itcm = &sram1;
20-
zephyr,sram = &sram0;
21-
zephyr,console = &uart0;
22-
zephyr,shell-uart = &uart0;
23-
};
2414

2515
aliases {
2616
led0 = &blue_led;
@@ -66,49 +56,6 @@
6656
};
6757
};
6858

69-
&cpu0 {
70-
clock-frequency = <DT_FREQ_M(320)>;
71-
};
72-
73-
&flashctrl {
74-
flash0: flash@A0000000 {
75-
compatible = "soc-nv-flash", "gd,25lq32d";
76-
reg = <0xA0000000 (0x400000 - 0x2000)>;
77-
write-block-size = <256>;
78-
erase-block-size = <DT_SIZE_K(4)>;
79-
80-
partitions {
81-
compatible = "fixed-partitions";
82-
#address-cells = <1>;
83-
#size-cells = <1>;
84-
85-
slot0_partition: partition@0 {
86-
label = "image-0";
87-
reg = <0x00000000 0x00100000>;
88-
read-only;
89-
};
90-
91-
storage_partition: partition@100000 {
92-
label = "storage";
93-
reg = <0x00100000 (0x300000 - 0x2000)>;
94-
};
95-
};
96-
};
97-
};
98-
99-
&uart0 {
100-
status = "okay";
101-
current-speed = <115200>;
102-
103-
pinctrl-0 = <&uart0_default>;
104-
pinctrl-1 = <&uart0_sleep>;
105-
pinctrl-names = "default", "sleep";
106-
};
107-
108-
&gpio0 {
109-
status = "okay";
110-
};
111-
11259
&i2c0 {
11360
status = "okay";
11461
clock-frequency = <I2C_BITRATE_STANDARD>;

boards/aithinker/ai_m62_12f/ai_m62_12f.yaml renamed to boards/aithinker/ai_m62_12f_kit/ai_m62_12f_kit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
identifier: ai_m62_12f
5+
identifier: ai_m62_12f_kit
66
name: Ai-Thinker M62-12F development board
77
type: mcu
88
arch: riscv

boards/aithinker/ai_m62_12f/ai_m62_12f_defconfig renamed to boards/aithinker/ai_m62_12f_kit/ai_m62_12f_kit_defconfig

File renamed without changes.

boards/aithinker/ai_m62_12f/board.cmake renamed to boards/aithinker/ai_m62_12f_kit/board.cmake

File renamed without changes.

boards/aithinker/ai_m62_12f/board.yml renamed to boards/aithinker/ai_m62_12f_kit/board.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
board:
2-
name: ai_m62_12f
2+
name: ai_m62_12f_kit
33
full_name: Ai-Thinker M62-12F development board
44
vendor: aithinker
55
socs:

boards/aithinker/ai_m62_12f/doc/img/ai_m62_12f.webp renamed to boards/aithinker/ai_m62_12f_kit/doc/img/ai_m62_12f_kit.webp

File renamed without changes.

0 commit comments

Comments
 (0)