iwlwifi: mvm: support additional nvm_file in family 8000 B step

nvm_file in family 8000 B step and A step differ. This means
that the driver should support 2 file name as default.

Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --cc drivers/net/wireless/iwlwifi/iwl-8000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-config.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
Simple merge