[boards] Update flash layouts, add W302 chip

2023-05-29 16:16:58 +02:00
parent af8c7417b3
commit 6135e4f7b0
22 changed files with 64 additions and 19 deletions
--- a/boards/_base/beken-7231n-tuya.json
+++ b/boards/_base/beken-7231n-tuya.json
@@ -2,5 +2,8 @@
 	"build": {
 		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
 		"bkboot_version": "1.0.1-bk7231n"
+	},
+	"flash": {
+		"tuya": "0x1ED000+0x13000"
 	}
 }
--- a/boards/_base/beken-7231n.json
+++ b/boards/_base/beken-7231n.json
@@ -12,7 +12,6 @@
 		"download": "0x12A000+0xA6000",
 		"calibration": "0x1D0000+0x1000",
 		"net": "0x1D1000+0x1000",
-		"tlv": "0x1D2000+0x1000",
 		"kvs": "0x1D3000+0x8000",
 		"userdata": "0x1DB000+0x25000"
 	},
--- a/boards/_base/beken-7231t-tuya.json
+++ b/boards/_base/beken-7231t-tuya.json
@@ -2,5 +2,8 @@
 	"build": {
 		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
 		"bkboot_version": "1.0.5-bk7231s"
+	},
+	"flash": {
+		"tuya": "0x1ED000+0x13000"
 	}
 }
--- a/boards/_base/beken-7231u.json
+++ b/boards/_base/beken-7231u.json
@@ -12,7 +12,6 @@
 		"download": "0x132000+0xA6000",
 		"kvs": "0x1D8000+0x8000",
 		"calibration": "0x1E0000+0x1000",
-		"tlv": "0x1E1000+0x1000",
 		"net": "0x1E2000+0x1000",
 		"userdata": "0x1E3000+0x1D000"
 	},
--- a/boards/_base/realtek-ambz-2mb-468k.json
+++ b/boards/_base/realtek-ambz-2mb-468k.json
@@ -5,9 +5,8 @@
 	"flash": {
 		"ota1": "0x00B000+0x75000",
 		"ota2": "0x080000+0x75000",
-		"kvs": "0xF5000+0x6000",
-		"userdata": "0xFB000+0x104000",
-		"rdp": "0x1FF000+0x1000"
+		"kvs": "0x0F5000+0x8000",
+		"userdata": "0x0FD000+0x102000"
 	},
 	"upload": {
 		"flash_size": 2097152,
--- a/boards/_base/realtek-ambz-2mb-788k.json
+++ b/boards/_base/realtek-ambz-2mb-788k.json
@@ -5,9 +5,8 @@
 	"flash": {
 		"ota1": "0x00B000+0xC5000",
 		"ota2": "0x0D0000+0xC5000",
-		"kvs": "0x195000+0x6000",
-		"userdata": "0x19B000+0x64000",
-		"rdp": "0x1FF000+0x1000"
+		"kvs": "0x195000+0x8000",
+		"userdata": "0x19D000+0x62000"
 	},
 	"upload": {
 		"flash_size": 2097152,
--- a/boards/_base/realtek-ambz-4mb-980k.json
+++ b/boards/_base/realtek-ambz-4mb-980k.json
@@ -6,8 +6,7 @@
 		"ota1": "0x00B000+0xF5000",
 		"ota2": "0x100000+0xF5000",
 		"kvs": "0x1F5000+0x8000",
-		"userdata": "0x1FD000+0x202000",
-		"rdp": "0x3FF000+0x1000"
+		"userdata": "0x1FD000+0x202000"
 	},
 	"upload": {
 		"flash_size": 4194304,
--- a/boards/_base/realtek-ambz-tuya.json
+++ b/boards/_base/realtek-ambz-tuya.json
@@ -0,0 +1,5 @@
+{
+	"flash": {
+		"tuya": "0x1EB000+0x15000"
+	}
+}
--- a/boards/_base/realtek-ambz.json
+++ b/boards/_base/realtek-ambz.json
@@ -10,7 +10,8 @@
 		"boot_xip": "0x000000+0x4000",
 		"boot_ram": "0x004000+0x4000",
 		"system": "0x009000+0x1000",
-		"calibration": "0x00A000+0x1000"
+		"calibration": "0x00A000+0x1000",
+		"rdp": "0x1FF000+0x1000"
 	},
 	"connectivity": [
 		"wifi"
@@ -47,10 +48,6 @@
 			"General info": "../../docs/platform/realtek-amb/README.md",
 			"Flashing guide": "../../docs/platform/realtek-ambz/flashing.md",
 			"Debugging": "../../docs/platform/realtek-ambz/debugging.md"
-		},
-		"extra": [
-			"RDP is most likely not used in Tuya firmwares, as the System Data partition contains an incorrect offset 0xFF000 for RDP, which is in the middle of OTA2 image.",
-			"Additionally, Tuya firmware uses an encrypted KV or file storage, which resides at the end of flash memory. This seems to overlap system RDP area."
-		]
+		}
 	}
 }
--- a/boards/_base/realtek-ambz2-2mb-992k.json
+++ b/boards/_base/realtek-ambz2-2mb-992k.json
@@ -2,8 +2,7 @@
 	"flash": {
 		"ota1": "0x00C000+0xF8000",
 		"ota2": "0x104000+0xF8000",
-		"kvs": "0x1FC000+0x2000",
-		"userdata": "0x1FE000+0x2000"
+		"kvs": "0x1FC000+0x4000"
 	},
 	"upload": {
 		"flash_size": 2097152,
--- a/boards/_base/realtek-ambz2-tuya.json
+++ b/boards/_base/realtek-ambz2-tuya.json
@@ -0,0 +1,5 @@
+{
+	"flash": {
+		"tuya": "0x1D5000+0x10000"
+	}
+}
--- a/boards/wr2.json
+++ b/boards/wr2.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"ic/rtl8710bn",
 		"pcb/wr2-base",
--- a/boards/wr2e.json
+++ b/boards/wr2e.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"ic/rtl8710bn",
 		"pcb/wr2-base",
--- a/boards/wr2l.json
+++ b/boards/wr2l.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"realtek-ambz-bx",
 		"ic/rtl8710bn",
--- a/boards/wr2le.json
+++ b/boards/wr2le.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"realtek-ambz-bx",
 		"ic/rtl8710bn",
--- a/boards/wr3.json
+++ b/boards/wr3.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"ic/rtl8710bn",
 		"pcb/wr3-base",
--- a/boards/wr3e.json
+++ b/boards/wr3e.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"ic/rtl8710bn",
 		"pcb/wr3-base",
--- a/boards/wr3l.json
+++ b/boards/wr3l.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"realtek-ambz-bx",
 		"ic/rtl8710bn",
--- a/boards/wr3le.json
+++ b/boards/wr3le.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"realtek-ambz-bx",
 		"ic/rtl8710bn",
--- a/boards/wr3n.json
+++ b/boards/wr3n.json
@@ -1,6 +1,7 @@
 {
 	"_base": [
 		"realtek-ambz",
+		"realtek-ambz-tuya",
 		"realtek-ambz-2mb-788k",
 		"ic/rtl8710bn",
 		"pcb/wr3-base",
--- a/cores/common/base/lt_types.h
+++ b/cores/common/base/lt_types.h
@@ -40,6 +40,7 @@ typedef enum {
 	RTL8711BU = CPU_MODEL(F_RTL8710B, 0xFC), // CHIPID_8711BG / QFN68
 	MX1290	  = RTL8710BN,
 	MX1290V2  = RTL8710BX,
+	W302	  = RTL8710BN,
 	// Realtek AmebaZ2 (chip_id << 2 | flash_mode)
 	RTL8720CM = CPU_MODEL(F_RTL8720C, 0xEC), // 0xFB << 2 | 0
 	RTL8720CF = CPU_MODEL(F_RTL8720C, 0xED), // 0xFB << 2 | 1
--- a/docs/boards_tuya_all.json
+++ b/docs/boards_tuya_all.json
@@ -441,6 +441,34 @@
 			"datasheet_id": "Kc5x1p35fs5zf"
 		}
 	},
+	"t2": {
+		"t2-u": {
+			"mcu": "bk7231n",
+			"flash": 2097152,
+			"ram": 262144,
+			"pins_total": 21,
+			"connectivity": [
+				"wifi",
+				"ble"
+			],
+			"datasheet_name": "T2-U-module-datasheet",
+			"datasheet_id": "Kce1tncb80ldq"
+		}
+	},
+	"t1": {
+		"t1-2s": {
+			"mcu": "t1a",
+			"flash": 1048576,
+			"ram": 294912,
+			"pins_total": 11,
+			"connectivity": [
+				"wifi",
+				"ble"
+			],
+			"datasheet_name": "T1-2S-module-datasheet",
+			"datasheet_id": "Kcl2d5xjy1rly"
+		}
+	},
 	"axy": {
 		"axy2s": {
 			"mcu": "ecr6600",
@@ -493,7 +521,7 @@
 	},
 	"wt": {
 		"wt3": {
-			"mcu": "t2",
+			"mcu": "bk7231n",
 			"flash": 2097152,
 			"ram": 262144,
 			"pins_total": 16,