wifi: remove firmware library

The library is merely an historical artifact and the raw archive is
better used in its place.

Issue #4813
This commit is contained in:
Josef Söntgen 2023-04-12 13:56:12 +02:00 committed by Christian Helmuth
parent 2b4246c59b
commit 8f91f119b8
4 changed files with 6 additions and 79 deletions

View File

@ -1,32 +0,0 @@
#
# Pseudo library to copy wireless LAN firmware to build directory
#
FW_CONTRIB_DIR := $(call select_from_ports,linux-firmware)
IMAGES := $(notdir $(wildcard $(FW_CONTRIB_DIR)/firmware/*.ucode))
IMAGES += $(notdir $(wildcard $(FW_CONTRIB_DIR)/firmware/*.pnvm))
IMAGES += $(notdir $(wildcard $(FW_CONTRIB_DIR)/firmware/*.bin))
IMAGES += $(notdir $(wildcard $(FW_CONTRIB_DIR)/firmware/*.db))
IMAGES += $(notdir $(wildcard $(FW_CONTRIB_DIR)/firmware/*.p7s))
BIN_DIR := $(BUILD_BASE_DIR)/bin
FW_DIR := $(FW_CONTRIB_DIR)/firmware
CUSTOM_TARGET_DEPS += $(addprefix $(BIN_DIR)/,$(IMAGES))
$(BIN_DIR)/%.bin: $(FW_DIR)/%.bin
$(VERBOSE)cp $^ $@
$(BIN_DIR)/%.ucode: $(FW_DIR)/%.ucode
$(VERBOSE)cp $^ $@
$(BIN_DIR)/%.pnvm: $(FW_DIR)/%.pnvm
$(VERBOSE)cp $^ $@
$(BIN_DIR)/%.db: $(FW_DIR)/%.db
$(VERBOSE)cp $^ $@
$(BIN_DIR)/%.p7s: $(FW_DIR)/%.p7s
$(VERBOSE)cp $^ $@
CC_CXX_WARN_STRICT =

View File

@ -2,7 +2,7 @@
# Driver portions
#
LIB_MK := $(addprefix lib/mk/,wifi_firmware.mk wifi.inc vfs_wifi.mk) \
LIB_MK := $(addprefix lib/mk/,wifi.inc vfs_wifi.mk) \
$(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/wifi.mk) \
MIRROR_FROM_REP_DIR := src/drivers/wifi/pc \

View File

@ -63,6 +63,9 @@ assert_spec x86
# Build
#
create_boot_directory
import_from_depot [depot_user]/raw/wifi_firmware
set build_components {
core init timer
app/pci_decode
@ -81,8 +84,6 @@ set build_components {
build $build_components
create_boot_directory
#
# Generate config
#
@ -300,53 +301,11 @@ append config {
install_config $config
set firmware_modules {
iwlwifi-1000-5.ucode
iwlwifi-3160-17.ucode
iwlwifi-3168-29.ucode
iwlwifi-5000-5.ucode
iwlwifi-6000-4.ucode
iwlwifi-6000g2a-6.ucode
iwlwifi-6000g2b-6.ucode
iwlwifi-7260-17.ucode
iwlwifi-7265-17.ucode
iwlwifi-7265D-29.ucode
iwlwifi-8000C-36.ucode
iwlwifi-8265-36.ucode
iwlwifi-9000-pu-b0-jf-b0-46.ucode
iwlwifi-9260-th-b0-jf-b0-46.ucode
iwlwifi-QuZ-a0-hr-b0-68.ucode
iwlwifi-so-a0-gf-a0-68.ucode
iwlwifi-so-a0-gf-a0.pnvm
iwlwifi-so-a0-hr-b0-68.ucode
iwlwifi-ty-a0-gf-a0-68.ucode
iwlwifi-ty-a0-gf-a0.pnvm
rtl8192eu_nic.bin
rtl8188efw.bin
regulatory.db
regulatory.db.p7s
}
#
# Boot modules
#
# generic modules
set boot_modules {
core ld.lib.so init timer rtc_drv report_rom dynamic_rom
vfs_jitterentropy.lib.so
libc.lib.so vfs.lib.so libcrypto.lib.so libssl.lib.so
wpa_driver_nl80211.lib.so wpa_supplicant.lib.so
pc_wifi_drv wifi.lib.so vfs_wifi.lib.so
nic_router
platform_drv acpi_drv pci_decode
test-lwip_httpsrv
vfs_lwip.lib.so
}
append boot_modules $firmware_modules
build_boot_image $boot_modules
build_boot_image [build_artifacts]
run_genode_until forever

View File

@ -1,6 +1,6 @@
TARGET := pc_wifi_drv
SRC_CC := main.cc wpa.cc
LIBS := base wifi wifi_firmware
LIBS := base wifi
LIBS += libc
LIBS += wpa_supplicant
LIBS += libcrypto libssl wpa_driver_nl80211