serial: 新增 CMD_READ_FLASH_ID 以读取 flash id

LISTENAI · Aug 8, 2022 · d1fe5f9 · d1fe5f9
1 parent 2b173bb
commit d1fe5f9
Show file tree

Hide file tree

Showing 8 changed files with 2,326 additions and 2,299 deletions.
diff --git a/libcskburn_serial/burner_4.img b/libcskburn_serial/burner_4.img
diff --git a/libcskburn_serial/burner_6.img b/libcskburn_serial/burner_6.img
diff --git a/libcskburn_serial/include/cskburn_serial.h b/libcskburn_serial/include/cskburn_serial.h
@@ -27,6 +27,7 @@ bool cskburn_serial_verify(
 		cskburn_serial_device_t *dev, uint32_t addr, uint32_t size, uint8_t *md5);
 
 bool cskburn_serial_read_chip_id(cskburn_serial_device_t *dev, uint64_t *chip_id);
+bool cskburn_serial_read_flash_id(cskburn_serial_device_t *dev, uint32_t *flash_id);
 
 bool cskburn_serial_reset(cskburn_serial_device_t *dev, uint32_t reset_delay);
 

diff --git a/libcskburn_serial/src/burner_4_img.c b/libcskburn_serial/src/burner_4_img.c
diff --git a/libcskburn_serial/src/burner_6_img.c b/libcskburn_serial/src/burner_6_img.c
diff --git a/libcskburn_serial/src/cmd.c b/libcskburn_serial/src/cmd.c
@@ -32,6 +32,7 @@
 #ifdef FEATURE_MD5_CHALLENGE
 #define CMD_FLASH_MD5_CHALLENGE 0xF2
 #endif  // FEATURE_MD5_CHALLENGE
+#define CMD_READ_FLASH_ID 0xF3
 
 #define CHECKSUM_MAGIC 0xef
 #define CHECKSUM_NONE 0
@@ -294,6 +295,12 @@ cmd_read_reg(cskburn_serial_device_t *dev, uint32_t reg, uint32_t *val)
 	return !check_command(dev, CMD_READ_REG, sizeof(reg), CHECKSUM_NONE, val, TIMEOUT_DEFAULT);
 }
 
+bool
+cmd_read_flash_id(cskburn_serial_device_t *dev, uint32_t *id)
+{
+	return !check_command(dev, CMD_READ_FLASH_ID, 0, CHECKSUM_NONE, id, TIMEOUT_DEFAULT);
+}
+
 bool
 cmd_mem_begin(cskburn_serial_device_t *dev, uint32_t size, uint32_t blocks, uint32_t block_size,
 		uint32_t offset)

diff --git a/libcskburn_serial/src/cmd.h b/libcskburn_serial/src/cmd.h
@@ -1,9 +1,9 @@
 #ifndef __LIB_CSKBURN_SERIAL_CMD__
 #define __LIB_CSKBURN_SERIAL_CMD__
 
+#include <cskburn_serial.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cskburn_serial.h>
 
 typedef struct {
 	uint8_t direction;
@@ -39,6 +39,7 @@ typedef struct {
 bool cmd_sync(cskburn_serial_device_t *dev, uint16_t timeout);
 
 bool cmd_read_reg(cskburn_serial_device_t *dev, uint32_t reg, uint32_t *val);
+bool cmd_read_flash_id(cskburn_serial_device_t *dev, uint32_t *id);
 
 bool cmd_mem_begin(cskburn_serial_device_t *dev, uint32_t size, uint32_t blocks,
 		uint32_t block_size, uint32_t offset);

diff --git a/libcskburn_serial/src/core.c b/libcskburn_serial/src/core.c
@@ -329,6 +329,12 @@ cskburn_serial_read_chip_id(cskburn_serial_device_t *dev, uint64_t *chip_id)
 	return true;
 }
 
+bool
+cskburn_serial_read_flash_id(cskburn_serial_device_t *dev, uint32_t *flash_id)
+{
+	return cmd_read_flash_id(dev, flash_id);
+}
+
 bool
 cskburn_serial_reset(cskburn_serial_device_t *dev, uint32_t reset_delay)
 {