From 916fc2cd73ff95dd4f1c78e5052b7aedb8718b6f Mon Sep 17 00:00:00 2001 From: Karol Trzcinski Date: Tue, 31 Aug 2021 11:26:31 +0200 Subject: [PATCH] config: Remove unused adsp structs After commit 2965908 "manifest: Remove -m option" those structs are unused. ADSP configuration comes from toml configuration files. Signed-off-by: Karol Trzcinski --- src/file_simple.c | 178 ------------------------------------ src/include/rimage/rimage.h | 18 ---- 2 files changed, 196 deletions(-) diff --git a/src/file_simple.c b/src/file_simple.c index cd1fa0d27..43aa175c3 100644 --- a/src/file_simple.c +++ b/src/file_simple.c @@ -380,181 +380,3 @@ int simple_write_firmware(struct image *image) return 0; } - -const struct adsp machine_byt = { - .name = "byt", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = BYT_IRAM_BASE, - .size = BYT_IRAM_SIZE, - .host_offset = BYT_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = BYT_DRAM_BASE, - .size = BYT_DRAM_SIZE, - .host_offset = BYT_DRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_BAYTRAIL, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_cht = { - .name = "cht", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = BYT_IRAM_BASE, - .size = BYT_IRAM_SIZE, - .host_offset = BYT_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = BYT_DRAM_BASE, - .size = BYT_DRAM_SIZE, - .host_offset = BYT_DRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_CHERRYTRAIL, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_bsw = { - .name = "bsw", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = BYT_IRAM_BASE, - .size = BYT_IRAM_SIZE, - .host_offset = BYT_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = BYT_DRAM_BASE, - .size = BYT_DRAM_SIZE, - .host_offset = BYT_DRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_BRASWELL, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_hsw = { - .name = "hsw", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = HSW_IRAM_BASE, - .size = HSW_IRAM_SIZE, - .host_offset = HSW_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = HSW_DRAM_BASE, - .size = HSW_DRAM_SIZE, - .host_offset = HSW_DRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_HASWELL, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_bdw = { - .name = "bdw", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = BDW_IRAM_BASE, - .size = BDW_IRAM_SIZE, - .host_offset = BDW_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = BDW_DRAM_BASE, - .size = BDW_DRAM_SIZE, - .host_offset = BDW_DRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_BROADWELL, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_imx8 = { - .name = "imx8", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = IMX8_IRAM_BASE, - .size = IMX8_IRAM_SIZE, - .host_offset = IMX8_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = IMX8_DRAM_BASE, - .size = IMX8_DRAM_SIZE, - .host_offset = 0, - }, - [SOF_FW_BLK_TYPE_SRAM] = { - .base = IMX8_SRAM_BASE, - .size = IMX8_SRAM_SIZE, - .host_offset = 0, - }, - }, - .machine_id = MACHINE_IMX8, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_imx8x = { - .name = "imx8x", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = IMX8_IRAM_BASE, - .size = IMX8_IRAM_SIZE, - .host_offset = IMX8_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = IMX8_DRAM_BASE, - .size = IMX8_DRAM_SIZE, - .host_offset = 0, - }, - [SOF_FW_BLK_TYPE_SRAM] = { - .base = IMX8_SRAM_BASE, - .size = IMX8_SRAM_SIZE, - .host_offset = 0, - }, - }, - .machine_id = MACHINE_IMX8X, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_imx8m = { - .name = "imx8m", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = IMX8M_IRAM_BASE, - .size = IMX8M_IRAM_SIZE, - .host_offset = IMX8M_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_DRAM] = { - .base = IMX8M_DRAM_BASE, - .size = IMX8M_DRAM_SIZE, - .host_offset = 0, - }, - [SOF_FW_BLK_TYPE_SRAM] = { - .base = IMX8M_SRAM_BASE, - .size = IMX8M_SRAM_SIZE, - .host_offset = 0, - }, - }, - .machine_id = MACHINE_IMX8M, - .write_firmware = simple_write_firmware, -}; - -const struct adsp machine_mt8195= { - .name = "mt8195", - .mem_zones = { - [SOF_FW_BLK_TYPE_IRAM] = { - .base = MT8195_IRAM_BASE, - .size = MT8195_IRAM_SIZE, - .host_offset = MT8195_IRAM_HOST_OFFSET, - }, - [SOF_FW_BLK_TYPE_SRAM] = { - .base = MT8195_SRAM_BASE, - .size = MT8195_SRAM_SIZE, - .host_offset = MT8195_SRAM_HOST_OFFSET, - }, - }, - .machine_id = MACHINE_MT8195, - .write_firmware = simple_write_firmware, -}; - diff --git a/src/include/rimage/rimage.h b/src/include/rimage/rimage.h index e62adb33d..75ce5dd8b 100644 --- a/src/include/rimage/rimage.h +++ b/src/include/rimage/rimage.h @@ -234,22 +234,4 @@ int elf_read_section(const struct module *module, const char *name, int elf_validate_section(struct image *image, struct module *module, Elf32_Shdr *section, int index); -/* supported machines */ -extern const struct adsp machine_byt; -extern const struct adsp machine_cht; -extern const struct adsp machine_bsw; -extern const struct adsp machine_hsw; -extern const struct adsp machine_bdw; -extern const struct adsp machine_apl; -extern const struct adsp machine_cnl; -extern const struct adsp machine_icl; -extern const struct adsp machine_jsl; -extern const struct adsp machine_tgl; -extern const struct adsp machine_sue; -extern const struct adsp machine_skl; -extern const struct adsp machine_kbl; -extern const struct adsp machine_imx8; -extern const struct adsp machine_imx8x; -extern const struct adsp machine_imx8m; - #endif