diff options
| author | Ram Muthiah <rammuthiah@google.com> | 2024-02-19 06:18:37 -0800 |
|---|---|---|
| committer | Ram Muthiah <rammuthiah@google.com> | 2024-02-19 16:03:07 +0000 |
| commit | 2ed45852d824f6caa60f8c50cba91d0f4db6f93f (patch) | |
| tree | 10f33833e4327efd49b8e5fa91cd1563f1a613da | |
| parent | 2842ca27c6e2a9c9317bc80da1f79e75f0133340 (diff) | |
| download | cuttlefish-2ed45852d824f6caa60f8c50cba91d0f4db6f93f.tar.gz | |
Remove kernel module workaround for riscv cf
CF Riscv uses mainline which has the wifi modules
built as gki modules. Reference to these gki modules
has been added for the unrelated 6.6 kernel update
so this workaround can now be removed.
This reverts commit 41a730a9cb8b4c3243fca4c8d2154c8b5275eced.
Bug: 309328283
Test: Treehugger
Change-Id: I1c784eb4b489870f019ac7b99df78e2a1242ef9d
| -rw-r--r-- | shared/BoardConfig.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index e9b79475c..ed2bc4d04 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -68,7 +68,6 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \ # first stage init. To minimize scope of modules options to first stage init, # mac80211_hwsim.radios=0 has to be specified in the modules options file (which we # only read in first stage) and mac80211_hwsim has to be loaded in first stage consequently.. -ifneq ($(TARGET_KERNEL_ARCH),riscv64) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(SYSTEM_DLKM_SRC)/libarc4.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(SYSTEM_DLKM_SRC)/rfkill.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(SYSTEM_DLKM_SRC)/cfg80211.ko) @@ -77,7 +76,6 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(KERNEL_MODULES_PATH)/cfg8021 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(KERNEL_MODULES_PATH)/mac80211.ko) BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard $(KERNEL_MODULES_PATH)/mac80211_hwsim.ko) BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true -endif ALL_KERNEL_MODULES := $(wildcard $(KERNEL_MODULES_PATH)/*.ko) BOARD_VENDOR_KERNEL_MODULES := \ $(filter-out $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),\ |