With msm-firmware-loader it's possible to use common package for both variants and prompt the user if they need the modem or not.
Nikita Travkin