Skip to content

Commit 7e0a9d8

Browse files
committed
rimage: add 1.5 rimage defines
add 1.5 rimage defines for skl and kbl Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>
1 parent 5d6a43c commit 7e0a9d8

3 files changed

Lines changed: 36 additions & 0 deletions

File tree

rimage/manifest.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,34 @@ const struct adsp machine_apl = {
10151015
.man_v1_8 = &apl_manifest,
10161016
};
10171017

1018+
const struct adsp machine_kbl = {
1019+
.name = "kbl",
1020+
.rom_base = ADSP_APL_DSP_ROM_BASE,
1021+
.rom_size = ADSP_APL_DSP_ROM_SIZE,
1022+
.sram_base = APL_DSP_BASE_ENTRY,
1023+
.sram_size = 0x100000,
1024+
.image_size = 0x100000,
1025+
.dram_offset = 0,
1026+
.machine_id = MACHINE_KABYLAKE,
1027+
.write_firmware = man_write_fw_v1_5,
1028+
.write_firmware_meu = man_write_fw_meu_v1_5,
1029+
.man_v1_5 = &kbl_manifest,
1030+
};
1031+
1032+
const struct adsp machine_skl = {
1033+
.name = "skl",
1034+
.rom_base = ADSP_APL_DSP_ROM_BASE,
1035+
.rom_size = ADSP_APL_DSP_ROM_SIZE,
1036+
.sram_base = APL_DSP_BASE_ENTRY,
1037+
.sram_size = 0x100000,
1038+
.image_size = 0x100000,
1039+
.dram_offset = 0,
1040+
.machine_id = MACHINE_SKYLAKE,
1041+
.write_firmware = man_write_fw_v1_5,
1042+
.write_firmware_meu = man_write_fw_meu_v1_5,
1043+
.man_v1_5 = &kbl_manifest,
1044+
};
1045+
10181046
const struct adsp machine_cnl = {
10191047
.name = "cnl",
10201048
.rom_base = ADSP_CNL_DSP_ROM_BASE,

rimage/rimage.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ static const struct adsp *machine[] = {
3333
&machine_cnl,
3434
&machine_icl,
3535
&machine_sue,
36+
&machine_kbl,
37+
&machine_skl,
3638
};
3739

3840
static void usage(char *name)

rimage/rimage.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ enum machine_id {
3939
MACHINE_HASWELL,
4040
MACHINE_BROADWELL,
4141
MACHINE_APOLLOLAKE,
42+
MACHINE_KABYLAKE,
43+
MACHINE_SKYLAKE,
4244
MACHINE_CANNONLAKE,
4345
MACHINE_ICELAKE,
4446
MACHINE_SUECREEK,
@@ -148,6 +150,7 @@ struct adsp {
148150
int (*write_firmware)(struct image *image);
149151
int (*write_firmware_meu)(struct image *image);
150152
struct fw_image_manifest_v1_8 *man_v1_8;
153+
struct fw_image_manifest_v1_5 *man_v1_5;
151154
};
152155

153156
int write_logs_dictionary(struct image *image);
@@ -181,5 +184,8 @@ extern const struct adsp machine_apl;
181184
extern const struct adsp machine_cnl;
182185
extern const struct adsp machine_icl;
183186
extern const struct adsp machine_sue;
187+
extern const struct adsp machine_skl;
188+
extern const struct adsp machine_kbl;
189+
184190

185191
#endif

0 commit comments

Comments
 (0)