[beken-72xx] Rename BK7231U to BK7231T, add BK7231Q family

2023-06-20 17:19:11 +02:00
parent 6af97d2691
commit 05e13dafed
28 changed files with 93 additions and 53 deletions
--- a/boards/_base/beken-7231-crypt-tuya.json
+++ b/boards/_base/beken-7231-crypt-tuya.json
@@ -0,0 +1,5 @@
+{
+	"build": {
+		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03"
+	}
+}
--- a/boards/_base/beken-7231.json
+++ b/boards/_base/beken-7231.json
@@ -0,0 +1,10 @@
+{
+	"build": {
+		"ldscript": "bk7231_bsp.ld",
+		"bkoffset_app": "0x10000",
+		"bkrbl_size_app": "0x108700"
+	},
+	"upload": {
+		"maximum_size": 1083136
+	}
+}
--- a/boards/_base/beken-7231n-tuya.json
+++ b/boards/_base/beken-7231n-tuya.json
@@ -1,6 +0,0 @@
-{
-	"build": {
-		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
-		"bkboot_version": "1.0.1-bk7231n"
-	}
-}
--- a/boards/_base/beken-7231q.json
+++ b/boards/_base/beken-7231q.json
@@ -0,0 +1,19 @@
+{
+	"build": {
+		"family": "BK7231Q",
+		"bkboot_version": "bk7231q"
+	},
+	"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": {
+		"speed": 460800
+	}
+}
--- a/boards/_base/beken-7231t-tuya.json
+++ b/boards/_base/beken-7231t-tuya.json
@@ -1,6 +0,0 @@
-{
-	"build": {
-		"bkcrypt_coeffs": "510fb093a3cbeadc5993a17ec7adeb03",
-		"bkboot_version": "1.0.5-bk7231s"
-	}
-}
--- a/boards/_base/beken-7231t.json
+++ b/boards/_base/beken-7231t.json
@@ -1,10 +1,7 @@
 {
 	"build": {
-		"family": "BK7231U",
-		"ldscript": "bk7231_bsp.ld",
-		"bkboot_version": "1.0.8-bk7231u",
-		"bkoffset_app": "0x10000",
-		"bkrbl_size_app": "0x108700"
+		"family": "BK7231T",
+		"bkboot_version": "1.0.5-bk7231s"
 	},
 	"flash": {
 		"bootloader": "0x000000+0x11000",
@@ -17,7 +14,6 @@
 		"userdata": "0x1E3000+0x1D000"
 	},
 	"upload": {
-		"maximum_size": 1083136,
 		"speed": 921600
 	},
 	"connectivity": [
--- a/boards/cb1s.json
+++ b/boards/cb1s.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb1s",
 		"pcb/cb1s-test"
--- a/boards/cb2l.json
+++ b/boards/cb2l.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb2l",
 		"pcb/cb2l-test"
--- a/boards/cb2s.json
+++ b/boards/cb2s.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb2s",
 		"pcb/cb2s-test"
--- a/boards/cb3l.json
+++ b/boards/cb3l.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb3l"
 	],
--- a/boards/cb3s.json
+++ b/boards/cb3s.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb3s"
 	],
--- a/boards/cb3se.json
+++ b/boards/cb3se.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cb3se"
 	],
--- a/boards/cblc5.json
+++ b/boards/cblc5.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/cblc5",
 		"pcb/cblc5-test"
--- a/boards/cbu.json
+++ b/boards/cbu.json
@@ -2,7 +2,7 @@
  "_base": [
    "beken-72xx",
    "beken-7231n",
-    "beken-7231n-tuya",
+    "beken-7231-crypt-tuya",
    "ic/bk7231-qfn32",
    "pcb/cbu",
    "pcb/cbu-test"
--- a/boards/generic-bk7231n-qfn32-tuya.json
+++ b/boards/generic-bk7231n-qfn32-tuya.json
@@ -3,7 +3,7 @@
 		"generic",
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32"
 	],
 	"build": {
--- a/boards/generic-bk7231t-qfn32-tuya.json
+++ b/boards/generic-bk7231t-qfn32-tuya.json
@@ -2,8 +2,9 @@
 	"_base": [
 		"generic",
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32"
 	],
 	"build": {
--- a/boards/lsc-lma35-t.json
+++ b/boards/lsc-lma35-t.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/lsc-lma35"
 	],
--- a/boards/lsc-lma35.json
+++ b/boards/lsc-lma35.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/lsc-lma35"
 	],
@@ -10,8 +10,8 @@
 		"mcu": "bk7231n",
 		"variant": "lsc-lma35"
 	},
-	"name": "LSC LMA35",
-	"symbol": "LSC LMA35",
+	"name": "LSC LMA35 BK7231N",
+	"symbol": "LSC LMA35 N",
 	"url": "https://www.action.com/de-at/p/lsc-smart-connect-outdoor-led-streifen/",
 	"vendor": "Unknown",
 	"pcb": {
--- a/boards/wb1s.json
+++ b/boards/wb1s.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb1s"
 	],
--- a/boards/wb2l-m1.json
+++ b/boards/wb2l-m1.json
@@ -2,7 +2,7 @@
 	"_base": [
 		"beken-72xx",
 		"beken-7231n",
-		"beken-7231n-tuya",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb2l",
 		"pcb/wb2l-test",
--- a/boards/wb2l.json
+++ b/boards/wb2l.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb2l",
 		"pcb/wb2l-test"
--- a/boards/wb2s.json
+++ b/boards/wb2s.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb2s",
 		"pcb/wb2s-test"
--- a/boards/wb3l.json
+++ b/boards/wb3l.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb3l"
 	],
--- a/boards/wb3s.json
+++ b/boards/wb3s.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wb3s"
 	],
--- a/boards/wblc5.json
+++ b/boards/wblc5.json
@@ -1,8 +1,9 @@
 {
 	"_base": [
 		"beken-72xx",
-		"beken-7231u",
-		"beken-7231t-tuya",
+		"beken-7231",
+		"beken-7231t",
+		"beken-7231-crypt-tuya",
 		"ic/bk7231-qfn32",
 		"pcb/wblc5",
 		"pcb/wblc5-test"
--- a/cores/beken-7231t/base/config/sys_config.h
+++ b/cores/beken-7231t/base/config/sys_config.h
--- a/cores/common/base/lt_types.h
+++ b/cores/common/base/lt_types.h
@@ -22,7 +22,8 @@ typedef enum {
 	F_RTL8710B = 0x22E0D6FC, // Realtek AmebaZ (realtek-ambz)
 	F_RTL8720C = 0xE08F7564, // Realtek AmebaZ2
 	F_RTL8720D = 0x3379CFE2, // Realtek AmebaD
-	F_BK7231U  = 0x675A40B0, // Beken 7231U/7231T
+	F_BK7231Q  = 0xAFE81D49, // Beken 7231Q
+	F_BK7231T  = 0x675A40B0, // Beken 7231T
 	F_BK7231N  = 0x7B3EF230, // Beken 7231N
 	F_BK7251   = 0x6A82CC42, // Beken 7251/7252
 	F_BL60X	   = 0xDE1270B7, // Boufallo 602
@@ -41,7 +42,8 @@ typedef enum {
 	MX1290	  = RTL8710BN,
 	MX1290V2  = RTL8710BX,
 	// Beken 72XX
-	BK7231T = CPU_MODEL(F_BK7231U, 0x1A), // *SCTRL_CHIP_ID = 0x7231a
+	BK7231Q = CPU_MODEL(F_BK7231Q, 0x31), // *SCTRL_CHIP_ID = 0x7231
+	BK7231T = CPU_MODEL(F_BK7231T, 0x1A), // *SCTRL_CHIP_ID = 0x7231a
 	BK7231N = CPU_MODEL(F_BK7231N, 0x1C), // *SCTRL_CHIP_ID = 0x7231c
 	BK7252	= CPU_MODEL(F_BK7251, 0x00),  // TODO
 	BL2028N = BK7231N,
--- a/families.json
+++ b/families.json
@@ -51,12 +51,24 @@
 		"code": "bk72xxgen2",
 		"description": "Beken 72xx (RISC-V & ARM)"
 	},
-	"beken-7231u": {
+	"beken-7231": {
 		"parent": "beken-72xx-gen1",
-		"code": "bk7231u",
-		"description": "Beken 7231U/7231T",
+		"code": "bk7231",
+		"description": "Beken 7231"
+	},
+	"beken-7231q": {
+		"parent": "beken-7231",
+		"code": "bk7231q",
+		"description": "Beken 7231Q",
+		"id": "0xAFE81D49",
+		"short_name": "BK7231Q"
+	},
+	"beken-7231t": {
+		"parent": "beken-7231",
+		"code": "bk7231t",
+		"description": "Beken 7231T",
 		"id": "0x675A40B0",
-		"short_name": "BK7231U"
+		"short_name": "BK7231T"
 	},
 	"beken-7231n": {
 		"parent": "beken-72xx-gen1",