Skip to content

Commit c0e05e1

Browse files
wuxn9999YiluMao
wuxn9999
authored and
YiluMao
committed
IssueID:1911:Remove old flash device driver framework
[Detail] Remove old flash device driver framework. [Verified Cases] Build Pass: helloworld_demo@haaseduk1 Test Pass: helloworld_demo@haaseduk1
1 parent ad1f0f4 commit c0e05e1

File tree

7 files changed

+7
-270
lines changed

7 files changed

+7
-270
lines changed

‎components/drivers/peripheral/flash/package.yaml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 第一部分：基础信息
22
name: flash # <必选项> 包名称 （符合C语言变量命名规则），长度少于等于64字节
3-
version: master # <必选项> 组件版本号
3+
version: master # <必选项> 组件版本号
44
description: Flash通用驱动 # <必选项> 建议至少20字以上
55
type: common # <必选项> 组件类型，为：solution, chip, board, common, sdk
66

@@ -17,8 +17,6 @@ license: Apache license v2.0 # <可选项> 源代码的
1717
# - aos: >=v7.2.0
1818
depends:
1919
- base: master
20-
- epoll: master
21-
- csi: master
2220

2321
## 第四部分：编译连接信息
2422
# build_config: # <可选项> 编译配置项
@@ -49,10 +47,6 @@ build_config:
4947
source_file:
5048
- src/flash.c
5149
- src/flashpart.c
52-
- src/flash_dev.c ? <CONFIG_U_FLASH_DEV>
53-
- src/mtd.c ? <CONFIG_U_FLASH_CORE>
54-
- src/mtdnand.c ? <CONFIG_U_FLASH_CORE>
55-
- src/mtdnor.c ? <CONFIG_U_FLASH_CORE>
5650

5751
## 第五部分：配置信息
5852
# def_config: # 组件的可配置项
@@ -61,8 +55,6 @@ source_file:
6155
# CONFIG_CLI: y
6256
def_config:
6357
AOS_COMP_FLASH: 1
64-
CONFIG_U_FLASH_DEV: 0 # FLASH device node named witch "/dev/flash[x]"
65-
CONFIG_U_FLASH_CORE: 0 # FLASH subsys AOS API driver
6658

6759
## 第六部分：安装信息
6860
# install:

‎components/kv/internal/kv_conf.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414

1515
/* The physical parition for key-value store */
1616
#ifndef KV_CONFIG_PARTITION
17-
#if (CONFIG_U_FLASH_CORE > 0)
18-
#define KV_PARTITION MTD_PART_ID_KV
19-
#else
2017
#define KV_PARTITION HAL_PARTITION_PARAMETER_2
21-
#endif
2218
#else
2319
#define KV_PARTITION KV_CONFIG_PARTITION
2420
#endif

‎hardware/board/haas100/config/partition_conf.c‎

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -2,94 +2,6 @@
22
* Copyright (C) 2015-2021 Alibaba Group Holding Limited
33
*/
44

5-
#include <aos/mtdpart.h>
6-
#include <aos/mtd.h>
7-
8-
/* Logic partition on flash devices */
9-
const mtd_partition_t mtd_partitions[] =
10-
{
11-
{
12-
.partition_name = "boot1",
13-
.partition_name_std = MTD_PART_NAME_BOOTLOADER,
14-
.partition_start_addr = 0x0,
15-
.partition_length = 0x10000, //64KB
16-
.partition_options = 0,
17-
},
18-
{
19-
.partition_name = "boot_info",
20-
.partition_name_std = MTD_PART_NAME_ENV2,
21-
.partition_start_addr = 0x10000, //boot information need protect
22-
.partition_length = 0x2000, //8KB
23-
.partition_options = 0,
24-
},
25-
{
26-
.partition_name = "boot2A",
27-
.partition_name_std = MTD_PART_NAME_2ND_BOOTLOADER,
28-
.partition_start_addr = 0x12000,
29-
.partition_length = 0x18000, //64KB
30-
.partition_options = 0,
31-
},
32-
{
33-
.partition_name = "RTOSA",
34-
.partition_name_std = MTD_PART_NAME_KERNEL,
35-
.partition_start_addr = 0x2A000,
36-
.partition_length = 0x578000, //5.5MB
37-
.partition_options = 0,
38-
},
39-
{
40-
.partition_name = "boot2B",
41-
.partition_name_std = MTD_PART_NAME_2ND_BOOTLOADER2,
42-
.partition_start_addr = 0x5A2000,
43-
.partition_length = 0x18000, //64KB
44-
.partition_options = 0,
45-
},
46-
{
47-
.partition_name = "RTOSB",
48-
.partition_name_std = MTD_PART_NAME_KERNEL2,
49-
.partition_start_addr = 0x5BA000,
50-
.partition_length = 0x578000, //5.5MB
51-
.partition_options = 0,
52-
},
53-
{
54-
.partition_name = "littleFS",
55-
.partition_name_std = MTD_PART_NAME_LITTLEFS,
56-
.partition_start_addr = 0xB32000,
57-
.partition_length = 0x4AE000, //4792KB
58-
.partition_options = 0,
59-
},
60-
{
61-
.partition_name = "boot1_sec",
62-
.partition_name_std = MTD_PART_NAME_BOOTLOADER_SEC,
63-
.partition_start_addr = 0xFE0000,
64-
.partition_length = 0x10000, //64KB
65-
.partition_options = 0,
66-
},
67-
{
68-
.partition_name = "boot2_info",
69-
.partition_name_std = MTD_PART_NAME_ENV,
70-
.partition_start_addr = 0xFF0000,
71-
.partition_length = 0x1000, //4KB
72-
.partition_options = 0,
73-
},
74-
{
75-
.partition_name = "KV",
76-
.partition_name_std = MTD_PART_NAME_KV,
77-
.partition_start_addr = 0xFF1000,
78-
.partition_length = 0xD000, //52KB
79-
.partition_options = 0,
80-
},
81-
{
82-
.partition_name = "factory",
83-
.partition_name_std = MTD_PART_NAME_FACTORY,
84-
.partition_start_addr = 0xFFE000,
85-
.partition_length = 0x2000, //8KB
86-
.partition_options = 0,
87-
}
88-
};
89-
90-
/* Declare a constant to indicate the defined partitions amount */
91-
const int mtd_partitions_amount = (sizeof(mtd_partitions) / sizeof(mtd_partition_t));
92-
935
#include <aos/flashpart_core.h>
946
#include <aos/hal/flash.h>
957

@@ -176,7 +88,7 @@ static int flash_partitions_init(void)
17688
ret = aos_flashpart_register(&partitions[i]);
17789
if (ret) {
17890
for (size_t j = 0; j < i; j++)
179-
(void)aos_flashpart_unregister(j);
91+
(void)aos_flashpart_unregister(partitions[j].dev.id);
18092
return ret;
18193
}
18294
}

‎hardware/board/haas200/config/partition_conf.c‎

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,81 +2,6 @@
22
* Copyright (C) 2015-2017 Alibaba Group Holding Limited
33
*/
44

5-
#include <aos/mtdpart.h>
6-
#include <aos/mtd.h>
7-
8-
/* Logic partition on flash devices */
9-
const mtd_partition_t mtd_partitions[] =
10-
{
11-
{
12-
.partition_name = "BOOTLOADER",
13-
.partition_name_std = MTD_PART_NAME_BOOTLOADER,
14-
.partition_start_addr = 0x4000,
15-
.partition_length = 0x2000, /* 64KB */
16-
.partition_options = 0,
17-
},
18-
{
19-
.partition_name = "PARAMETE1",
20-
.partition_name_std = MTD_PART_NAME_ENV,
21-
.partition_start_addr = 0x3FF000,
22-
.partition_length = 0x1000, /* boot env, 4KB */
23-
.partition_options = 0,
24-
},
25-
{
26-
.partition_name = "PARAMETER2",
27-
.partition_name_std = MTD_PART_NAME_KV,
28-
.partition_start_addr = 0x3FD000,
29-
.partition_length = 0x2000, /* kv, 8KB */
30-
.partition_options = 0,
31-
},
32-
{
33-
.partition_name = "PARAMETER3",
34-
.partition_name_std = MTD_PART_NAME_BOOTLOADER_SEC,
35-
.partition_start_addr = 0x3FC000,
36-
.partition_length = 0x1000, /* security,factory, 4KB */
37-
.partition_options = 0,
38-
},
39-
{
40-
.partition_name = "PARAMETER4",
41-
.partition_name_std = MTD_PART_NAME_UNKNOWN,
42-
.partition_start_addr = 0x3FB000,
43-
.partition_length = 0x1000, /* reserved, 4KB*/
44-
.partition_options = 0,
45-
},
46-
{
47-
.partition_name = "APPLICATION",
48-
.partition_name_std = MTD_PART_NAME_KERNEL,
49-
.partition_start_addr = 0x14000,
50-
.partition_length = 0x200000, /* OTA A system, 2MB */
51-
.partition_options = 0,
52-
},
53-
{
54-
.partition_name = "APPLICATION_B",
55-
.partition_name_std = MTD_PART_NAME_KERNEL2,
56-
.partition_start_addr = 0x214000,
57-
.partition_length = 0x140000, /* OTA B system, 1.25MB */
58-
.partition_options = 0,
59-
},
60-
{
61-
.partition_name = "LITTLEFS",
62-
.partition_name_std = MTD_PART_NAME_LITTLEFS,
63-
.partition_start_addr = 0x354000,
64-
.partition_length = 0xa7000, /* littlefs, 668KB*/
65-
.partition_options = 0,
66-
},
67-
{
68-
.partition_name = "2NDBOOT",
69-
.partition_name_std = MTD_PART_NAME_2ND_BOOTLOADER,
70-
.partition_start_addr = 0x6000,
71-
.partition_length = 0xe000, /* 2nd bootloader, 56KB*/
72-
.partition_options = 0,
73-
}
74-
75-
};
76-
77-
/* Declare a constant to indicate the defined partitions amount */
78-
const int mtd_partitions_amount = (sizeof(mtd_partitions) / sizeof(mtd_partition_t));
79-
805
#include <aos/flashpart_core.h>
816
#include <aos/hal/flash.h>
827

@@ -145,7 +70,7 @@ static int flash_partitions_init(void)
14570
ret = aos_flashpart_register(&partitions[i]);
14671
if (ret) {
14772
for (size_t j = 0; j < i; j++)
148-
(void)aos_flashpart_unregister(j);
73+
(void)aos_flashpart_unregister(partitions[j].dev.id);
14974
return ret;
15075
}
15176
}

‎hardware/board/haaseduk1/config/partition_conf.c‎

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -2,94 +2,6 @@
22
* Copyright (C) 2015-2021 Alibaba Group Holding Limited
33
*/
44

5-
#include <aos/mtdpart.h>
6-
#include <aos/mtd.h>
7-
8-
/* Logic partition on flash devices */
9-
const mtd_partition_t mtd_partitions[] =
10-
{
11-
{
12-
.partition_name = "boot1",
13-
.partition_name_std = MTD_PART_NAME_BOOTLOADER,
14-
.partition_start_addr = 0x0,
15-
.partition_length = 0x10000, //64KB
16-
.partition_options = 0,
17-
},
18-
{
19-
.partition_name = "boot_info",
20-
.partition_name_std = MTD_PART_NAME_ENV2,
21-
.partition_start_addr = 0x10000, //boot information need protect
22-
.partition_length = 0x2000, //8KB
23-
.partition_options = 0,
24-
},
25-
{
26-
.partition_name = "boot2A",
27-
.partition_name_std = MTD_PART_NAME_2ND_BOOTLOADER,
28-
.partition_start_addr = 0x12000,
29-
.partition_length = 0x18000, //64KB
30-
.partition_options = 0,
31-
},
32-
{
33-
.partition_name = "RTOSA",
34-
.partition_name_std = MTD_PART_NAME_KERNEL,
35-
.partition_start_addr = 0x2A000,
36-
.partition_length = 0x578000, //5.5MB
37-
.partition_options = 0,
38-
},
39-
{
40-
.partition_name = "boot2B",
41-
.partition_name_std = MTD_PART_NAME_2ND_BOOTLOADER2,
42-
.partition_start_addr = 0x5A2000,
43-
.partition_length = 0x18000, //64KB
44-
.partition_options = 0,
45-
},
46-
{
47-
.partition_name = "RTOSB",
48-
.partition_name_std = MTD_PART_NAME_KERNEL2,
49-
.partition_start_addr = 0x5BA000,
50-
.partition_length = 0x578000, //5.5MB
51-
.partition_options = 0,
52-
},
53-
{
54-
.partition_name = "littleFS",
55-
.partition_name_std = MTD_PART_NAME_LITTLEFS,
56-
.partition_start_addr = 0xB32000,
57-
.partition_length = 0x4AE000, //4792KB
58-
.partition_options = 0,
59-
},
60-
{
61-
.partition_name = "boot1_sec",
62-
.partition_name_std = MTD_PART_NAME_BOOTLOADER_SEC,
63-
.partition_start_addr = 0xFE0000,
64-
.partition_length = 0x10000, //64KB
65-
.partition_options = 0,
66-
},
67-
{
68-
.partition_name = "boot2_info",
69-
.partition_name_std = MTD_PART_NAME_ENV,
70-
.partition_start_addr = 0xFF0000,
71-
.partition_length = 0x1000, //4KB
72-
.partition_options = 0,
73-
},
74-
{
75-
.partition_name = "KV",
76-
.partition_name_std = MTD_PART_NAME_KV,
77-
.partition_start_addr = 0xFF1000,
78-
.partition_length = 0xD000, //52KB
79-
.partition_options = 0,
80-
},
81-
{
82-
.partition_name = "factory",
83-
.partition_name_std = MTD_PART_NAME_FACTORY,
84-
.partition_start_addr = 0xFFE000,
85-
.partition_length = 0x2000, //8KB
86-
.partition_options = 0,
87-
}
88-
};
89-
90-
/* Declare a constant to indicate the defined partitions amount */
91-
const int mtd_partitions_amount = (sizeof(mtd_partitions) / sizeof(mtd_partition_t));
92-
935
#include <aos/flashpart_core.h>
946
#include <aos/hal/flash.h>
957

@@ -176,7 +88,7 @@ static int flash_partitions_init(void)
17688
ret = aos_flashpart_register(&partitions[i]);
17789
if (ret) {
17890
for (size_t j = 0; j < i; j++)
179-
(void)aos_flashpart_unregister(j);
91+
(void)aos_flashpart_unregister(partitions[j].dev.id);
18092
return ret;
18193
}
18294
}

‎hardware/chip/haas1000/package.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ source_file:
127127
- "csi/gpio.c"
128128
- "csi/iic.c"
129129
- "csi/wdt.c"
130-
- "csi/flash.c"
131-
#- "csi/pwm.c"
130+
# - "csi/flash.c"
131+
# - "csi/pwm.c"
132132
- "aos_adapter/uart.c"
133133
- "aos_adapter/flash.c"
134134
- "aos_adapter/pwm.c"

‎hardware/chip/rtl872xd/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ source_file:
171171
- csi_driver/gpio/gpio.c
172172
- csi_driver/iic/iic.c
173173
- csi_driver/spi/spi.c
174-
- csi_driver/spiflash/spiflash.c
174+
# - csi_driver/spiflash/spiflash.c
175175
- csi_driver/timer/timer.c
176176
- csi_driver/uart/uart.c
177177
- csi_driver/wdt/wdt.c

0 commit comments

Comments
 (0)