[core] Rename BK7231T family to BK7231U

2022-12-08 17:19:42 +01:00
parent 71dfea1904
commit 30e1533ad9
17 changed files with 86 additions and 90 deletions
--- a/boards/_base/beken-7231n-tuya.json
+++ b/boards/_base/beken-7231n-tuya.json
@@ -1,25 +1,6 @@
 {
 	"build": {
 		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
-		"bkboot_version": "1.0.1-bk7231n",
-		"bkrbl_size_app": "0x107800"
-	},
-	"flash": {
-		"bootloader": "0x000000+0x11000",
-		"app": "0x011000+0x119000",
-		"download": "0x12A000+0xA6000",
-		"calibration": "0x1D0000+0x1000",
-		"net": "0x1D1000+0x1000",
-		"tlv": "0x1D2000+0x1000",
-		"kvs": "0x1D3000+0x8000",
-		"userdata": "0x1DB000+0x25000"
-	},
-	"upload": {
-		"maximum_size": 1083136
-	},
-	"doc": {
-		"extra": [
-			"Bootloader and app partitions contain CRC16 sums every 32 bytes. That results in the actual flash offsets/sizes not aligned to sector boundaries. To simplify calculations, the values shown in the table (extracted from bootloader's partition table) were aligned to 4096 bytes."
-		]
+		"bkboot_version": "1.0.1-bk7231n"
 	}
 }
--- a/boards/_base/beken-7231n.json
+++ b/boards/_base/beken-7231n.json
@@ -2,11 +2,27 @@
 	"build": {
 		"family": "BK7231N",
 		"ldscript_sdk": "bk7231n_bsp.ld",
-		"ldscript_arduino": "bk7231n_bsp.ld"
+		"ldscript_arduino": "bk7231n_bsp.ld",
+		"bkboot_version": "1.0.1-bk7231n",
+		"bkrbl_size_app": "0x107800"
+	},
+	"flash": {
+		"bootloader": "0x000000+0x11000",
+		"app": "0x011000+0x119000",
+		"download": "0x12A000+0xA6000",
+		"calibration": "0x1D0000+0x1000",
+		"net": "0x1D1000+0x1000",
+		"tlv": "0x1D2000+0x1000",
+		"kvs": "0x1D3000+0x8000",
+		"userdata": "0x1DB000+0x25000"
 	},
 	"upload": {
+		"maximum_size": 1083136,
 		"speed": 460800
 	},
+	"connectivity": [
+		"ble"
+	],
 	"doc": {
 		"params": {
 			"extra": {
--- a/boards/_base/beken-7231t-tuya.json
+++ b/boards/_base/beken-7231t-tuya.json
@@ -1,25 +1,6 @@
 {
 	"build": {
 		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
-		"bkboot_version": "1.0.5-bk7231s",
-		"bkrbl_size_app": "0x107800"
-	},
-	"flash": {
-		"bootloader": "0x000000+0x11000",
-		"app": "0x011000+0x121000",
-		"download": "0x132000+0xA6000",
-		"kvs": "0x1D8000+0x8000",
-		"calibration": "0x1E0000+0x1000",
-		"tlv": "0x1E1000+0x1000",
-		"net": "0x1E2000+0x1000",
-		"userdata": "0x1E3000+0x1D000"
-	},
-	"upload": {
-		"maximum_size": 1083136
-	},
-	"doc": {
-		"extra": [
-			"Bootloader and app partitions contain CRC16 sums every 32 bytes. That results in the actual flash offsets/sizes not aligned to sector boundaries. To simplify calculations, the values shown in the table (extracted from bootloader's partition table) were aligned to 4096 bytes."
-		]
+		"bkboot_version": "1.0.5-bk7231s"
 	}
 }
--- a/boards/_base/beken-7231t.json
+++ b/boards/_base/beken-7231t.json
@@ -1,17 +0,0 @@
-{
-	"build": {
-		"family": "BK7231T",
-		"ldscript_sdk": "bk7231_bsp.ld",
-		"ldscript_arduino": "bk7231_bsp.ld"
-	},
-	"upload": {
-		"speed": 921600
-	},
-	"doc": {
-		"params": {
-			"extra": {
-				"Bluetooth": "BLE v4.2"
-			}
-		}
-	}
-}
--- a/boards/_base/beken-7231u.json
+++ b/boards/_base/beken-7231u.json
@@ -0,0 +1,33 @@
+{
+	"build": {
+		"family": "BK7231U",
+		"ldscript_sdk": "bk7231_bsp.ld",
+		"ldscript_arduino": "bk7231_bsp.ld",
+		"bkboot_version": "1.0.8-bk7231u",
+		"bkrbl_size_app": "0x108700"
+	},
+	"flash": {
+		"bootloader": "0x000000+0x11000",
+		"app": "0x011000+0x121000",
+		"download": "0x132000+0xA6000",
+		"kvs": "0x1D8000+0x8000",
+		"calibration": "0x1E0000+0x1000",
+		"tlv": "0x1E1000+0x1000",
+		"net": "0x1E2000+0x1000",
+		"userdata": "0x1E3000+0x1D000"
+	},
+	"upload": {
+		"maximum_size": 1083136,
+		"speed": 921600
+	},
+	"connectivity": [
+		"ble"
+	],
+	"doc": {
+		"params": {
+			"extra": {
+				"Bluetooth": "BLE v4.2"
+			}
+		}
+	}
+}
--- a/boards/_base/beken-72xx.json
+++ b/boards/_base/beken-72xx.json
@@ -10,8 +10,7 @@
 		}
 	},
 	"connectivity": [
-		"wifi",
-		"ble"
+		"wifi"
 	],
 	"debug": {
 		"protocol": "openocd",
@@ -49,6 +48,9 @@
 			"General info": "../../docs/platform/beken-72xx/README.md",
 			"Flashing guide": "../../docs/platform/beken-72xx/flashing.md",
 			"BkWriter v1.6.0": "https://images.tuyacn.com/smart/bk_writer1.60/bk_writer1.60.exe"
-		}
+		},
+		"extra": [
+			"Bootloader and app partitions contain CRC16 sums every 32 bytes. That results in the actual flash offsets/sizes not aligned to sector boundaries. To simplify calculations, the values shown in the table (extracted from bootloader's partition table) were aligned to 4096 bytes."
+		]
 	}
 }
--- a/boards/generic-bk7231t-qfn32-tuya.json
+++ b/boards/generic-bk7231t-qfn32-tuya.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"generic",
 		"beken-72xx",
-		"beken-7231t",
+		"beken-7231u",
 		"beken-7231t-tuya",
 		"pcb/ic-bk7231-qfn32"
 	],
--- a/boards/wb2l.json
+++ b/boards/wb2l.json
@@ -1,7 +1,7 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231t",
+		"beken-7231u",
 		"beken-7231t-tuya",
 		"pcb/ic-bk7231-qfn32",
 		"pcb/wb2l",
--- a/boards/wb2s.json
+++ b/boards/wb2s.json
@@ -1,7 +1,7 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231t",
+		"beken-7231u",
 		"beken-7231t-tuya",
 		"pcb/ic-bk7231-qfn32",
 		"pcb/wb2s",
--- a/boards/wb3l.json
+++ b/boards/wb3l.json
@@ -1,7 +1,7 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231t",
+		"beken-7231u",
 		"beken-7231t-tuya",
 		"pcb/ic-bk7231-qfn32",
 		"pcb/wb3l"
--- a/boards/wb3s.json
+++ b/boards/wb3s.json
@@ -1,7 +1,7 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231t",
+		"beken-7231u",
 		"beken-7231t-tuya",
 		"pcb/ic-bk7231-qfn32",
 		"pcb/wb3s"