diff --git a/arch/arm64/configs/microdroid.fragment b/arch/arm64/configs/microdroid.fragment deleted file mode 100644 index f5dcea814c6c..000000000000 --- a/arch/arm64/configs/microdroid.fragment +++ /dev/null @@ -1,99 +0,0 @@ -CONFIG_OPEN_DICE=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_VSOCKETS=y - -# To use kdump -CONFIG_KEXEC_FILE=y - -# Remove unnecessary serial devices -# CONFIG_SERIAL_8250_16550A_VARIANT is not set -# CONFIG_SERIAL_8250_DMA is not set -# CONFIG_SERIAL_8250_PCI is not set -# CONFIG_SERIAL_8250_FSL is not set -# CONFIG_SERIAL_8250_DW is not set -# CONFIG_SERIAL_AMBA_PL011 is not set -# CONFIG_SERIAL_AMBA_PL011_CONSOLE is not set -# CONFIG_SERIAL_SAMSUNG is not set -# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set -# CONFIG_QCOM_GENI is not set -# CONFIG_QCOM_GENI_CONSOLE is not set -# CONFIG_SERIAL_SPRD is not set -# CONFIG_SERIAL_SPRD_CONSOLE is not set -# CONFIG_HVC_DCC is not set -# CONFIG_SERIAL_DEV_BUS is not set - -# Remove config options that are for unknown vendor modules -# CONFIG_GKI_HACKS_TO_FIX is not set - -# Remove unnecessary filesystems -# CONFIG_F2FS_FS is not set -# CONFIG_VIRTIO_FS is not set -# CONFIG_OVERLAY_FS is not set -# CONFIG_INCREMENTAL_FS is not set -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_EXFAT_FS is not set - -# CONFIG_EMBEDDED is not set -# CONFIG_ARCH_HISI is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_QCOM is not set - -# Remove unnecessary subsystems -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_SD it not set -# CONFIG_BT is not set -# CONFIG_CAN is not set -# CONFIG_CFG80211 is not set -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DRM is not set -# CONFIG_ETHERNET is not set -# CONFIG_GNSS is not set -# CONFIG_HID is not set -# CONFIG_IEEE802154 is not set -# CONFIG_6LOWPAN is not set -# CONFIG_LLC is not set -# CONFIG_RC_CORE is not set -# CONFIG_LIRC is not set -# CONFIG_BPF_LIRC_MODES2 is not set -# CONFIG_RC_DECODERS is not set -# CONFIG_RC_DEVICES is not set -# CONFIG_MEDIA_CEC_RC is not set -# CONFIG_THERMAL is not set -# CONFIG_NETDEVICES is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_I2C is not set -# CONFIG_I3C is not set -# CONFIG_INPUT is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MISC is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_UINPUT is not set -# CONFIG_JOYSTICK_XPAD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KVM is not set -# CONFIG_KVM_S2MPU is not set -# CONFIG_MAC80211 is not set -# CONFIG_MMC is not set -# CONFIG_NFC is not set -# CONFIG_PPP is not set -# CONFIG_PWM is not set -# CONFIG_QUOTA is not set -# CONFIG_RFKILL is not set -# CONFIG_SCSI is not set -# CONFIG_SND is not set -# CONFIG_SOUND is not set -# CONFIG_SPI is not set -# CONFIG_SPMI is not set -# CONFIG_SRAM is not set -# CONFIG_THERMAL is not set -# CONFIG_VHOST_VSOCK is not set -# CONFIG_WIRELESS is not set -# CONFIG_WLAN is not set diff --git a/arch/x86/configs/microdroid.fragment b/arch/x86/configs/microdroid.fragment deleted file mode 100644 index 954543769151..000000000000 --- a/arch/x86/configs/microdroid.fragment +++ /dev/null @@ -1,88 +0,0 @@ -CONFIG_HW_RANDOM_VIRTIO=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_VSOCKETS=y - -# To use kdump -CONFIG_KEXEC_FILE=y - -# Remove unnecessary serial devices -# CONFIG_SERIAL_8250_16550A_VARIANT is not set -# CONFIG_SERIAL_8250_DMA is not set -# CONFIG_SERIAL_8250_PCI is not set -# CONFIG_SERIAL_8250_FSL is not set -# CONFIG_SERIAL_SAMSUNG is not set -# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set -# CONFIG_SERIAL_DEV_BUS is not set - -# Remove config options that are for unknown vendor modules -# CONFIG_GKI_HACKS_TO_FIX is not set - -# Remove unnecessary filesystems -# CONFIG_F2FS_FS is not set -# CONFIG_VIRTIO_FS is not set -# CONFIG_OVERLAY_FS is not set -# CONFIG_INCREMENTAL_FS is not set -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_EXFAT_FS is not set - -# CONFIG_EMBEDDED is not set - -# Remove unnecessary subsystems -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_SD it not set -# CONFIG_BT is not set -# CONFIG_CAN is not set -# CONFIG_CFG80211 is not set -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DRM is not set -# CONFIG_ETHERNET is not set -# CONFIG_GNSS is not set -# CONFIG_HID is not set -# CONFIG_IEEE802154 is not set -# CONFIG_6LOWPAN is not set -# CONFIG_LLC is not set -# CONFIG_RC_CORE is not set -# CONFIG_LIRC is not set -# CONFIG_BPF_LIRC_MODES2 is not set -# CONFIG_RC_DECODERS is not set -# CONFIG_RC_DEVICES is not set -# CONFIG_MEDIA_CEC_RC is not set -# CONFIG_THERMAL is not set -# CONFIG_NETDEVICES is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_I2C is not set -# CONFIG_I3C is not set -# CONFIG_INPUT is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MISC is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_UINPUT is not set -# CONFIG_JOYSTICK_XPAD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KVM is not set -# CONFIG_KVM_S2MPU is not set -# CONFIG_MAC80211 is not set -# CONFIG_MMC is not set -# CONFIG_NFC is not set -# CONFIG_PPP is not set -# CONFIG_PWM is not set -# CONFIG_QUOTA is not set -# CONFIG_RFKILL is not set -# CONFIG_SCSI is not set -# CONFIG_SND is not set -# CONFIG_SOUND is not set -# CONFIG_SPI is not set -# CONFIG_SPMI is not set -# CONFIG_SRAM is not set -# CONFIG_THERMAL is not set -# CONFIG_VHOST_VSOCK is not set -# CONFIG_WIRELESS is not set -# CONFIG_WLAN is not set diff --git a/build.config.microdroid b/build.config.microdroid deleted file mode 100644 index 2c644e5509d9..000000000000 --- a/build.config.microdroid +++ /dev/null @@ -1,15 +0,0 @@ -SRCARCH=${ARCH} -if [ "${ARCH}" = x86_64 ]; then - SRCARCH=x86 -fi - -DEFCONFIG=microdroid_defconfig - -# MERGED_CONFIG is created by merging GKI_DEFCONFIG and FRAGMENT_CONFIG using MERGE_SCRIPT -MERGE_SCRIPT=${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -GKI_DEFCONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${SRCARCH}/configs/gki_defconfig -FRAGMENT_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${SRCARCH}/configs/microdroid.fragment -MERGED_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${SRCARCH}/configs/${DEFCONFIG} - -PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${MERGED_CONFIG} ${MERGE_SCRIPT} -m ${GKI_DEFCONFIG} ${FRAGMENT_CONFIG}" -POST_DEFCONFIG_CMDS="rm ${MERGED_CONFIG}" diff --git a/build.config.microdroid.aarch64 b/build.config.microdroid.aarch64 deleted file mode 100644 index 48cece23f5c3..000000000000 --- a/build.config.microdroid.aarch64 +++ /dev/null @@ -1,3 +0,0 @@ -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid diff --git a/build.config.microdroid.x86_64 b/build.config.microdroid.x86_64 deleted file mode 100644 index c2011219868f..000000000000 --- a/build.config.microdroid.x86_64 +++ /dev/null @@ -1,3 +0,0 @@ -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 -. ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid