Skip to content

Commit 3d61b1d

Browse files
xcguangxcguang
committed
Merge branch 'feature/remove_512_512_map' into 'master'
feat(at): Remove 512+512 map because the bin is too large See merge request sdk/ESP8266_NONOS_SDK!48
2 parents dabeaed + c172368 commit 3d61b1d

File tree

3 files changed

+15
-96
lines changed

3 files changed

+15
-96
lines changed

‎examples/at/user/user_main.c‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,13 @@
2929
#if ((SPI_FLASH_SIZE_MAP == 0) || (SPI_FLASH_SIZE_MAP == 1))
3030
#error "The flash map is not supported"
3131
#elif (SPI_FLASH_SIZE_MAP == 2)
32-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
33-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
34-
#define SYSTEM_PARTITION_RF_CAL_ADDR0xfb000
35-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0xfc000
36-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0xfd000
37-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
38-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
39-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
40-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
41-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
32+
#error "The flash map is not supported"
4233
#elif (SPI_FLASH_SIZE_MAP == 3)
43-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
44-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
45-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
46-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
47-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x1fd000
48-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
49-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
50-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
51-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
52-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
34+
#error "The flash map is not supported"
5335
#elif (SPI_FLASH_SIZE_MAP == 4)
54-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
55-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
56-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
57-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000
58-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x3fd000
59-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
60-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
61-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
62-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
63-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
36+
#error "The flash map is not supported"
6437
#elif (SPI_FLASH_SIZE_MAP == 5)
65-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
38+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
6639
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
6740
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
6841
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
@@ -73,7 +46,7 @@
7346
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0xfa000
7447
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0xf9000
7548
#elif (SPI_FLASH_SIZE_MAP == 6)
76-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
49+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
7750
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
7851
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
7952
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000

‎examples/at_espconn/user/user_main.c‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,13 @@
3232
#if ((SPI_FLASH_SIZE_MAP == 0) || (SPI_FLASH_SIZE_MAP == 1))
3333
#error "The flash map is not supported"
3434
#elif (SPI_FLASH_SIZE_MAP == 2)
35-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
36-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
37-
#define SYSTEM_PARTITION_RF_CAL_ADDR0xfb000
38-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0xfc000
39-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0xfd000
40-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
41-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
42-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
43-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
44-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
35+
#error "The flash map is not supported"
4536
#elif (SPI_FLASH_SIZE_MAP == 3)
46-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
47-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
48-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
49-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
50-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x1fd000
51-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
52-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
53-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
54-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
55-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
37+
#error "The flash map is not supported"
5638
#elif (SPI_FLASH_SIZE_MAP == 4)
57-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
58-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
59-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
60-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000
61-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x3fd000
62-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
63-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
64-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
65-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
66-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
39+
#error "The flash map is not supported"
6740
#elif (SPI_FLASH_SIZE_MAP == 5)
68-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
41+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
6942
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
7043
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
7144
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
@@ -76,7 +49,7 @@
7649
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0xfa000
7750
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0xf9000
7851
#elif (SPI_FLASH_SIZE_MAP == 6)
79-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
52+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
8053
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
8154
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
8255
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000

‎examples/at_sdio/user/user_main.c‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,13 @@
3232
#if ((SPI_FLASH_SIZE_MAP == 0) || (SPI_FLASH_SIZE_MAP == 1))
3333
#error "The flash map is not supported"
3434
#elif (SPI_FLASH_SIZE_MAP == 2)
35-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
36-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
37-
#define SYSTEM_PARTITION_RF_CAL_ADDR0xfb000
38-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0xfc000
39-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0xfd000
40-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
41-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
42-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
43-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
44-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
35+
#error "The flash map is not supported"
4536
#elif (SPI_FLASH_SIZE_MAP == 3)
46-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
47-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
48-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
49-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
50-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x1fd000
51-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
52-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
53-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
54-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
55-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
37+
#error "The flash map is not supported"
5638
#elif (SPI_FLASH_SIZE_MAP == 4)
57-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
58-
#define SYSTEM_PARTITION_OTA_2_ADDR0x81000
59-
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
60-
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000
61-
#define SYSTEM_PARTITION_SYSTEM_PARAMETER_ADDR0x3fd000
62-
#define SYSTEM_PARTITION_AT_PARAMETER_ADDR0x7d000
63-
#define SYSTEM_PARTITION_SSL_CLIENT_CERT_PRIVKEY_ADDR0x7c000
64-
#define SYSTEM_PARTITION_SSL_CLIENT_CA_ADDR0x7b000
65-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0x7a000
66-
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0x79000
39+
#error "The flash map is not supported"
6740
#elif (SPI_FLASH_SIZE_MAP == 5)
68-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
41+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
6942
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
7043
#define SYSTEM_PARTITION_RF_CAL_ADDR0x1fb000
7144
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x1fc000
@@ -76,7 +49,7 @@
7649
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CERT_PRIVKEY_ADDR0xfa000
7750
#define SYSTEM_PARTITION_WPA2_ENTERPRISE_CA_ADDR0xf9000
7851
#elif (SPI_FLASH_SIZE_MAP == 6)
79-
#define SYSTEM_PARTITION_OTA_SIZE0x6A000
52+
#define SYSTEM_PARTITION_OTA_SIZE0xE0000
8053
#define SYSTEM_PARTITION_OTA_2_ADDR0x101000
8154
#define SYSTEM_PARTITION_RF_CAL_ADDR0x3fb000
8255
#define SYSTEM_PARTITION_PHY_DATA_ADDR0x3fc000

0 commit comments

Comments
 (0)