Skip to content

Commit cc8657f

Browse files
rmuthiahrmuthiah
committed
ANDROID: gki: Removed cf modules from gki_defconfig
Bug: 139431025 Test: Treehugger Change-Id: Ib1de19b851f8dc07f77e4b6ec5acf88b6051b070 Signed-off-by: Ram Muthiah <[email protected]>
1 parent 9bb9de3 commit cc8657f

7 files changed

+17980
-18527
lines changed

‎abi_gki_aarch64.xml

+17,977-18,475
Large diffs are not rendered by default.

‎arch/arm64/configs/gki_defconfig

-22
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_CPU_FREQ_TIMES=y
6363
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
6464
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
6565
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
66-
CONFIG_CPUFREQ_DUMMY=m
6766
CONFIG_ARM_SCPI_CPUFREQ=y
6867
CONFIG_ARM_SCMI_CPUFREQ=y
6968
CONFIG_ARM_SCMI_PROTOCOL=y
@@ -84,7 +83,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
8483
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
8584
CONFIG_GKI_HACKS_TO_FIX=y
8685
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
87-
CONFIG_BINFMT_MISC=m
8886
CONFIG_CMA=y
8987
CONFIG_CMA_AREAS=16
9088
CONFIG_ZSMALLOC=y
@@ -194,11 +192,7 @@ CONFIG_NET_CLS_BPF=y
194192
CONFIG_NET_EMATCH=y
195193
CONFIG_NET_EMATCH_U32=y
196194
CONFIG_NET_CLS_ACT=y
197-
CONFIG_VSOCKETS=m
198-
CONFIG_VIRTIO_VSOCKETS=m
199195
CONFIG_BPF_JIT=y
200-
CONFIG_CAN=m
201-
CONFIG_CAN_VCAN=m
202196
CONFIG_BT=y
203197
CONFIG_CFG80211=y
204198
# CONFIG_CFG80211_DEFAULT_PS is not set
@@ -212,12 +206,10 @@ CONFIG_RFKILL=y
212206
CONFIG_DEBUG_DEVRES=y
213207
CONFIG_DMA_CMA=y
214208
CONFIG_GNSS=y
215-
CONFIG_GNSS_CMDLINE_SERIAL=m
216209
CONFIG_ZRAM=y
217210
CONFIG_BLK_DEV_LOOP=y
218211
CONFIG_BLK_DEV_RAM=y
219212
CONFIG_BLK_DEV_RAM_SIZE=8192
220-
CONFIG_VIRTIO_BLK=m
221213
CONFIG_UID_SYS_STATS=y
222214
CONFIG_SCSI=y
223215
# CONFIG_SCSI_PROC_FS is not set
@@ -238,7 +230,6 @@ CONFIG_DM_BOW=y
238230
CONFIG_NETDEVICES=y
239231
CONFIG_DUMMY=y
240232
CONFIG_TUN=y
241-
CONFIG_VIRTIO_NET=m
242233
# CONFIG_ETHERNET is not set
243234
CONFIG_PHYLIB=y
244235
CONFIG_PPP=y
@@ -272,7 +263,6 @@ CONFIG_USB_USBNET=y
272263
# CONFIG_WLAN_VENDOR_TI is not set
273264
# CONFIG_WLAN_VENDOR_ZYDAS is not set
274265
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
275-
CONFIG_VIRT_WIFI=m
276266
CONFIG_INPUT_FF_MEMLESS=y
277267
CONFIG_INPUT_EVDEV=y
278268
CONFIG_KEYBOARD_GPIO=y
@@ -292,9 +282,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
292282
CONFIG_SERIAL_AMBA_PL011=y
293283
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
294284
CONFIG_SERIAL_DEV_BUS=y
295-
CONFIG_VIRTIO_CONSOLE=m
296285
CONFIG_HW_RANDOM=y
297-
CONFIG_HW_RANDOM_VIRTIO=m
298286
# CONFIG_HW_RANDOM_CAVIUM is not set
299287
# CONFIG_DEVPORT is not set
300288
# CONFIG_I2C_COMPAT is not set
@@ -319,7 +307,6 @@ CONFIG_MEDIA_CONTROLLER=y
319307
# CONFIG_VGA_ARB is not set
320308
CONFIG_DRM=y
321309
# CONFIG_DRM_FBDEV_EMULATION is not set
322-
CONFIG_DRM_VIRTIO_GPU=m
323310
CONFIG_SOUND=y
324311
CONFIG_SND=y
325312
CONFIG_SND_HRTIMER=y
@@ -341,7 +328,6 @@ CONFIG_HID_STEAM=y
341328
CONFIG_USB_HIDDEV=y
342329
CONFIG_USB_OTG=y
343330
CONFIG_USB_GADGET=y
344-
CONFIG_USB_DUMMY_HCD=m
345331
CONFIG_USB_CONFIGFS=y
346332
CONFIG_USB_CONFIGFS_UEVENT=y
347333
CONFIG_USB_CONFIGFS_F_FS=y
@@ -359,21 +345,13 @@ CONFIG_LEDS_TRIGGERS=y
359345
CONFIG_EDAC=y
360346
CONFIG_RTC_CLASS=y
361347
# CONFIG_RTC_SYSTOHC is not set
362-
CONFIG_RTC_DRV_TEST=m
363348
CONFIG_RTC_DRV_PL030=y
364349
CONFIG_RTC_DRV_PL031=y
365350
CONFIG_DMADEVICES=y
366351
CONFIG_UIO=y
367-
CONFIG_VIRTIO_PCI=m
368-
CONFIG_VIRTIO_PMEM=m
369-
CONFIG_VIRTIO_INPUT=m
370-
CONFIG_VIRTIO_MMIO=m
371-
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
372352
CONFIG_STAGING=y
373353
CONFIG_ASHMEM=y
374354
CONFIG_ANDROID_VSOC=y
375-
CONFIG_ION=m
376-
CONFIG_ION_SYSTEM_HEAP=y
377355
CONFIG_COMMON_CLK_SCPI=y
378356
# CONFIG_COMMON_CLK_XGENE is not set
379357
CONFIG_HWSPINLOCK=y

‎arch/x86/configs/gki_defconfig

-26
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CONFIG_EFI=y
4444
CONFIG_CPU_FREQ_TIMES=y
4545
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
4646
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
47-
CONFIG_CPUFREQ_DUMMY=m
4847
CONFIG_IA32_EMULATION=y
4948
CONFIG_KPROBES=y
5049
CONFIG_LTO_CLANG=y
@@ -56,7 +55,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
5655
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
5756
CONFIG_GKI_HACKS_TO_FIX=y
5857
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
59-
CONFIG_BINFMT_MISC=m
6058
CONFIG_ZSMALLOC=y
6159
CONFIG_NET=y
6260
CONFIG_PACKET=y
@@ -163,13 +161,7 @@ CONFIG_NET_CLS_BPF=y
163161
CONFIG_NET_EMATCH=y
164162
CONFIG_NET_EMATCH_U32=y
165163
CONFIG_NET_CLS_ACT=y
166-
CONFIG_VSOCKETS=m
167-
CONFIG_VIRTIO_VSOCKETS=m
168164
CONFIG_BPF_JIT=y
169-
CONFIG_CAN=m
170-
# CONFIG_CAN_BCM is not set
171-
# CONFIG_CAN_GW is not set
172-
CONFIG_CAN_VCAN=m
173165
CONFIG_CFG80211=y
174166
# CONFIG_CFG80211_DEFAULT_PS is not set
175167
# CONFIG_CFG80211_CRDA_SUPPORT is not set
@@ -181,13 +173,11 @@ CONFIG_RFKILL=y
181173
# CONFIG_ALLOW_DEV_COREDUMP is not set
182174
CONFIG_DEBUG_DEVRES=y
183175
CONFIG_GNSS=y
184-
CONFIG_GNSS_CMDLINE_SERIAL=m
185176
CONFIG_OF=y
186177
CONFIG_ZRAM=y
187178
CONFIG_BLK_DEV_LOOP=y
188179
CONFIG_BLK_DEV_RAM=y
189180
CONFIG_BLK_DEV_RAM_SIZE=8192
190-
CONFIG_VIRTIO_BLK=m
191181
CONFIG_UID_SYS_STATS=y
192182
CONFIG_SCSI=y
193183
# CONFIG_SCSI_MQ_DEFAULT is not set
@@ -206,7 +196,6 @@ CONFIG_DM_BOW=y
206196
CONFIG_NETDEVICES=y
207197
CONFIG_DUMMY=y
208198
CONFIG_TUN=y
209-
CONFIG_VIRTIO_NET=m
210199
# CONFIG_ETHERNET is not set
211200
CONFIG_PHYLIB=y
212201
CONFIG_PPP=y
@@ -240,7 +229,6 @@ CONFIG_USB_USBNET=y
240229
# CONFIG_WLAN_VENDOR_TI is not set
241230
# CONFIG_WLAN_VENDOR_ZYDAS is not set
242231
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
243-
CONFIG_VIRT_WIFI=m
244232
CONFIG_INPUT_EVDEV=y
245233
CONFIG_KEYBOARD_GPIO=y
246234
# CONFIG_INPUT_MOUSE is not set
@@ -257,9 +245,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
257245
# CONFIG_SERIAL_8250_EXAR is not set
258246
CONFIG_SERIAL_OF_PLATFORM=y
259247
CONFIG_SERIAL_DEV_BUS=y
260-
CONFIG_VIRTIO_CONSOLE=m
261248
CONFIG_HW_RANDOM=y
262-
CONFIG_HW_RANDOM_VIRTIO=m
263249
# CONFIG_DEVPORT is not set
264250
# CONFIG_I2C_COMPAT is not set
265251
# CONFIG_I2C_HELPER_AUTO is not set
@@ -275,7 +261,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
275261
# CONFIG_VGA_ARB is not set
276262
CONFIG_DRM=y
277263
# CONFIG_DRM_FBDEV_EMULATION is not set
278-
CONFIG_DRM_VIRTIO_GPU=m
279264
CONFIG_BACKLIGHT_LCD_SUPPORT=y
280265
# CONFIG_LCD_CLASS_DEVICE is not set
281266
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -286,7 +271,6 @@ CONFIG_SND_DYNAMIC_MINORS=y
286271
# CONFIG_SND_SUPPORT_OLD_API is not set
287272
# CONFIG_SND_VERBOSE_PROCFS is not set
288273
# CONFIG_SND_DRIVERS is not set
289-
CONFIG_SND_INTEL8X0=m
290274
# CONFIG_SND_USB is not set
291275
CONFIG_HIDRAW=y
292276
CONFIG_UHID=y
@@ -299,7 +283,6 @@ CONFIG_HID_SONY=y
299283
CONFIG_HID_STEAM=y
300284
CONFIG_USB_HIDDEV=y
301285
CONFIG_USB_GADGET=y
302-
CONFIG_USB_DUMMY_HCD=m
303286
CONFIG_USB_CONFIGFS=y
304287
CONFIG_USB_CONFIGFS_UEVENT=y
305288
CONFIG_USB_CONFIGFS_F_FS=y
@@ -316,18 +299,9 @@ CONFIG_LEDS_CLASS=y
316299
CONFIG_LEDS_TRIGGERS=y
317300
CONFIG_RTC_CLASS=y
318301
# CONFIG_RTC_SYSTOHC is not set
319-
CONFIG_RTC_DRV_TEST=m
320302
CONFIG_UIO=y
321-
CONFIG_VIRTIO_PCI=m
322-
CONFIG_VIRTIO_PMEM=m
323-
CONFIG_VIRTIO_BALLOON=m
324-
CONFIG_VIRTIO_INPUT=m
325-
CONFIG_VIRTIO_MMIO=m
326-
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
327303
CONFIG_STAGING=y
328304
CONFIG_ASHMEM=y
329-
CONFIG_ION=m
330-
CONFIG_ION_SYSTEM_HEAP=y
331305
CONFIG_PM_DEVFREQ=y
332306
CONFIG_IIO=y
333307
CONFIG_ANDROID=y

‎build.config.cuttlefish.aarch64

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
. ${ROOT_DIR}/common/build.config.aarch64
33
. ${ROOT_DIR}/common/build.config.gki
44

5+
BUILD_INITRAMFS=1
56
DEFCONFIG=cf_aarch_64_gki_defconfig
67
PRE_DEFCONFIG_CMDS="cat ./common/arch/arm64/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/arm64/configs/${DEFCONFIG};"
78
POST_DEFCONFIG_CMDS="rm ./common/arch/arm64/configs/${DEFCONFIG}"

‎build.config.cuttlefish.x86_64

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
. ${ROOT_DIR}/common/build.config.x86_64
33
. ${ROOT_DIR}/common/build.config.gki
44

5+
BUILD_INITRAMFS=1
56
DEFCONFIG=cf_x86_64_gki_defconfig
67
PRE_DEFCONFIG_CMDS="cat ./common/arch/x86/configs/gki_defconfig ./common/cuttlefish.fragment > ./common/arch/x86/configs/${DEFCONFIG};"
78
POST_DEFCONFIG_CMDS="rm ./common/arch/x86/configs/${DEFCONFIG}"

‎build.config.gki

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
DEFCONFIG=gki_defconfig
22
POST_DEFCONFIG_CMDS="check_defconfig"
3-
BUILD_INITRAMFS=1
43

‎cuttlefish.fragment

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ CONFIG_CPUFREQ_DUMMY=m
22
CONFIG_BINFMT_MISC=m
33
CONFIG_VSOCKETS=m
44
CONFIG_VIRTIO_VSOCKETS=m
5-
CONFIG_CAN=m
6-
CONFIG_CAN_VCAN=m
75
CONFIG_GNSS_CMDLINE_SERIAL=m
86
CONFIG_VIRTIO_BLK=m
97
CONFIG_VIRTIO_NET=m
108
CONFIG_VIRT_WIFI=m
11-
CONFIG_VIRTIO_CONSOLE=m
129
CONFIG_HW_RANDOM_VIRTIO=m
1310
CONFIG_DRM_VIRTIO_GPU=m
1411
CONFIG_SND_INTEL8X0=m
@@ -18,5 +15,6 @@ CONFIG_VIRTIO_PCI=m
1815
CONFIG_VIRTIO_PMEM=m
1916
CONFIG_VIRTIO_INPUT=m
2017
CONFIG_VIRTIO_MMIO=m
18+
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
2119
CONFIG_ION=m
2220
CONFIG_ION_SYSTEM_HEAP=y

0 commit comments

Comments
 (0)