Skip to content

Commit b1169be

Browse files
committed
ccgx: Add silicon ID of Framework 13 Intel 12th Gen
Signed-off-by: Daniel Schaefer <dhs@frame.work>
1 parent 4416d38 commit b1169be

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

framework_lib/src/ccgx/binary.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn read_metadata(
106106
let buffer = read_256_bytes(file_buffer, metadata_offset, flash_row_size)?;
107107
match ccgx {
108108
SiliconId::Ccg3 => parse_metadata_ccg3(&buffer),
109-
SiliconId::Ccg5 | SiliconId::Ccg6 => parse_metadata_cyacd(&buffer),
109+
SiliconId::Ccg5 | SiliconId::Ccg6Adl | SiliconId::Ccg6 => parse_metadata_cyacd(&buffer),
110110
SiliconId::Ccg8 => parse_metadata_cyacd2(&buffer)
111111
.map(|(fw_row_start, fw_size)| (fw_row_start / (flash_row_size as u32), fw_size)),
112112
}
@@ -172,6 +172,7 @@ pub fn read_versions(file_buffer: &[u8], ccgx: SiliconId) -> Option<PdFirmwareFi
172172
let (flash_row_size, f1_metadata_row, fw2_metadata_row) = match ccgx {
173173
SiliconId::Ccg3 => (SMALL_ROW, 0x03FF, 0x03FE),
174174
SiliconId::Ccg5 => (LARGE_ROW, FW1_METADATA_ROW, FW2_METADATA_ROW_CCG5),
175+
SiliconId::Ccg6Adl => (SMALL_ROW, FW1_METADATA_ROW, FW2_METADATA_ROW_CCG6),
175176
SiliconId::Ccg6 => (SMALL_ROW, FW1_METADATA_ROW, FW2_METADATA_ROW_CCG6),
176177
SiliconId::Ccg8 => (LARGE_ROW, FW1_METADATA_ROW_CCG8, FW2_METADATA_ROW_CCG8),
177178
};

framework_lib/src/ccgx/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ struct CyAcd2Metadata {
105105
pub enum SiliconId {
106106
Ccg3 = 0x1D00,
107107
Ccg5 = 0x2100,
108-
Ccg6 = 0x3000,
108+
Ccg6Adl = 0x3000,
109+
Ccg6 = 0x30A0,
109110
Ccg8 = 0x3580,
110111
}
111112

0 commit comments

Comments
 (0)