lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: gki: Removed cf modules from gki_defconfig

Browse Source 
Bug: 139431025
Test: Treehugger
Change-Id: Ib1de19b851f8dc07f77e4b6ec5acf88b6051b070
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
This commit is contained in:
Ram Muthiah 2020-01-30 22:28:07 -08:00
parent 6e2b3ae756
commit 2081b666d5
7 changed files with 21717 additions and 22422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44089
abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

20
arch/arm64/configs/gki_defconfig
View File

@ -61,7 +61,6 @@ CONFIG_CPU_FREQ_TIMES=y
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPUFREQ_DUMMY=m
CONFIG_ARM_SCPI_CPUFREQ=y CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_ARM_SCMI_CPUFREQ=y
CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ARM_SCMI_PROTOCOL=y
@ -83,7 +82,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
CONFIG_GKI_HACKS_TO_FIX=y CONFIG_GKI_HACKS_TO_FIX=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m
CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG=y
CONFIG_CMA=y CONFIG_CMA=y
CONFIG_CMA_AREAS=16 CONFIG_CMA_AREAS=16
@ -194,11 +192,7 @@ CONFIG_NET_CLS_BPF=y
CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_U32=y CONFIG_NET_EMATCH_U32=y
CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_ACT=y
CONFIG_VSOCKETS=m
CONFIG_VIRTIO_VSOCKETS=m
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
CONFIG_CAN=m
CONFIG_CAN_VCAN=m
CONFIG_BT=y CONFIG_BT=y
CONFIG_CFG80211=y CONFIG_CFG80211=y
# CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_DEFAULT_PS is not set
@ -218,12 +212,10 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
# CONFIG_ALLOW_DEV_COREDUMP is not set # CONFIG_ALLOW_DEV_COREDUMP is not set
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
CONFIG_GNSS=y CONFIG_GNSS=y
CONFIG_GNSS_CMDLINE_SERIAL=m
CONFIG_ZRAM=y CONFIG_ZRAM=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_VIRTIO_BLK=m
CONFIG_UID_SYS_STATS=y CONFIG_UID_SYS_STATS=y
CONFIG_SCSI=y CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set # CONFIG_SCSI_PROC_FS is not set
@ -244,7 +236,6 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=y CONFIG_DUMMY=y
CONFIG_TUN=y CONFIG_TUN=y
CONFIG_VIRTIO_NET=m
# CONFIG_ETHERNET is not set # CONFIG_ETHERNET is not set
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PPP=y CONFIG_PPP=y
@ -278,7 +269,6 @@ CONFIG_USB_USBNET=y
# CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_TI is not set
# CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set
# CONFIG_WLAN_VENDOR_QUANTENNA is not set # CONFIG_WLAN_VENDOR_QUANTENNA is not set
CONFIG_VIRT_WIFI=m
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
@ -297,9 +287,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_BUS=y
CONFIG_VIRTIO_CONSOLE=m
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_VIRTIO=m
# CONFIG_HW_RANDOM_CAVIUM is not set # CONFIG_HW_RANDOM_CAVIUM is not set
# CONFIG_DEVPORT is not set # CONFIG_DEVPORT is not set
# CONFIG_I2C_COMPAT is not set # CONFIG_I2C_COMPAT is not set
@ -325,7 +313,6 @@ CONFIG_MEDIA_CONTROLLER=y
# CONFIG_VGA_ARB is not set # CONFIG_VGA_ARB is not set
CONFIG_DRM=y CONFIG_DRM=y
# CONFIG_DRM_FBDEV_EMULATION is not set # CONFIG_DRM_FBDEV_EMULATION is not set
CONFIG_DRM_VIRTIO_GPU=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_SND=y CONFIG_SND=y
@ -349,7 +336,6 @@ CONFIG_HID_STEAM=y
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
CONFIG_USB_OTG=y CONFIG_USB_OTG=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_UEVENT=y
CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_FS=y
@ -367,16 +353,10 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_EDAC=y CONFIG_EDAC=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_SYSTOHC is not set # CONFIG_RTC_SYSTOHC is not set
CONFIG_RTC_DRV_TEST=m
CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL030=y
CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_PL031=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_UIO=y CONFIG_UIO=y
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_PMEM=m
CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_ASHMEM=y CONFIG_ASHMEM=y
CONFIG_ANDROID_VSOC=y CONFIG_ANDROID_VSOC=y

23
arch/x86/configs/gki_defconfig
View File

@ -48,7 +48,6 @@ CONFIG_CPU_FREQ_TIMES=y
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPUFREQ_DUMMY=m
CONFIG_IA32_EMULATION=y CONFIG_IA32_EMULATION=y
CONFIG_KPROBES=y CONFIG_KPROBES=y
CONFIG_LTO_CLANG=y CONFIG_LTO_CLANG=y
@ -60,7 +59,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
CONFIG_GKI_HACKS_TO_FIX=y CONFIG_GKI_HACKS_TO_FIX=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m
CONFIG_CMA=y CONFIG_CMA=y
CONFIG_CMA_AREAS=16 CONFIG_CMA_AREAS=16
CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC=y
@ -168,13 +166,7 @@ CONFIG_NET_CLS_BPF=y
CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_U32=y CONFIG_NET_EMATCH_U32=y
CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_ACT=y
CONFIG_VSOCKETS=m
CONFIG_VIRTIO_VSOCKETS=m
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
CONFIG_CAN=m
# CONFIG_CAN_BCM is not set
# CONFIG_CAN_GW is not set
CONFIG_CAN_VCAN=m
CONFIG_CFG80211=y CONFIG_CFG80211=y
# CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_DEFAULT_PS is not set
# CONFIG_CFG80211_CRDA_SUPPORT is not set # CONFIG_CFG80211_CRDA_SUPPORT is not set
@ -190,13 +182,11 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
# CONFIG_ALLOW_DEV_COREDUMP is not set # CONFIG_ALLOW_DEV_COREDUMP is not set
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
CONFIG_GNSS=y CONFIG_GNSS=y
CONFIG_GNSS_CMDLINE_SERIAL=m
CONFIG_OF=y CONFIG_OF=y
CONFIG_ZRAM=y CONFIG_ZRAM=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_VIRTIO_BLK=m
CONFIG_UID_SYS_STATS=y CONFIG_UID_SYS_STATS=y
CONFIG_SCSI=y CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set # CONFIG_SCSI_PROC_FS is not set
@ -214,7 +204,6 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_DUMMY=y CONFIG_DUMMY=y
CONFIG_TUN=y CONFIG_TUN=y
CONFIG_VIRTIO_NET=m
# CONFIG_ETHERNET is not set # CONFIG_ETHERNET is not set
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PPP=y CONFIG_PPP=y
@ -248,7 +237,6 @@ CONFIG_USB_USBNET=y
# CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_TI is not set
# CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set
# CONFIG_WLAN_VENDOR_QUANTENNA is not set # CONFIG_WLAN_VENDOR_QUANTENNA is not set
CONFIG_VIRT_WIFI=m
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
@ -264,9 +252,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_BUS=y
CONFIG_VIRTIO_CONSOLE=m
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_VIRTIO=m
# CONFIG_I2C_COMPAT is not set # CONFIG_I2C_COMPAT is not set
# CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_HELPER_AUTO is not set
CONFIG_SPI=y CONFIG_SPI=y
@ -279,7 +265,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_DRM=y CONFIG_DRM=y
# CONFIG_DRM_FBDEV_EMULATION is not set # CONFIG_DRM_FBDEV_EMULATION is not set
CONFIG_DRM_VIRTIO_GPU=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_SND=y CONFIG_SND=y
@ -288,7 +273,6 @@ CONFIG_SND_DYNAMIC_MINORS=y
# CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_SUPPORT_OLD_API is not set
# CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SND_VERBOSE_PROCFS is not set
# CONFIG_SND_DRIVERS is not set # CONFIG_SND_DRIVERS is not set
CONFIG_SND_INTEL8X0=m
# CONFIG_SND_USB is not set # CONFIG_SND_USB is not set
CONFIG_HIDRAW=y CONFIG_HIDRAW=y
CONFIG_UHID=y CONFIG_UHID=y
@ -302,7 +286,6 @@ CONFIG_HID_SONY=y
CONFIG_HID_STEAM=y CONFIG_HID_STEAM=y
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_UEVENT=y
CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_FS=y
@ -319,13 +302,7 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGERS=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_SYSTOHC is not set # CONFIG_RTC_SYSTOHC is not set
CONFIG_RTC_DRV_TEST=m
CONFIG_UIO=y CONFIG_UIO=y
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_PMEM=m
CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_ASHMEM=y CONFIG_ASHMEM=y
CONFIG_ION=y CONFIG_ION=y

1
build.config.cuttlefish.aarch64
View File

@ -2,6 +2,7 @@
. ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/common/build.config.aarch64
. ${ROOT_DIR}/common/build.config.gki . ${ROOT_DIR}/common/build.config.gki
BUILD_INITRAMFS=1
DEFCONFIG=cf_aarch_64_gki_defconfig DEFCONFIG=cf_aarch_64_gki_defconfig
PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/arm64/configs/${DEFCONFIG};" PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/arm64/configs/${DEFCONFIG};"
POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}" POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}"

1
build.config.cuttlefish.x86_64
View File

@ -2,6 +2,7 @@
. ${ROOT_DIR}/common/build.config.x86_64 . ${ROOT_DIR}/common/build.config.x86_64
. ${ROOT_DIR}/common/build.config.gki . ${ROOT_DIR}/common/build.config.gki
BUILD_INITRAMFS=1
DEFCONFIG=cf_x86_64_gki_defconfig DEFCONFIG=cf_x86_64_gki_defconfig
PRE_DEFCONFIG_CMDS="cat ./common/arch/x86/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/x86/configs/${DEFCONFIG};" PRE_DEFCONFIG_CMDS="cat ./common/arch/x86/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/x86/configs/${DEFCONFIG};"
POST_DEFCONFIG_CMDS="rm ./common/arch/x86/configs/${DEFCONFIG}" POST_DEFCONFIG_CMDS="rm ./common/arch/x86/configs/${DEFCONFIG}"

1
build.config.gki
View File

@ -1,4 +1,3 @@
DEFCONFIG=gki_defconfig DEFCONFIG=gki_defconfig
POST_DEFCONFIG_CMDS="check_defconfig" POST_DEFCONFIG_CMDS="check_defconfig"
BUILD_INITRAMFS=1

4
cuttlefish.fragment
View File

@ -2,13 +2,10 @@ CONFIG_CPUFREQ_DUMMY=m
CONFIG_BINFMT_MISC=m CONFIG_BINFMT_MISC=m
CONFIG_VSOCKETS=m CONFIG_VSOCKETS=m
CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m
CONFIG_CAN=m
CONFIG_CAN_VCAN=m
CONFIG_GNSS_CMDLINE_SERIAL=m CONFIG_GNSS_CMDLINE_SERIAL=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_NET=m
CONFIG_VIRT_WIFI=m CONFIG_VIRT_WIFI=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VIRTIO_GPU=m
CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0=m
@ -18,3 +15,4 @@ CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_PMEM=m
CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y