Commit a701177b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: cfg: clean up Bz module firmware lines 



Remove module firmware lines for images that don't exist
as well as some unused macros, and add gl-a-fm-a that
(still) exists.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130444.b399b0072d72.Ie7ca1b3dcdebc929ce96a739e0d557fac2c8aeeb@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f4daceae

drivers/net/wireless/intel/iwlwifi/cfg/bz.c

+2 −22
Original line number Diff line number Diff line
@@ -26,35 +26,24 @@ 
#define IWL_BZ_SMEM_OFFSET		0x400000

#define IWL_BZ_SMEM_LEN			0xD0000



#define IWL_BZ_A_HR_A_FW_PRE		"iwlwifi-bz-a0-hr-b0"

#define IWL_BZ_A_HR_B_FW_PRE		"iwlwifi-bz-a0-hr-b0"

#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0"

#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0"

#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0"

#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0"

#define IWL_BZ_A_FM4_A_FW_PRE		"iwlwifi-bz-a0-fm4-a0"

#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0"

#define IWL_BZ_A_FM_C_FW_PRE		"iwlwifi-bz-a0-fm-c0"

#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-fm4-b0"

#define IWL_BZ_B_GF_A_FW_PRE		"iwlwifi-bz-b0-gf-a0"

#define IWL_BZ_B_GF4_A_FW_PRE		"iwlwifi-bz-b0-gf4-a0"

#define IWL_BZ_B_FM_B_FW_PRE		"iwlwifi-bz-b0-fm-b0"

#define IWL_BZ_B_FM4_B_FW_PRE		"iwlwifi-bz-b0-fm4-b0"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm-a0"

#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0"

#define IWL_GL_C_FM_C_FW_PRE		"iwlwifi-gl-c0-fm-c0"

#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0"



#define IWL_BZ_A_HR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_MR_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_FM_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_A_MODULE_FIRMWARE(api) \
@@ -65,14 +54,6 @@ 
		IWL_BZ_A_FM_C_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_FM4_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_B_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_B_GF_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_B_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BZ_B_GF4_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BZ_B_FM_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_BZ_B_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BZ_B_FM4_B_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_GL_A_FM_A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL_GL_B_FM_B_MODULE_FIRMWARE(api) \
@@ -216,16 +197,15 @@ const struct iwl_cfg iwl_cfg_gl = { 
};





MODULE_FIRMWARE(IWL_BZ_A_HR_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));



MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_C_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));