diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config index bdd17ea97..8534433dc 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config @@ -806,10 +806,17 @@ CONFIG_BQL=y # CONFIG_AF_KCM is not set # CONFIG_STREAM_PARSER is not set CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_PRIV=y +# Wireless extensions went with R8188EU below, which was the only symbol here +# that selected WIRELESS_EXT. CFG80211_WEXT cannot stand in for it: it selects +# WEXT_CORE, while net_device.wireless_handlers is #ifdef CONFIG_WIRELESS_EXT. +# Nothing on these images needs it. mt7601u is a mac80211 driver and +# wpa_supplicant drives it over nl80211; the WebUI's Wi-Fi scan calls wpa_cli +# first and only falls back to iwlist behind a `command -v` guard; and the +# out-of-tree rtl8188fu/rtl8189fs the ultimate ships are compiled with +# -DCONFIG_IOCTL_CFG80211, so they register a wiphy and keep working. What goes +# is iwconfig/iwlist/iwpriv, which already did nothing for mt7601u because +# CFG80211_WEXT is off below. This is #2404 in reverse -- there R8188EU had to +# stay on hi3519v101 because out-of-tree drivers needed the wext ABI. CONFIG_CFG80211=y # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set @@ -1103,43 +1110,15 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 # # SCSI device support # -CONFIG_SCSI_MOD=m +# Nothing on this SoC can reach a SCSI disk. USB_STORAGE and USB_EHCI_HCD are +# both off and CONFIG_ATA is unset, so not one SCSI transport is built, and no +# module in the image depends on scsi_mod or sd_mod. The SD/eMMC controller +# further down is not a counter-example: MMC_BLOCK serves those cards as mmcblk, +# which never enters the SCSI layer. So this was 185KB of .ko that no code path +# could load. Same removal as #2399 made for hi3518ev200. +CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_NETLINK=y -# CONFIG_SCSI_MQ_DEFAULT is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_ISCSI_BOOT_SYSFS is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_LIBFC is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_DH is not set +# CONFIG_SCSI is not set # CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set # CONFIG_MD is not set @@ -2048,8 +2027,19 @@ CONFIG_STAGING=y # CONFIG_COMEDI is not set # CONFIG_RTLLIB is not set # CONFIG_R8712U is not set -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y +# The in-tree staging driver was never reachable here. /etc/wireless/usb's +# rtl8188eu-generic profile runs `modprobe 8188eu`, which is the out-of-tree +# rtl8188eus-openipc module; nothing ever modprobes `r8188eu`, there is no USB +# hotplug modprobe rule, and S40network only dispatches on the `wlandev` U-Boot +# variable. So 431KB of .ko and the 15KB rtlwifi/rtl8188eufw.bin blob that feeds +# it shipped on every hi3518ev300 image with no path that could load them. +# MT7601U is the adapter this tree standardises on: its firmware is enabled on +# four times as many defconfigs, and every board that carries the 8188EU blob +# carries the MT7601U one too. So the SoC keeps one USB Wi-Fi stack, and an +# 8188EU dongle is served by an OpenIPC/builder camera profile selecting +# rtl8188eus-openipc -- which builds `8188eu`, the module the rtl8188eu-generic +# profile has been modprobing all along. +# CONFIG_R8188EU is not set # CONFIG_VT6656 is not set # diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig index 1f9e1f0a8..4d2358bad 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev300_lite_defconfig @@ -60,7 +60,6 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL_8188EU=y BR2_PACKAGE_MAJESTIC_WEBUI=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig index 15bc9dc1c..abec911fd 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig @@ -69,7 +69,6 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL_8188EU=y BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_WEBUI=y