diff options
author | Sandro Meier <sandromeier@google.com> | 2022-12-12 14:15:49 +0000 |
---|---|---|
committer | Sandro Meier <sandromeier@google.com> | 2022-12-12 14:21:05 +0000 |
commit | 3400e3da88dde1b1a03bda1273f8fcfbbafe2f4e (patch) | |
tree | 39cfcdba0f67e18011ccd7754227091bc310169f /vsoc_riscv64_minidroid | |
parent | bb6c689cfc6dbc5e36edd85923be417bb2f3b157 (diff) | |
download | cuttlefish-3400e3da88dde1b1a03bda1273f8fcfbbafe2f4e.tar.gz |
Revert "Add RISC-V 64-bit support"
This reverts commit bb6c689cfc6dbc5e36edd85923be417bb2f3b157.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=build_test&lkgb=9385783&lkbb=9394217&fkbb=9386067, bug https://buganizer.corp.google.com/issues/262040129
Change-Id: I54993a8ae1235c6e67ef3bfef5459166e4463647
Bug: 262040129
Diffstat (limited to 'vsoc_riscv64_minidroid')
-rw-r--r-- | vsoc_riscv64_minidroid/BoardConfig.mk | 36 | ||||
-rw-r--r-- | vsoc_riscv64_minidroid/aosp_cf.mk | 28 |
2 files changed, 0 insertions, 64 deletions
diff --git a/vsoc_riscv64_minidroid/BoardConfig.mk b/vsoc_riscv64_minidroid/BoardConfig.mk deleted file mode 100644 index 1260f47ae..000000000 --- a/vsoc_riscv64_minidroid/BoardConfig.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright 2022 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# riscv64 (64-bit only) target for Cuttlefish -# - -TARGET_BOARD_PLATFORM := vsoc_riscv64 -TARGET_ARCH := riscv64 -TARGET_ARCH_VARIANT := -TARGET_CPU_VARIANT := generic -TARGET_CPU_ABI := riscv64 - -# Temporary hack while prebuilt modules are missing riscv64. -ALLOW_MISSING_DEPENDENCIES := true - -TARGET_KERNEL_ARCH ?= $(TARGET_ARCH) -TARGET_KERNEL_USE ?= mainline -KERNEL_MODULES_PATH := device/google/cuttlefish_prebuilts/kernel/$(TARGET_KERNEL_USE)-$(TARGET_KERNEL_ARCH) -TARGET_KERNEL_PATH := $(KERNEL_MODULES_PATH)/kernel-$(TARGET_KERNEL_USE) -# FIXME: system_dlkm should be specified as well - --include device/google/cuttlefish/shared/minidroid/BoardConfig.mk diff --git a/vsoc_riscv64_minidroid/aosp_cf.mk b/vsoc_riscv64_minidroid/aosp_cf.mk deleted file mode 100644 index 813b3c048..000000000 --- a/vsoc_riscv64_minidroid/aosp_cf.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -$(call inherit-product, device/google/cuttlefish/shared/minidroid/device.mk) - -$(call inherit-product, device/google/cuttlefish/vsoc_riscv64/bootloader.mk) - -PRODUCT_NAME := aosp_cf_riscv64_minidroid -PRODUCT_DEVICE := vsoc_riscv64_minidroid -PRODUCT_MANUFACTURER := Google -PRODUCT_MODEL := Cuttlefish riscv64 minidroid - -PRODUCT_VENDOR_PROPERTIES += \ - ro.soc.manufacturer=$(PRODUCT_MANUFACTURER) \ - ro.soc.model=$(PRODUCT_DEVICE) |