diff options
author | Richard Fung <richardfung@google.com> | 2024-04-25 16:25:36 +0000 |
---|---|---|
committer | Richard Fung <richardfung@google.com> | 2024-05-06 22:13:28 +0000 |
commit | 7721fba968a15caa04f4b595ab0d2b99ce5f2f5b (patch) | |
tree | c37105c404819f1435dc7a75fadd0768445df92f | |
parent | 919b0b6be79fbc1b5f6345cffe9314b9770f6c89 (diff) | |
download | virtual-device-android13-5.15-arcvm.tar.gz |
Remove 9pnet and unused modulesandroid13-5.15-arcvm
9p is going to be built into the kernel binary in aosp/3073413. Removing
the other modules is necessary to support ARM, otherwise we will be
adding symbols for things we don't actually use.
Bug: 332937984
Test: tools/bazel run //common-modules/virtual-device:virtual_device_aarch64_dist
tast run $DUT arc.Boot.vm
Change-Id: I6e7ed3daf2b57e4c39131cf05faf1c5e4bc90e6b
-rw-r--r-- | BUILD.bazel | 54 | ||||
-rw-r--r-- | aarch64.fragment | 10 | ||||
-rw-r--r-- | build.config.virtual_device.aarch64 | 4 | ||||
-rw-r--r-- | build.config.virtual_device.x86_64 | 1 | ||||
-rw-r--r-- | virtual_device.fragment | 40 |
5 files changed, 11 insertions, 98 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 60330fc..dd24389 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -19,6 +19,7 @@ load("//build/bazel_common_rules/test_mappings:test_mappings.bzl", "test_mapping load( "//build/kernel/kleaf:kernel.bzl", "kernel_build", + "kernel_build_abi", "kernel_images", "kernel_module", "kernel_modules_install", @@ -50,37 +51,12 @@ filegroup( _virt_common_modules = [ # keep sorted - "btintel.ko", - "btrtl.ko", - "btusb.ko", - "cfg80211.ko", - "dummy-cpufreq.ko", - "dummy_hcd.ko", - "e1000.ko", "failover.ko", + "fs/9p/9p.ko", "goldfish_battery.ko", - "gs_usb.ko", - "hci_vhci.ko", - "mac80211.ko", - "mac80211_hwsim.ko", - "mt76.ko", - "mt76-usb.ko", - "mt76x0-common.ko", - "mt76x02-lib.ko", - "mt76x02-usb.ko", - "mt76x0u.ko", - "mt76x2-common.ko", - "mt76x2u.ko", "nd_virtio.ko", + "net/9p/9pnet_virtio.ko", "net_failover.ko", - "pulse8-cec.ko", - "rtc-test.ko", - "slcan.ko", - "system_heap.ko", - "usbip-core.ko", - "vcan.ko", - "vhci-hcd.ko", - "virt_wifi.ko", "virtio-rng.ko", "virtio_balloon.ko", "virtio_blk.ko", @@ -92,10 +68,7 @@ _virt_common_modules = [ "virtio_pci_modern_dev.ko", "virtio_pmem.ko", "virtio_snd.ko", - "vkms.ko", "vmw_vsock_virtio_transport.ko", - "zram.ko", - "zsmalloc.ko", ] _virt_common_ext_modules = [ @@ -104,9 +77,6 @@ _virt_common_ext_modules = [ "drivers/staging/dev-sw-sync/sw_sync.ko", "drivers/virtio/virtio_wl.ko", "fs/fuse/fuse_vendor.ko", - "goldfish_drivers/goldfish_address_space.ko", - "goldfish_drivers/goldfish_pipe.ko", - "goldfish_drivers/goldfish_sync.ko", ] kernel_build( @@ -117,9 +87,6 @@ kernel_build( build_config = "build.config.virtual_device.x86_64", module_outs = _virt_common_modules + [ # keep sorted - "fs/9p/9p.ko", - "net/9p/9pnet.ko", - "net/9p/9pnet_virtio.ko", "test_meminit.ko", "test_stackinit.ko", ], @@ -196,7 +163,7 @@ filegroup( ], ) -kernel_build( +kernel_build_abi( name = "virtual_device_aarch64", srcs = [":virtual_device_aarch64_common_sources"], outs = [ @@ -204,17 +171,12 @@ kernel_build( ], base_kernel = "//common:kernel_aarch64", build_config = "build.config.virtual_device.aarch64", + kernel_modules = [ + ":virtual_device_aarch64_external_modules", + ], + kmi_symbol_list = "//common:android/abi_gki_aarch64_arcvm", module_outs = _virt_common_modules + [ # keep sorted - "ambakmi.ko", - "armmmci.ko", - "clk-vexpress-osc.ko", - "open-dice.ko", - "pl111_drm.ko", - "psmouse.ko", - "vexpress-config.ko", - "vexpress-sysreg.ko", - "virtio_mmio.ko", ], ) diff --git a/aarch64.fragment b/aarch64.fragment index e152aec..e69de29 100644 --- a/aarch64.fragment +++ b/aarch64.fragment @@ -1,10 +0,0 @@ -CONFIG_CLK_VEXPRESS_OSC=m -CONFIG_DRM_PL111=m -CONFIG_MFD_VEXPRESS_SYSREG=m -CONFIG_MMC_ARMMMCI=m -CONFIG_MOUSE_PS2=m -CONFIG_OPEN_DICE=m -CONFIG_SERIO_AMBAKMI=m -CONFIG_VEXPRESS_CONFIG=m -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y diff --git a/build.config.virtual_device.aarch64 b/build.config.virtual_device.aarch64 index c0bcaea..b8d09d5 100644 --- a/build.config.virtual_device.aarch64 +++ b/build.config.virtual_device.aarch64 @@ -5,9 +5,11 @@ DEFCONFIG=vd_aarch_64_gki_defconfig PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common-modules/virtual-device/virtual_device.fragment ${ROOT_DIR}/common-modules/virtual-device/aarch64.fragment" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" -BUILD_GOLDFISH_DRIVERS=m EXT_MODULES="common-modules/virtual-device" # Not building/saving any kernel images. This build step is meant purely to generate the .kos. FILES="arch/arm64/boot/dts/arm/fvp-base-revc.dtb" MAKE_GOALS="modules arm/fvp-base-revc.dtb" + +KMI_SYMBOL_LIST=android/abi_gki_aarch64_arcvm +TRIM_NONLISTED_KMI=1 diff --git a/build.config.virtual_device.x86_64 b/build.config.virtual_device.x86_64 index fc4fbd9..a187e6d 100644 --- a/build.config.virtual_device.x86_64 +++ b/build.config.virtual_device.x86_64 @@ -5,7 +5,6 @@ DEFCONFIG=vd_x86_64_gki_defconfig PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/gki_defconfig ${ROOT_DIR}/common-modules/virtual-device/virtual_device.fragment" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/${DEFCONFIG}" -BUILD_GOLDFISH_DRIVERS=m EXT_MODULES="common-modules/virtual-device" # Not building/saving any kernel images. This build step is meant purely to generate the .kos. diff --git a/virtual_device.fragment b/virtual_device.fragment index cf5ae80..a007d49 100644 --- a/virtual_device.fragment +++ b/virtual_device.fragment @@ -1,14 +1,7 @@ # Drivers used by all virtual devices CONFIG_BATTERY_GOLDFISH=m -CONFIG_BT_HCIVHCI=m -CONFIG_CPUFREQ_DUMMY=m -CONFIG_DMABUF_HEAPS_SYSTEM=m -CONFIG_DRM_VKMS=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_MAC80211_HWSIM=m -CONFIG_RTC_DRV_TEST=m CONFIG_SND_VIRTIO=m -CONFIG_USB_DUMMY_HCD=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_CONSOLE=m @@ -18,49 +11,16 @@ CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_VSOCKETS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_ZRAM=m -CONFIG_ZSMALLOC=m # Drivers to run specific sanity tests CONFIG_TEST_STACKINIT=m CONFIG_TEST_MEMINIT=m -# Cuttlefish-specific drivers -CONFIG_VIRT_WIFI=m - -# Gem5-specific drivers -CONFIG_E1000=m - -# Auto-specific drivers -CONFIG_BT_HCIBTUSB=m -CONFIG_CAN_VCAN=m -CONFIG_CAN_SLCAN=m -CONFIG_CAN_GS_USB=m -CONFIG_WLAN_VENDOR_MEDIATEK=y -CONFIG_MT76x0U=m -CONFIG_MT76x2U=m - -# TV-specific drivers -CONFIG_USB_PULSE8_CEC=m - # Disable module signing during build # CONFIG_MODULE_SIG_ALL is not set -# CFG80211 & MAC80211 as modules -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -# CONFIG_CFG80211_DEFAULT_PS is not set -# CONFIG_CFG80211_CRDA_SUPPORT is not set -CONFIG_MAC80211=m - # 9P as module CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y CONFIG_9P_FS_SECURITY=y -CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m - -# CrOS specific drivers. -VIRTIO_WL=m |