diff options
author | Matthias Maennich <maennich@google.com> | 2024-04-26 01:30:22 +0000 |
---|---|---|
committer | Matthias Maennich <maennich@google.com> | 2024-04-26 01:30:22 +0000 |
commit | 75591a86488b557d0ae1f20fe1d2c551eefdc301 (patch) | |
tree | 59678485f1c3523a935dfe36bc1f43cf2cd1f6dd | |
parent | 609663237d198edd1ac79b95160e0c4d3eda56c5 (diff) | |
download | virtual-device-75591a86488b557d0ae1f20fe1d2c551eefdc301.tar.gz |
ANDROID: Remove ACK's support for riscv64
Support for risc64 GKI kernels is discontinued.
Bug: 337124279
Change-Id: I5c45365cf27958631f2b63e3ddffda33eddf0d9b
Signed-off-by: Matthias Maennich <maennich@google.com>
-rw-r--r-- | BUILD.bazel | 106 | ||||
-rw-r--r-- | build.config.virtual_device.riscv64 | 22 |
2 files changed, 0 insertions, 128 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index b5ef6e3..239318d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -105,14 +105,6 @@ filegroup( ) filegroup( - name = "virtual_device_riscv64_common_sources", - srcs = [ - ":common_sources", - "//common:kernel_riscv64_sources", - ], -) - -filegroup( name = "virtual_device_x86_64_common_sources", srcs = [ ":common_sources", @@ -148,16 +140,6 @@ ddk_headers( ) ddk_headers( - name = "common_headers_riscv64", - hdrs = [ - # uapi/ has highest priority - # do not sort - ":common_headers", - "//common:all_headers_riscv64", - ], -) - -ddk_headers( name = "common_headers_x86_64", hdrs = [ # uapi/ has highest priority @@ -229,12 +211,6 @@ _VIRT_AARCH64_MODULES = [ "virtio_pmem.ko", ] -_VIRT_RISCV64_MODULES = [ - # keep sorted - "nd_virtio.ko", - "virtio_pmem.ko", -] - kernel_build( name = "virtual_device_x86_64", srcs = [":virtual_device_x86_64_common_sources"], @@ -663,88 +639,6 @@ copy_to_dist_dir( ) kernel_build( - name = "virtual_device_riscv64", - srcs = [":virtual_device_riscv64_common_sources"], - outs = [], - arch = "riscv64", - base_kernel = "//common:kernel_riscv64", - build_config = "build.config.virtual_device.riscv64", - make_goals = [ - "modules", - ], - module_outs = _VIRT_COMMON_MODULES + _VIRT_RISCV64_MODULES, - strip_modules = True, -) - -kernel_compile_commands( - name = "virtual_device_riscv64_compile_commands", - kernel_build = ":virtual_device_riscv64", -) - -ddk_module( - name = "riscv64/goldfish_drivers/goldfish_address_space", - srcs = [":goldfish_address_space_sources"], - out = "goldfish_drivers/goldfish_address_space.ko", - kernel_build = ":virtual_device_riscv64", - deps = [":common_headers_riscv64"], -) - -ddk_module( - name = "riscv64/goldfish_drivers/goldfish_pipe", - srcs = [":goldfish_pipe_sources"], - out = "goldfish_drivers/goldfish_pipe.ko", - kernel_build = ":virtual_device_riscv64", - deps = [":common_headers_riscv64"], -) - -ddk_module( - name = "riscv64/goldfish_drivers/goldfish_sync", - srcs = [":goldfish_sync_sources"], - out = "goldfish_drivers/goldfish_sync.ko", - kernel_build = ":virtual_device_riscv64", - deps = [":common_headers_riscv64"], -) - -kernel_module_group( - name = "virtual_device_riscv64_external_modules", - srcs = [ - ":riscv64/goldfish_drivers/goldfish_address_space", - ":riscv64/goldfish_drivers/goldfish_pipe", - ":riscv64/goldfish_drivers/goldfish_sync", - ], -) - -kernel_modules_install( - name = "virtual_device_riscv64_modules_install", - kernel_build = ":virtual_device_riscv64", - kernel_modules = [ - ":virtual_device_riscv64_external_modules", - ], -) - -kernel_images( - name = "virtual_device_riscv64_images", - build_initramfs = True, - kernel_build = ":virtual_device_riscv64", - kernel_modules_install = ":virtual_device_riscv64_modules_install", - modules_blocklist = "modules.blocklist", - modules_options = "modules.options", -) - -copy_to_dist_dir( - name = "virtual_device_riscv64_dist", - data = [ - ":virtual_device_riscv64", - ":virtual_device_riscv64_images", - ":virtual_device_riscv64_modules_install", - "//common:kernel_riscv64", - "//common:kernel_riscv64_images", - ], - dist_dir = "out/virtual_device_riscv64/dist", - flat = True, -) - -kernel_build( name = "virtual_device_arm", srcs = [":virtual_device_arm_common_sources"], outs = [ diff --git a/build.config.virtual_device.riscv64 b/build.config.virtual_device.riscv64 deleted file mode 100644 index d0e0f7a..0000000 --- a/build.config.virtual_device.riscv64 +++ /dev/null @@ -1,22 +0,0 @@ -. ${ROOT_DIR}/common-modules/virtual-device/build.config.virtual_device - -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.riscv64 - -DEFCONFIG=vd_riscv_64_gki_defconfig - -# HACK: bug in bash 5.2 that if the last command of the eval in a subshell is not a built-in -# command, the subshell exits prematurely. This is fixed in 5.2.15 but we leave -# this hack in until bash becomes hermetic (unlikely). -# See b/275468906#comment8 -PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/riscv/configs/ && \ - KCONFIG_CONFIG=\${OUT_DIR}/arch/riscv/configs/${DEFCONFIG} \ - ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r \ - ${ROOT_DIR}/${KERNEL_DIR}/arch/riscv/configs/gki_defconfig \ - ${ROOT_DIR}/common-modules/virtual-device/virtual_device_core.fragment \ - ${ROOT_DIR}/common-modules/virtual-device/virtual_device.fragment && \ - true" -POST_DEFCONFIG_CMDS="" -EXT_MODULES="common-modules/virtual-device" - -# Not building/saving any kernel images. This build step is meant purely to generate the .kos. -FILES="" |