From 12c7af34c3e5579574b45368051c8fe0517c4f4c Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 22 Oct 2019 14:47:59 +0100 Subject: [PATCH] ANDROID: quilt series: drop cuttlefish config changes Filter out all modifications to arch/*/configs/*cuttlefish_defconfig and build.config.cuttlefish.*. They got deleted eventually. No need to maintain them in the series any longer. Change-Id: I288ddab3482f8e23e3745d0e8972612a1a413f47 Signed-off-by: Matthias Maennich --- ...d-dm-bow-to-cuttlefish-configuration.patch | 36 - ...OID-Add-initial-x86_64-gki_defconfig.patch | 85 +- ...NDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch | 38 - ...-Move-from-clang-r328903-to-r346389b.patch | 40 - ...-Move-from-clang-r346389b-to-r349610.patch | 41 - ...-Move-from-clang-r349610-to-r353983c.patch | 32 +- ...Remove-unused-cuttlefish-build-infra.patch | 995 ------------------ ...-Removed-extraneous-configs-from-gki.patch | 48 +- patches/ANDROID-Turn-xt_owner-module-on.patch | 45 - ...onfigs-switch-prebuilt-path-location.patch | 34 +- ...lefish-enable-CONFIG_INET_UDP_DIAG-y.patch | 42 - ...able-CONFIG_NETFILTER_XT_TARGET_CT-y.patch | 55 - ...ttlefish-enable-CONFIG_NET_CLS_BPF-y.patch | 54 - ...fish-enable-CONFIG_NET_SCH_INGRESS-y.patch | 55 - ...lefish-enable-CONFIG_NET_SCH_NETEM-y.patch | 55 - ...ttlefish-enable-CONFIG_USB_RTL8152-y.patch | 55 - ...i-_defconfig-Enable-CONFIG_SDCARD_FS.patch | 32 +- ...defconfig-Add-support-for-AC97-audio.patch | 52 - ...nfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch | 28 - ...fconfig-Enable-CONFIG_CMDLINE_EXTEND.patch | 25 - ...fish_defconfig-Enable-CONFIG_CPUSETS.patch | 40 - ...fconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch | 38 - ...config-Enable-CONFIG_CRYPTO_ADIANTUM.patch | 38 - ...efconfig-Enable-CONFIG_DM_VERITY_AVB.patch | 38 - ...fish_defconfig-Enable-CONFIG_FUSE_FS.patch | 38 - ...fconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch | 25 - ...ttlefish_defconfig-Enable-CONFIG_MMC.patch | 44 - ...ble-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch | 39 - ...h_defconfig-Enable-CONFIG_OVERLAY_FS.patch | 38 - ...ttlefish_defconfig-Enable-CONFIG_PSI.patch | 38 - ..._defconfig-Enable-CONFIG_RTC_HCTOSYS.patch | 41 - ...efconfig-Enable-CONFIG_UID_SYS_STATS.patch | 38 - ...fig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch | 38 - ...able-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch | 38 - ...ig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch | 38 - ...defconfig-Enable-EAS-related-defines.patch | 85 -- ...Enable-SECURITY_PERF_EVENTS_RESTRICT.patch | 38 - ...lefish_defconfig-Enable-VIRTIO_INPUT.patch | 37 - ...uttlefish_defconfig-Enable-VIRT_WIFI.patch | 38 - ...efish_defconfig-Enable-vsock-options.patch | 40 - ...ync-with-android-mainline-tracking-2.patch | 26 - ...-sync-with-android-mainline-tracking.patch | 115 -- ...efconfig-build-config-for-cuttlefish.patch | 914 ---------------- ...-defconfigs-use-prebuilt-build-tools.patch | 32 +- ...D-sync-defconfigs-with-savedefconfig.patch | 50 +- patches/series | 38 - 46 files changed, 19 insertions(+), 3810 deletions(-) delete mode 100644 patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch delete mode 100644 patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch delete mode 100644 patches/ANDROID-Move-from-clang-r328903-to-r346389b.patch delete mode 100644 patches/ANDROID-Move-from-clang-r346389b-to-r349610.patch delete mode 100644 patches/ANDROID-Remove-unused-cuttlefish-build-infra.patch delete mode 100644 patches/ANDROID-Turn-xt_owner-module-on.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_INET_UDP_DIAG-y.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_NETFILTER_XT_TARGET_CT-y.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_NET_CLS_BPF-y.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_INGRESS-y.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_NETEM-y.patch delete mode 100644 patches/ANDROID-cuttlefish-enable-CONFIG_USB_RTL8152-y.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Add-support-for-AC97-audio.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CMDLINE_EXTEND.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPUSETS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CRYPTO_ADIANTUM.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_DM_VERITY_AVB.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_FUSE_FS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_MMC.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_OVERLAY_FS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_PSI.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_RTC_HCTOSYS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_UID_SYS_STATS.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-EAS-related-defines.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-SECURITY_PERF_EVENTS_RESTRICT.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-VIRTIO_INPUT.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-VIRT_WIFI.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-Enable-vsock-options.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking-2.patch delete mode 100644 patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking.patch delete mode 100644 patches/ANDROID-defconfig-build-config-for-cuttlefish.patch diff --git a/patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch b/patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch deleted file mode 100644 index e7065c738cde..000000000000 --- a/patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Paul Lawrence -Date: Thu, 21 Mar 2019 13:23:03 -0700 -Subject: ANDROID: Add dm-bow to cuttlefish configuration - -Change-Id: I7f265cb8c6274da414d2477da9953546510ce26b -Signed-off-by: Paul Lawrence ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index b3116d935c84..76a68561f2fb 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -218,6 +218,7 @@ CONFIG_DM_UEVENT=y - CONFIG_DM_VERITY=y - CONFIG_DM_VERITY_AVB=y - CONFIG_DM_VERITY_FEC=y -+CONFIG_DM_BOW=y - CONFIG_NETDEVICES=y - CONFIG_NETCONSOLE=y - CONFIG_NETCONSOLE_DYNAMIC=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index abd24a4f017d..b2ad519f11c7 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -227,6 +227,7 @@ CONFIG_DM_UEVENT=y - CONFIG_DM_VERITY=y - CONFIG_DM_VERITY_AVB=y - CONFIG_DM_VERITY_FEC=y -+CONFIG_DM_BOW=y - CONFIG_NETDEVICES=y - CONFIG_NETCONSOLE=y - CONFIG_NETCONSOLE_DYNAMIC=y diff --git a/patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch b/patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch index 2b1477711a8b..6e59028e8c33 100644 --- a/patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch +++ b/patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch @@ -17,12 +17,9 @@ Change-Id: I685ccea29efc7ba14f7b0a24f41983e37203f9a2 Signed-off-by: Ram Muthiah Signed-off-by: Matthias Maennich --- - arch/x86/configs/gki_defconfig | 328 +++++++++++++++++++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 8 +- - build.config.cuttlefish.aarch64 | 3 +- - build.config.cuttlefish.x86_64 | 3 +- - build.config.gki.x86_64 | 17 + - 5 files changed, 352 insertions(+), 7 deletions(-) + arch/x86/configs/gki_defconfig | 328 +++++++++++++++++++++++++++++++++ + build.config.gki.x86_64 | 17 ++ + 2 files changed, 345 insertions(+) create mode 100644 arch/x86/configs/gki_defconfig create mode 100644 build.config.gki.x86_64 @@ -360,82 +357,6 @@ index 000000000000..18ba312d0a60 +CONFIG_SCHEDSTATS=y +# CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_UNWINDER_FRAME_POINTER=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index d1f0fa08eacf..06c931405999 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -67,7 +67,6 @@ CONFIG_IA32_EMULATION=y - # CONFIG_FIRMWARE_MEMMAP is not set - CONFIG_OPROFILE=y - CONFIG_KPROBES=y --CONFIG_JUMP_LABEL=y - CONFIG_REFCOUNT_FULL=y - CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y -@@ -96,7 +95,6 @@ CONFIG_IP_PIMSM_V2=y - CONFIG_SYN_COOKIES=y - CONFIG_NET_IPVTI=y - CONFIG_INET_ESP=y --# CONFIG_INET_XFRM_MODE_BEET is not set - CONFIG_INET_UDP_DIAG=y - CONFIG_INET_DIAG_DESTROY=y - CONFIG_TCP_CONG_ADVANCED=y -@@ -199,7 +197,8 @@ CONFIG_VIRTIO_VSOCKETS=y - CONFIG_CFG80211=y - CONFIG_MAC80211=y - CONFIG_RFKILL=y --CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -+CONFIG_PCI=y -+CONFIG_PCI_MSI=y - CONFIG_DEVTMPFS=y - CONFIG_DEBUG_DEVRES=y - CONFIG_OF=y -@@ -459,10 +458,10 @@ CONFIG_DEBUG_INFO=y - # CONFIG_ENABLE_MUST_CHECK is not set - CONFIG_FRAME_WARN=1024 - # CONFIG_UNUSED_SYMBOLS is not set -+CONFIG_OPTIMIZE_INLINING=y - CONFIG_MAGIC_SYSRQ=y - CONFIG_DEBUG_STACK_USAGE=y - CONFIG_DEBUG_MEMORY_INIT=y --CONFIG_DEBUG_STACKOVERFLOW=y - CONFIG_HARDLOCKUP_DETECTOR=y - CONFIG_PANIC_TIMEOUT=5 - CONFIG_SCHEDSTATS=y -@@ -470,5 +469,4 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 - CONFIG_ENABLE_DEFAULT_TRACERS=y - CONFIG_IO_DELAY_NONE=y - CONFIG_DEBUG_BOOT_PARAMS=y --CONFIG_OPTIMIZE_INLINING=y - CONFIG_UNWINDER_FRAME_POINTER=y -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index ec53d6eac9ea..bec1288d65e1 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -1,7 +1,8 @@ - ARCH=arm64 --BRANCH=android-4.19 -+BRANCH=android-mainline - CLANG_TRIPLE=aarch64-linux-gnu- - CROSS_COMPILE=aarch64-linux-androidkernel- -+CC=clang - DEFCONFIG=cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index b49683d476d6..33063abed0ed 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -1,7 +1,8 @@ - ARCH=x86_64 --BRANCH=android-4.19 -+BRANCH=android-mainline - CLANG_TRIPLE=x86_64-linux-gnu- - CROSS_COMPILE=x86_64-linux-androidkernel- -+CC=clang - DEFCONFIG=x86_64_cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64 new file mode 100644 index 000000000000..69d339dce4a0 diff --git a/patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch b/patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch deleted file mode 100644 index eac716d15dfa..000000000000 --- a/patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jorge E. Moreira" -Date: Thu, 23 May 2019 17:26:51 -0700 -Subject: ANDROID: Enable CONFIG_ION_SYSTEM_HEAP - -Bug: 132983011 -Test: atest MediaStore_Video_ThumbnailsTest -Signed-off-by: Jorge E. Moreira -Change-Id: I2211af2700439c14e7ff53ac5c7e45579d0ab8bf ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 41502bd397dd..69ee170e471d 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -390,6 +390,7 @@ CONFIG_STAGING=y - CONFIG_ASHMEM=y - CONFIG_ANDROID_VSOC=y - CONFIG_ION=y -+CONFIG_ION_SYSTEM_HEAP=y - CONFIG_COMMON_CLK_SCPI=y - # CONFIG_COMMON_CLK_XGENE is not set - CONFIG_MAILBOX=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 06c931405999..cdb7e31593e1 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -407,6 +407,7 @@ CONFIG_STAGING=y - CONFIG_ASHMEM=y - CONFIG_ANDROID_VSOC=y - CONFIG_ION=y -+CONFIG_ION_SYSTEM_HEAP=y - # CONFIG_X86_PLATFORM_DEVICES is not set - # CONFIG_IOMMU_SUPPORT is not set - CONFIG_ANDROID=y diff --git a/patches/ANDROID-Move-from-clang-r328903-to-r346389b.patch b/patches/ANDROID-Move-from-clang-r328903-to-r346389b.patch deleted file mode 100644 index 5f36d0363762..000000000000 --- a/patches/ANDROID-Move-from-clang-r328903-to-r346389b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 7 Dec 2018 11:34:16 -0800 -Subject: ANDROID: Move from clang r328903 to r346389b. - -Bug: 120439617 -Bug: 120503084 -Change-Id: I21bb183cac03753d1ba719a69305e2199c3f3227 -Signed-off-by: Alistair Strachan ---- - build.config.cuttlefish.aarch64 | 2 +- - build.config.cuttlefish.x86_64 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index bfb1f560b298..5fb372dce6a2 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -6,7 +6,7 @@ DEFCONFIG=cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r328903/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin - FILES=" - arch/arm64/boot/Image.gz -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index 69813b30c8ea..a81cb544f51a 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -6,7 +6,7 @@ DEFCONFIG=x86_64_cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r328903/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin - FILES=" - arch/x86/boot/bzImage diff --git a/patches/ANDROID-Move-from-clang-r346389b-to-r349610.patch b/patches/ANDROID-Move-from-clang-r346389b-to-r349610.patch deleted file mode 100644 index 2ec506cfe55c..000000000000 --- a/patches/ANDROID-Move-from-clang-r346389b-to-r349610.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 12 Feb 2019 13:23:11 -0800 -Subject: ANDROID: Move from clang r346389b to r349610. - -Bug: 123635022 -Test: make ARCH=arm64 cuttlefish_defconfig && make ARCH=arm64 -Test: make ARCH=x86_64 x86_64_cuttlefish_defconfig && make ARCH=x86_64 -Change-Id: Icc02ea92c13435fa5a6ecd33d8878629762fd2f7 -Signed-off-by: Alistair Strachan ---- - build.config.cuttlefish.aarch64 | 2 +- - build.config.cuttlefish.x86_64 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index 5fb372dce6a2..fe921b46a9a8 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -6,7 +6,7 @@ DEFCONFIG=cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r349610/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin - FILES=" - arch/arm64/boot/Image.gz -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index a81cb544f51a..31e4057673f4 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -6,7 +6,7 @@ DEFCONFIG=x86_64_cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r349610/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin - FILES=" - arch/x86/boot/bzImage diff --git a/patches/ANDROID-Move-from-clang-r349610-to-r353983c.patch b/patches/ANDROID-Move-from-clang-r349610-to-r353983c.patch index 2407af69390a..33d80b0d4f8b 100644 --- a/patches/ANDROID-Move-from-clang-r349610-to-r353983c.patch +++ b/patches/ANDROID-Move-from-clang-r349610-to-r353983c.patch @@ -10,37 +10,9 @@ Test: make ARCH=x86_64 x86_64_cuttlefish_defconfig && make ARCH=x86_64 Change-Id: If5542a39e36fb4de6dd4b4135a22e188f752dd84 Signed-off-by: Alistair Strachan --- - build.config.cuttlefish.aarch64 | 2 +- - build.config.cuttlefish.x86_64 | 2 +- - build.config.gki.aarch64 | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + build.config.gki.aarch64 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index fe921b46a9a8..ec53d6eac9ea 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -6,7 +6,7 @@ DEFCONFIG=cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r349610/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin - FILES=" - arch/arm64/boot/Image.gz -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index 31e4057673f4..b49683d476d6 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -6,7 +6,7 @@ DEFCONFIG=x86_64_cuttlefish_defconfig - EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r349610/bin -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin - FILES=" - arch/x86/boot/bzImage diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index dec295284ffa..ecc2985e92cb 100644 --- a/build.config.gki.aarch64 diff --git a/patches/ANDROID-Remove-unused-cuttlefish-build-infra.patch b/patches/ANDROID-Remove-unused-cuttlefish-build-infra.patch deleted file mode 100644 index 9a1237d45be7..000000000000 --- a/patches/ANDROID-Remove-unused-cuttlefish-build-infra.patch +++ /dev/null @@ -1,995 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Delva -Date: Mon, 12 Aug 2019 12:54:11 -0700 -Subject: ANDROID: Remove unused cuttlefish build infra - -Cuttlefish will use gki_defconfig on this branch. - -Change-Id: I20d37d538ca8f4de80282c4a3a98dbcfb7c33170 -Signed-off-by: Alistair Delva ---- - arch/arm64/configs/cuttlefish_defconfig | 443 ----------------- - arch/x86/configs/x86_64_cuttlefish_defconfig | 472 ------------------- - build.config.cuttlefish.aarch64 | 18 - - build.config.cuttlefish.x86_64 | 18 - - 4 files changed, 951 deletions(-) - delete mode 100644 arch/arm64/configs/cuttlefish_defconfig - delete mode 100644 arch/x86/configs/x86_64_cuttlefish_defconfig - delete mode 100644 build.config.cuttlefish.aarch64 - delete mode 100644 build.config.cuttlefish.x86_64 - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -deleted file mode 100644 -index b84aad53e6d6..000000000000 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ /dev/null -@@ -1,443 +0,0 @@ --CONFIG_AUDIT=y --CONFIG_NO_HZ=y --CONFIG_HIGH_RES_TIMERS=y --CONFIG_PREEMPT=y --CONFIG_TASKSTATS=y --CONFIG_TASK_DELAY_ACCT=y --CONFIG_TASK_XACCT=y --CONFIG_TASK_IO_ACCOUNTING=y --CONFIG_PSI=y --CONFIG_IKCONFIG=y --CONFIG_IKCONFIG_PROC=y --CONFIG_MEMCG=y --CONFIG_MEMCG_SWAP=y --CONFIG_RT_GROUP_SCHED=y --CONFIG_CGROUP_FREEZER=y --CONFIG_CPUSETS=y --CONFIG_CGROUP_CPUACCT=y --CONFIG_CGROUP_BPF=y --CONFIG_SCHED_AUTOGROUP=y --CONFIG_BLK_DEV_INITRD=y --# CONFIG_RD_BZIP2 is not set --# CONFIG_RD_LZMA is not set --# CONFIG_RD_XZ is not set --# CONFIG_RD_LZO is not set --# CONFIG_RD_LZ4 is not set --CONFIG_SGETMASK_SYSCALL=y --# CONFIG_SYSFS_SYSCALL is not set --# CONFIG_FHANDLE is not set --CONFIG_KALLSYMS_ALL=y --CONFIG_BPF_SYSCALL=y --# CONFIG_RSEQ is not set --CONFIG_EMBEDDED=y --# CONFIG_VM_EVENT_COUNTERS is not set --# CONFIG_COMPAT_BRK is not set --# CONFIG_SLAB_MERGE_DEFAULT is not set --CONFIG_PROFILING=y --CONFIG_SCHED_MC=y --CONFIG_HZ_100=y --CONFIG_SECCOMP=y --CONFIG_PARAVIRT=y --CONFIG_ARM64_SW_TTBR0_PAN=y --CONFIG_COMPAT=y --CONFIG_ARMV8_DEPRECATED=y --CONFIG_SWP_EMULATION=y --CONFIG_CP15_BARRIER_EMULATION=y --CONFIG_SETEND_EMULATION=y --CONFIG_RANDOMIZE_BASE=y --# CONFIG_EFI is not set --CONFIG_PM_WAKELOCKS=y --CONFIG_PM_WAKELOCKS_LIMIT=0 --# CONFIG_PM_WAKELOCKS_GC is not set --CONFIG_PM_DEBUG=y --CONFIG_ENERGY_MODEL=y --CONFIG_CPU_IDLE=y --CONFIG_ARM_CPUIDLE=y --CONFIG_CPU_FREQ=y --CONFIG_CPU_FREQ_TIMES=y --CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y --CONFIG_CPU_FREQ_GOV_POWERSAVE=y --CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y --CONFIG_CPUFREQ_DT=y --CONFIG_ARM_SCPI_CPUFREQ=y --CONFIG_ARM_SCMI_CPUFREQ=y --CONFIG_ARM_SCMI_PROTOCOL=y --# CONFIG_ARM_SCMI_POWER_DOMAIN is not set --CONFIG_ARM_SCPI_PROTOCOL=y --# CONFIG_ARM_SCPI_POWER_DOMAIN is not set --CONFIG_KPROBES=y --CONFIG_MODULES=y --CONFIG_MODULE_UNLOAD=y --CONFIG_MODVERSIONS=y --# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set --# CONFIG_SPARSEMEM_VMEMMAP is not set --CONFIG_KSM=y --CONFIG_TRANSPARENT_HUGEPAGE=y --CONFIG_ZSMALLOC=y --CONFIG_NET=y --CONFIG_PACKET=y --CONFIG_UNIX=y --CONFIG_XFRM_USER=y --CONFIG_XFRM_INTERFACE=y --CONFIG_XFRM_STATISTICS=y --CONFIG_NET_KEY=y --CONFIG_INET=y --CONFIG_IP_MULTICAST=y --CONFIG_IP_ADVANCED_ROUTER=y --CONFIG_IP_MULTIPLE_TABLES=y --CONFIG_NET_IPGRE_DEMUX=y --CONFIG_NET_IPVTI=y --CONFIG_INET_ESP=y --CONFIG_INET_UDP_DIAG=y --CONFIG_INET_DIAG_DESTROY=y --CONFIG_TCP_CONG_ADVANCED=y --# CONFIG_TCP_CONG_BIC is not set --# CONFIG_TCP_CONG_WESTWOOD is not set --# CONFIG_TCP_CONG_HTCP is not set --CONFIG_IPV6_ROUTER_PREF=y --CONFIG_IPV6_ROUTE_INFO=y --CONFIG_IPV6_OPTIMISTIC_DAD=y --CONFIG_INET6_ESP=y --CONFIG_INET6_IPCOMP=y --CONFIG_IPV6_MIP6=y --CONFIG_IPV6_VTI=y --CONFIG_IPV6_MULTIPLE_TABLES=y --CONFIG_NETFILTER=y --CONFIG_NF_CONNTRACK=y --CONFIG_NF_CONNTRACK_SECMARK=y --CONFIG_NF_CONNTRACK_EVENTS=y --CONFIG_NF_CONNTRACK_AMANDA=y --CONFIG_NF_CONNTRACK_FTP=y --CONFIG_NF_CONNTRACK_H323=y --CONFIG_NF_CONNTRACK_IRC=y --CONFIG_NF_CONNTRACK_NETBIOS_NS=y --CONFIG_NF_CONNTRACK_PPTP=y --CONFIG_NF_CONNTRACK_SANE=y --CONFIG_NF_CONNTRACK_TFTP=y --CONFIG_NF_CT_NETLINK=y --CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y --CONFIG_NETFILTER_XT_TARGET_CONNMARK=y --CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y --CONFIG_NETFILTER_XT_TARGET_CT=y --CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y --CONFIG_NETFILTER_XT_TARGET_MARK=y --CONFIG_NETFILTER_XT_TARGET_NFLOG=y --CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y --CONFIG_NETFILTER_XT_TARGET_TPROXY=y --CONFIG_NETFILTER_XT_TARGET_TRACE=y --CONFIG_NETFILTER_XT_TARGET_SECMARK=y --CONFIG_NETFILTER_XT_TARGET_TCPMSS=y --CONFIG_NETFILTER_XT_MATCH_BPF=y --CONFIG_NETFILTER_XT_MATCH_COMMENT=y --CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y --CONFIG_NETFILTER_XT_MATCH_CONNMARK=y --CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y --CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y --CONFIG_NETFILTER_XT_MATCH_HELPER=y --CONFIG_NETFILTER_XT_MATCH_IPRANGE=y --CONFIG_NETFILTER_XT_MATCH_LENGTH=y --CONFIG_NETFILTER_XT_MATCH_LIMIT=y --CONFIG_NETFILTER_XT_MATCH_MAC=y --CONFIG_NETFILTER_XT_MATCH_MARK=y --CONFIG_NETFILTER_XT_MATCH_OWNER=y --CONFIG_NETFILTER_XT_MATCH_POLICY=y --CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y --CONFIG_NETFILTER_XT_MATCH_QUOTA=y --CONFIG_NETFILTER_XT_MATCH_QUOTA2=y --CONFIG_NETFILTER_XT_MATCH_SOCKET=y --CONFIG_NETFILTER_XT_MATCH_STATE=y --CONFIG_NETFILTER_XT_MATCH_STATISTIC=y --CONFIG_NETFILTER_XT_MATCH_STRING=y --CONFIG_NETFILTER_XT_MATCH_TIME=y --CONFIG_NETFILTER_XT_MATCH_U32=y --CONFIG_IP_NF_IPTABLES=y --CONFIG_IP_NF_MATCH_ECN=y --CONFIG_IP_NF_MATCH_TTL=y --CONFIG_IP_NF_FILTER=y --CONFIG_IP_NF_TARGET_REJECT=y --CONFIG_IP_NF_NAT=y --CONFIG_IP_NF_TARGET_MASQUERADE=y --CONFIG_IP_NF_TARGET_NETMAP=y --CONFIG_IP_NF_TARGET_REDIRECT=y --CONFIG_IP_NF_MANGLE=y --CONFIG_IP_NF_RAW=y --CONFIG_IP_NF_SECURITY=y --CONFIG_IP_NF_ARPTABLES=y --CONFIG_IP_NF_ARPFILTER=y --CONFIG_IP_NF_ARP_MANGLE=y --CONFIG_IP6_NF_IPTABLES=y --CONFIG_IP6_NF_MATCH_RPFILTER=y --CONFIG_IP6_NF_FILTER=y --CONFIG_IP6_NF_TARGET_REJECT=y --CONFIG_IP6_NF_MANGLE=y --CONFIG_IP6_NF_RAW=y --CONFIG_L2TP=y --CONFIG_NET_SCHED=y --CONFIG_NET_SCH_HTB=y --CONFIG_NET_SCH_NETEM=y --CONFIG_NET_SCH_INGRESS=y --CONFIG_NET_CLS_U32=y --CONFIG_NET_CLS_BPF=y --CONFIG_NET_EMATCH=y --CONFIG_NET_EMATCH_U32=y --CONFIG_NET_CLS_ACT=y --CONFIG_VSOCKETS=y --CONFIG_VIRTIO_VSOCKETS=y --CONFIG_CFG80211=y --# CONFIG_CFG80211_DEFAULT_PS is not set --# CONFIG_CFG80211_CRDA_SUPPORT is not set --CONFIG_MAC80211=y --# CONFIG_MAC80211_RC_MINSTREL is not set --CONFIG_RFKILL=y --CONFIG_PCI=y --CONFIG_PCI_HOST_GENERIC=y --CONFIG_DEVTMPFS=y --# CONFIG_ALLOW_DEV_COREDUMP is not set --CONFIG_DEBUG_DEVRES=y --CONFIG_OF_UNITTEST=y --CONFIG_ZRAM=y --CONFIG_BLK_DEV_LOOP=y --CONFIG_BLK_DEV_RAM=y --CONFIG_BLK_DEV_RAM_SIZE=8192 --CONFIG_VIRTIO_BLK=y --CONFIG_UID_SYS_STATS=y --CONFIG_SCSI=y --# CONFIG_SCSI_PROC_FS is not set --CONFIG_BLK_DEV_SD=y --CONFIG_MD=y --CONFIG_BLK_DEV_DM=y --CONFIG_DM_CRYPT=y --CONFIG_DM_UEVENT=y --CONFIG_DM_VERITY=y --CONFIG_DM_VERITY_AVB=y --CONFIG_DM_VERITY_FEC=y --CONFIG_DM_BOW=y --CONFIG_NETDEVICES=y --CONFIG_NETCONSOLE=y --CONFIG_NETCONSOLE_DYNAMIC=y --CONFIG_TUN=y --CONFIG_VIRTIO_NET=y --# CONFIG_ETHERNET is not set --CONFIG_PHYLIB=y --CONFIG_PPP=y --CONFIG_PPP_BSDCOMP=y --CONFIG_PPP_DEFLATE=y --CONFIG_PPP_MPPE=y --CONFIG_PPTP=y --CONFIG_PPPOL2TP=y --CONFIG_USB_RTL8152=y --CONFIG_USB_USBNET=y --# CONFIG_USB_NET_AX8817X is not set --# CONFIG_USB_NET_AX88179_178A is not set --# CONFIG_USB_NET_CDCETHER is not set --# CONFIG_USB_NET_CDC_NCM is not set --# CONFIG_USB_NET_NET1080 is not set --# CONFIG_USB_NET_CDC_SUBSET is not set --# CONFIG_USB_NET_ZAURUS is not set --# CONFIG_WLAN_VENDOR_ADMTEK is not set --# CONFIG_WLAN_VENDOR_ATH is not set --# CONFIG_WLAN_VENDOR_ATMEL is not set --# CONFIG_WLAN_VENDOR_BROADCOM is not set --# CONFIG_WLAN_VENDOR_CISCO is not set --# CONFIG_WLAN_VENDOR_INTEL is not set --# CONFIG_WLAN_VENDOR_INTERSIL is not set --# CONFIG_WLAN_VENDOR_MARVELL is not set --# CONFIG_WLAN_VENDOR_MEDIATEK is not set --# CONFIG_WLAN_VENDOR_RALINK is not set --# CONFIG_WLAN_VENDOR_REALTEK is not set --# CONFIG_WLAN_VENDOR_RSI is not set --# CONFIG_WLAN_VENDOR_ST is not set --# CONFIG_WLAN_VENDOR_TI is not set --# CONFIG_WLAN_VENDOR_ZYDAS is not set --# CONFIG_WLAN_VENDOR_QUANTENNA is not set --CONFIG_VIRT_WIFI=y --CONFIG_INPUT_EVDEV=y --# CONFIG_INPUT_KEYBOARD is not set --# CONFIG_INPUT_MOUSE is not set --CONFIG_INPUT_JOYSTICK=y --CONFIG_JOYSTICK_XPAD=y --CONFIG_JOYSTICK_XPAD_FF=y --CONFIG_JOYSTICK_XPAD_LEDS=y --CONFIG_INPUT_TABLET=y --CONFIG_TABLET_USB_ACECAD=y --CONFIG_TABLET_USB_AIPTEK=y --CONFIG_TABLET_USB_GTCO=y --CONFIG_TABLET_USB_HANWANG=y --CONFIG_TABLET_USB_KBTAB=y --CONFIG_INPUT_MISC=y --CONFIG_INPUT_UINPUT=y --# CONFIG_VT is not set --# CONFIG_LEGACY_PTYS is not set --# CONFIG_DEVMEM is not set --CONFIG_SERIAL_8250=y --# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set --CONFIG_SERIAL_8250_CONSOLE=y --# CONFIG_SERIAL_8250_EXAR is not set --CONFIG_SERIAL_8250_NR_UARTS=48 --CONFIG_SERIAL_8250_EXTENDED=y --CONFIG_SERIAL_8250_MANY_PORTS=y --CONFIG_SERIAL_8250_SHARE_IRQ=y --CONFIG_SERIAL_OF_PLATFORM=y --CONFIG_SERIAL_AMBA_PL011=y --CONFIG_SERIAL_AMBA_PL011_CONSOLE=y --CONFIG_VIRTIO_CONSOLE=y --CONFIG_HW_RANDOM=y --CONFIG_HW_RANDOM_VIRTIO=y --# CONFIG_HW_RANDOM_CAVIUM is not set --# CONFIG_DEVPORT is not set --# CONFIG_I2C_COMPAT is not set --# CONFIG_I2C_HELPER_AUTO is not set --# CONFIG_HWMON is not set --CONFIG_THERMAL=y --CONFIG_CPU_THERMAL=y --CONFIG_MEDIA_SUPPORT=y --# CONFIG_VGA_ARB is not set --CONFIG_DRM=y --# CONFIG_DRM_FBDEV_EMULATION is not set --CONFIG_DRM_VIRTIO_GPU=y --CONFIG_SOUND=y --CONFIG_SND=y --CONFIG_SND_HRTIMER=y --# CONFIG_SND_SUPPORT_OLD_API is not set --# CONFIG_SND_VERBOSE_PROCFS is not set --# CONFIG_SND_DRIVERS is not set --CONFIG_SND_INTEL8X0=y --# CONFIG_SND_USB is not set --CONFIG_HIDRAW=y --CONFIG_UHID=y --CONFIG_HID_A4TECH=y --CONFIG_HID_ACRUX=y --CONFIG_HID_ACRUX_FF=y --CONFIG_HID_APPLE=y --CONFIG_HID_BELKIN=y --CONFIG_HID_CHERRY=y --CONFIG_HID_CHICONY=y --CONFIG_HID_PRODIKEYS=y --CONFIG_HID_CYPRESS=y --CONFIG_HID_DRAGONRISE=y --CONFIG_DRAGONRISE_FF=y --CONFIG_HID_EMS_FF=y --CONFIG_HID_ELECOM=y --CONFIG_HID_EZKEY=y --CONFIG_HID_HOLTEK=y --CONFIG_HID_KEYTOUCH=y --CONFIG_HID_KYE=y --CONFIG_HID_UCLOGIC=y --CONFIG_HID_WALTOP=y --CONFIG_HID_GYRATION=y --CONFIG_HID_TWINHAN=y --CONFIG_HID_KENSINGTON=y --CONFIG_HID_LCPOWER=y --CONFIG_HID_LOGITECH=y --CONFIG_HID_LOGITECH_DJ=y --CONFIG_LOGITECH_FF=y --CONFIG_LOGIRUMBLEPAD2_FF=y --CONFIG_LOGIG940_FF=y --CONFIG_HID_MAGICMOUSE=y --CONFIG_HID_MICROSOFT=y --CONFIG_HID_MONTEREY=y --CONFIG_HID_MULTITOUCH=y --CONFIG_HID_NTRIG=y --CONFIG_HID_ORTEK=y --CONFIG_HID_PANTHERLORD=y --CONFIG_PANTHERLORD_FF=y --CONFIG_HID_PETALYNX=y --CONFIG_HID_PICOLCD=y --CONFIG_HID_PRIMAX=y --CONFIG_HID_ROCCAT=y --CONFIG_HID_SAITEK=y --CONFIG_HID_SAMSUNG=y --CONFIG_HID_SONY=y --CONFIG_HID_SPEEDLINK=y --CONFIG_HID_SUNPLUS=y --CONFIG_HID_GREENASIA=y --CONFIG_GREENASIA_FF=y --CONFIG_HID_SMARTJOYPLUS=y --CONFIG_SMARTJOYPLUS_FF=y --CONFIG_HID_TIVO=y --CONFIG_HID_TOPSEED=y --CONFIG_HID_THRUSTMASTER=y --CONFIG_HID_WACOM=y --CONFIG_HID_WIIMOTE=y --CONFIG_HID_ZEROPLUS=y --CONFIG_HID_ZYDACRON=y --CONFIG_USB_HIDDEV=y --CONFIG_USB_ANNOUNCE_NEW_DEVICES=y --CONFIG_USB_EHCI_HCD=y --CONFIG_USB_GADGET=y --CONFIG_USB_CONFIGFS=y --CONFIG_USB_CONFIGFS_UEVENT=y --CONFIG_USB_CONFIGFS_F_FS=y --CONFIG_USB_CONFIGFS_F_ACC=y --CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y --CONFIG_USB_CONFIGFS_F_MIDI=y --CONFIG_MMC=y --# CONFIG_PWRSEQ_EMMC is not set --# CONFIG_PWRSEQ_SIMPLE is not set --# CONFIG_MMC_BLOCK is not set --CONFIG_RTC_CLASS=y --# CONFIG_RTC_SYSTOHC is not set --CONFIG_RTC_DRV_PL030=y --CONFIG_RTC_DRV_PL031=y --CONFIG_VIRTIO_PCI=y --# CONFIG_VIRTIO_PCI_LEGACY is not set --CONFIG_VIRTIO_INPUT=y --CONFIG_VIRTIO_MMIO=y --CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y --CONFIG_STAGING=y --CONFIG_ASHMEM=y --CONFIG_ANDROID_VSOC=y --CONFIG_ION=y --CONFIG_ION_SYSTEM_HEAP=y --CONFIG_COMMON_CLK_SCPI=y --# CONFIG_COMMON_CLK_XGENE is not set --CONFIG_MAILBOX=y --# CONFIG_IOMMU_SUPPORT is not set --CONFIG_ANDROID=y --CONFIG_ANDROID_BINDER_IPC=y --CONFIG_EXT4_FS=y --CONFIG_EXT4_FS_SECURITY=y --CONFIG_F2FS_FS=y --CONFIG_F2FS_FS_SECURITY=y --CONFIG_FS_ENCRYPTION=y --# CONFIG_DNOTIFY is not set --CONFIG_QUOTA=y --CONFIG_QFMT_V2=y --CONFIG_FUSE_FS=y --CONFIG_OVERLAY_FS=y --CONFIG_MSDOS_FS=y --CONFIG_VFAT_FS=y --CONFIG_TMPFS=y --CONFIG_TMPFS_POSIX_ACL=y --CONFIG_SDCARD_FS=y --CONFIG_PSTORE=y --CONFIG_PSTORE_CONSOLE=y --CONFIG_PSTORE_RAM=y --CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y --CONFIG_SECURITY=y --CONFIG_SECURITY_NETWORK=y --CONFIG_LSM_MMAP_MIN_ADDR=65536 --CONFIG_HARDENED_USERCOPY=y --CONFIG_SECURITY_SELINUX=y --CONFIG_CRYPTO_ADIANTUM=y --CONFIG_CRYPTO_SHA512=y --CONFIG_CRYPTO_LZ4=y --CONFIG_CRYPTO_ZSTD=y --CONFIG_CRYPTO_ANSI_CPRNG=y --CONFIG_CRYPTO_DEV_VIRTIO=y --CONFIG_XZ_DEC=y --CONFIG_PRINTK_TIME=y --CONFIG_DEBUG_INFO=y --# CONFIG_ENABLE_MUST_CHECK is not set --CONFIG_FRAME_WARN=1024 --# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set --CONFIG_MAGIC_SYSRQ=y --CONFIG_DEBUG_STACK_USAGE=y --CONFIG_DEBUG_MEMORY_INIT=y --CONFIG_SOFTLOCKUP_DETECTOR=y --# CONFIG_DETECT_HUNG_TASK is not set --CONFIG_PANIC_TIMEOUT=5 --CONFIG_SCHEDSTATS=y --CONFIG_RCU_CPU_STALL_TIMEOUT=60 --CONFIG_ENABLE_DEFAULT_TRACERS=y --# CONFIG_RUNTIME_TESTING_MENU is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -deleted file mode 100644 -index cad481541d69..000000000000 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ /dev/null -@@ -1,472 +0,0 @@ --CONFIG_POSIX_MQUEUE=y --# CONFIG_USELIB is not set --CONFIG_AUDIT=y --CONFIG_NO_HZ=y --CONFIG_HIGH_RES_TIMERS=y --CONFIG_PREEMPT=y --CONFIG_BSD_PROCESS_ACCT=y --CONFIG_TASKSTATS=y --CONFIG_TASK_DELAY_ACCT=y --CONFIG_TASK_XACCT=y --CONFIG_TASK_IO_ACCOUNTING=y --CONFIG_PSI=y --CONFIG_IKCONFIG=y --CONFIG_IKCONFIG_PROC=y --CONFIG_CGROUPS=y --CONFIG_MEMCG=y --CONFIG_MEMCG_SWAP=y --CONFIG_CGROUP_SCHED=y --CONFIG_RT_GROUP_SCHED=y --CONFIG_CGROUP_FREEZER=y --CONFIG_CPUSETS=y --# CONFIG_PROC_PID_CPUSET is not set --CONFIG_CGROUP_CPUACCT=y --CONFIG_CGROUP_BPF=y --CONFIG_NAMESPACES=y --CONFIG_BLK_DEV_INITRD=y --# CONFIG_RD_LZ4 is not set --# CONFIG_FHANDLE is not set --# CONFIG_PCSPKR_PLATFORM is not set --CONFIG_KALLSYMS_ALL=y --CONFIG_BPF_SYSCALL=y --CONFIG_EMBEDDED=y --# CONFIG_COMPAT_BRK is not set --CONFIG_PROFILING=y --CONFIG_SMP=y --CONFIG_HYPERVISOR_GUEST=y --CONFIG_PARAVIRT=y --CONFIG_PARAVIRT_SPINLOCKS=y --CONFIG_MCORE2=y --CONFIG_PROCESSOR_SELECT=y --# CONFIG_CPU_SUP_CENTAUR is not set --CONFIG_NR_CPUS=8 --# CONFIG_MICROCODE is not set --CONFIG_X86_MSR=y --CONFIG_X86_CPUID=y --# CONFIG_MTRR is not set --CONFIG_HZ_100=y --CONFIG_KEXEC=y --CONFIG_CRASH_DUMP=y --CONFIG_PHYSICAL_START=0x200000 --CONFIG_PHYSICAL_ALIGN=0x1000000 --CONFIG_CMDLINE_BOOL=y --CONFIG_CMDLINE="console=ttyS0 reboot=p" --CONFIG_PM_WAKELOCKS=y --CONFIG_PM_WAKELOCKS_LIMIT=0 --# CONFIG_PM_WAKELOCKS_GC is not set --CONFIG_PM_DEBUG=y --CONFIG_ACPI_PROCFS_POWER=y --# CONFIG_ACPI_FAN is not set --# CONFIG_ACPI_THERMAL is not set --# CONFIG_X86_PM_TIMER is not set --CONFIG_CPU_FREQ_TIMES=y --CONFIG_CPU_FREQ_GOV_ONDEMAND=y --CONFIG_X86_ACPI_CPUFREQ=y --CONFIG_PCI_MSI=y --CONFIG_IA32_EMULATION=y --# CONFIG_FIRMWARE_MEMMAP is not set --CONFIG_OPROFILE=y --CONFIG_KPROBES=y --CONFIG_REFCOUNT_FULL=y --CONFIG_MODULES=y --CONFIG_MODULE_UNLOAD=y --CONFIG_MODVERSIONS=y --CONFIG_PARTITION_ADVANCED=y --# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set --CONFIG_BINFMT_MISC=y --CONFIG_KSM=y --CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 --CONFIG_TRANSPARENT_HUGEPAGE=y --CONFIG_ZSMALLOC=y --CONFIG_NET=y --CONFIG_PACKET=y --CONFIG_UNIX=y --CONFIG_XFRM_USER=y --CONFIG_NET_KEY=y --CONFIG_INET=y --CONFIG_IP_MULTICAST=y --CONFIG_IP_ADVANCED_ROUTER=y --CONFIG_IP_MULTIPLE_TABLES=y --CONFIG_IP_ROUTE_MULTIPATH=y --CONFIG_IP_ROUTE_VERBOSE=y --CONFIG_IP_MROUTE=y --CONFIG_IP_PIMSM_V1=y --CONFIG_IP_PIMSM_V2=y --CONFIG_SYN_COOKIES=y --CONFIG_NET_IPVTI=y --CONFIG_INET_ESP=y --CONFIG_INET_UDP_DIAG=y --CONFIG_INET_DIAG_DESTROY=y --CONFIG_TCP_CONG_ADVANCED=y --# CONFIG_TCP_CONG_BIC is not set --# CONFIG_TCP_CONG_WESTWOOD is not set --# CONFIG_TCP_CONG_HTCP is not set --CONFIG_TCP_MD5SIG=y --CONFIG_IPV6_ROUTER_PREF=y --CONFIG_IPV6_ROUTE_INFO=y --CONFIG_IPV6_OPTIMISTIC_DAD=y --CONFIG_INET6_AH=y --CONFIG_INET6_ESP=y --CONFIG_INET6_IPCOMP=y --CONFIG_IPV6_MIP6=y --CONFIG_IPV6_VTI=y --CONFIG_IPV6_MULTIPLE_TABLES=y --CONFIG_NETLABEL=y --CONFIG_NETFILTER=y --CONFIG_NF_CONNTRACK=y --CONFIG_NF_CONNTRACK_SECMARK=y --CONFIG_NF_CONNTRACK_EVENTS=y --CONFIG_NF_CONNTRACK_AMANDA=y --CONFIG_NF_CONNTRACK_FTP=y --CONFIG_NF_CONNTRACK_H323=y --CONFIG_NF_CONNTRACK_IRC=y --CONFIG_NF_CONNTRACK_NETBIOS_NS=y --CONFIG_NF_CONNTRACK_PPTP=y --CONFIG_NF_CONNTRACK_SANE=y --CONFIG_NF_CONNTRACK_TFTP=y --CONFIG_NF_CT_NETLINK=y --CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y --CONFIG_NETFILTER_XT_TARGET_CONNMARK=y --CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y --CONFIG_NETFILTER_XT_TARGET_CT=y --CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y --CONFIG_NETFILTER_XT_TARGET_MARK=y --CONFIG_NETFILTER_XT_TARGET_NFLOG=y --CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y --CONFIG_NETFILTER_XT_TARGET_TPROXY=y --CONFIG_NETFILTER_XT_TARGET_TRACE=y --CONFIG_NETFILTER_XT_TARGET_SECMARK=y --CONFIG_NETFILTER_XT_TARGET_TCPMSS=y --CONFIG_NETFILTER_XT_MATCH_BPF=y --CONFIG_NETFILTER_XT_MATCH_COMMENT=y --CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y --CONFIG_NETFILTER_XT_MATCH_CONNMARK=y --CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y --CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y --CONFIG_NETFILTER_XT_MATCH_HELPER=y --CONFIG_NETFILTER_XT_MATCH_IPRANGE=y --CONFIG_NETFILTER_XT_MATCH_LENGTH=y --CONFIG_NETFILTER_XT_MATCH_LIMIT=y --CONFIG_NETFILTER_XT_MATCH_MAC=y --CONFIG_NETFILTER_XT_MATCH_MARK=y --CONFIG_NETFILTER_XT_MATCH_OWNER=y --CONFIG_NETFILTER_XT_MATCH_POLICY=y --CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y --CONFIG_NETFILTER_XT_MATCH_QUOTA=y --CONFIG_NETFILTER_XT_MATCH_QUOTA2=y --CONFIG_NETFILTER_XT_MATCH_SOCKET=y --CONFIG_NETFILTER_XT_MATCH_STATE=y --CONFIG_NETFILTER_XT_MATCH_STATISTIC=y --CONFIG_NETFILTER_XT_MATCH_STRING=y --CONFIG_NETFILTER_XT_MATCH_TIME=y --CONFIG_NETFILTER_XT_MATCH_U32=y --CONFIG_IP_NF_IPTABLES=y --CONFIG_IP_NF_MATCH_AH=y --CONFIG_IP_NF_MATCH_ECN=y --CONFIG_IP_NF_MATCH_TTL=y --CONFIG_IP_NF_FILTER=y --CONFIG_IP_NF_TARGET_REJECT=y --CONFIG_IP_NF_NAT=y --CONFIG_IP_NF_TARGET_MASQUERADE=y --CONFIG_IP_NF_TARGET_NETMAP=y --CONFIG_IP_NF_TARGET_REDIRECT=y --CONFIG_IP_NF_MANGLE=y --CONFIG_IP_NF_RAW=y --CONFIG_IP_NF_SECURITY=y --CONFIG_IP_NF_ARPTABLES=y --CONFIG_IP_NF_ARPFILTER=y --CONFIG_IP_NF_ARP_MANGLE=y --CONFIG_IP6_NF_IPTABLES=y --CONFIG_IP6_NF_MATCH_IPV6HEADER=y --CONFIG_IP6_NF_MATCH_RPFILTER=y --CONFIG_IP6_NF_FILTER=y --CONFIG_IP6_NF_TARGET_REJECT=y --CONFIG_IP6_NF_MANGLE=y --CONFIG_IP6_NF_RAW=y --CONFIG_NET_SCHED=y --CONFIG_NET_SCH_HTB=y --CONFIG_NET_SCH_NETEM=y --CONFIG_NET_SCH_INGRESS=y --CONFIG_NET_CLS_U32=y --CONFIG_NET_CLS_BPF=y --CONFIG_NET_EMATCH=y --CONFIG_NET_EMATCH_U32=y --CONFIG_NET_CLS_ACT=y --CONFIG_VSOCKETS=y --CONFIG_VIRTIO_VSOCKETS=y --CONFIG_CFG80211=y --CONFIG_MAC80211=y --CONFIG_RFKILL=y --CONFIG_PCI=y --CONFIG_PCI_MSI=y --CONFIG_DEVTMPFS=y --CONFIG_DEBUG_DEVRES=y --CONFIG_OF=y --CONFIG_OF_UNITTEST=y --# CONFIG_PNP_DEBUG_MESSAGES is not set --CONFIG_ZRAM=y --CONFIG_BLK_DEV_LOOP=y --CONFIG_BLK_DEV_RAM=y --CONFIG_BLK_DEV_RAM_SIZE=8192 --CONFIG_VIRTIO_BLK=y --CONFIG_UID_SYS_STATS=y --CONFIG_SCSI=y --CONFIG_BLK_DEV_SD=y --CONFIG_BLK_DEV_SR=y --CONFIG_BLK_DEV_SR_VENDOR=y --CONFIG_CHR_DEV_SG=y --CONFIG_SCSI_CONSTANTS=y --CONFIG_SCSI_SPI_ATTRS=y --CONFIG_MD=y --CONFIG_BLK_DEV_DM=y --CONFIG_DM_CRYPT=y --CONFIG_DM_MIRROR=y --CONFIG_DM_ZERO=y --CONFIG_DM_UEVENT=y --CONFIG_DM_VERITY=y --CONFIG_DM_VERITY_AVB=y --CONFIG_DM_VERITY_FEC=y --CONFIG_DM_BOW=y --CONFIG_NETDEVICES=y --CONFIG_NETCONSOLE=y --CONFIG_NETCONSOLE_DYNAMIC=y --CONFIG_TUN=y --CONFIG_VIRTIO_NET=y --# CONFIG_ETHERNET is not set --CONFIG_PPP=y --CONFIG_PPP_BSDCOMP=y --CONFIG_PPP_DEFLATE=y --CONFIG_PPP_MPPE=y --CONFIG_USB_RTL8152=y --CONFIG_USB_USBNET=y --# CONFIG_USB_NET_AX8817X is not set --# CONFIG_USB_NET_AX88179_178A is not set --# CONFIG_USB_NET_CDCETHER is not set --# CONFIG_USB_NET_CDC_NCM is not set --# CONFIG_USB_NET_NET1080 is not set --# CONFIG_USB_NET_CDC_SUBSET is not set --# CONFIG_USB_NET_ZAURUS is not set --# CONFIG_WLAN_VENDOR_ADMTEK is not set --# CONFIG_WLAN_VENDOR_ATH is not set --# CONFIG_WLAN_VENDOR_ATMEL is not set --# CONFIG_WLAN_VENDOR_BROADCOM is not set --# CONFIG_WLAN_VENDOR_CISCO is not set --# CONFIG_WLAN_VENDOR_INTEL is not set --# CONFIG_WLAN_VENDOR_INTERSIL is not set --# CONFIG_WLAN_VENDOR_MARVELL is not set --# CONFIG_WLAN_VENDOR_MEDIATEK is not set --# CONFIG_WLAN_VENDOR_RALINK is not set --# CONFIG_WLAN_VENDOR_REALTEK is not set --# CONFIG_WLAN_VENDOR_RSI is not set --# CONFIG_WLAN_VENDOR_ST is not set --# CONFIG_WLAN_VENDOR_TI is not set --# CONFIG_WLAN_VENDOR_ZYDAS is not set --# CONFIG_WLAN_VENDOR_QUANTENNA is not set --CONFIG_MAC80211_HWSIM=y --CONFIG_VIRT_WIFI=y --CONFIG_INPUT_MOUSEDEV=y --CONFIG_INPUT_EVDEV=y --# CONFIG_INPUT_KEYBOARD is not set --# CONFIG_INPUT_MOUSE is not set --CONFIG_INPUT_JOYSTICK=y --CONFIG_JOYSTICK_XPAD=y --CONFIG_JOYSTICK_XPAD_FF=y --CONFIG_JOYSTICK_XPAD_LEDS=y --CONFIG_INPUT_TABLET=y --CONFIG_TABLET_USB_ACECAD=y --CONFIG_TABLET_USB_AIPTEK=y --CONFIG_TABLET_USB_GTCO=y --CONFIG_TABLET_USB_HANWANG=y --CONFIG_TABLET_USB_KBTAB=y --CONFIG_INPUT_MISC=y --CONFIG_INPUT_UINPUT=y --# CONFIG_SERIO_I8042 is not set --# CONFIG_VT is not set --# CONFIG_LEGACY_PTYS is not set --# CONFIG_DEVMEM is not set --CONFIG_SERIAL_8250=y --# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set --CONFIG_SERIAL_8250_CONSOLE=y --# CONFIG_SERIAL_8250_EXAR is not set --CONFIG_SERIAL_8250_NR_UARTS=48 --CONFIG_SERIAL_8250_EXTENDED=y --CONFIG_SERIAL_8250_MANY_PORTS=y --CONFIG_SERIAL_8250_SHARE_IRQ=y --CONFIG_VIRTIO_CONSOLE=y --CONFIG_HW_RANDOM=y --# CONFIG_HW_RANDOM_INTEL is not set --# CONFIG_HW_RANDOM_AMD is not set --# CONFIG_HW_RANDOM_VIA is not set --CONFIG_HW_RANDOM_VIRTIO=y --CONFIG_HPET=y --# CONFIG_HPET_MMAP_DEFAULT is not set --# CONFIG_DEVPORT is not set --# CONFIG_ACPI_I2C_OPREGION is not set --# CONFIG_I2C_COMPAT is not set --# CONFIG_I2C_HELPER_AUTO is not set --CONFIG_PTP_1588_CLOCK=y --# CONFIG_HWMON is not set --# CONFIG_X86_PKG_TEMP_THERMAL is not set --CONFIG_WATCHDOG=y --CONFIG_SOFT_WATCHDOG=y --CONFIG_MEDIA_SUPPORT=y --# CONFIG_VGA_ARB is not set --CONFIG_DRM=y --# CONFIG_DRM_FBDEV_EMULATION is not set --CONFIG_DRM_VIRTIO_GPU=y --CONFIG_SOUND=y --CONFIG_SND=y --CONFIG_SND_HRTIMER=y --# CONFIG_SND_SUPPORT_OLD_API is not set --# CONFIG_SND_VERBOSE_PROCFS is not set --# CONFIG_SND_DRIVERS is not set --CONFIG_SND_INTEL8X0=y --# CONFIG_SND_USB is not set --CONFIG_HIDRAW=y --CONFIG_UHID=y --CONFIG_HID_A4TECH=y --CONFIG_HID_ACRUX=y --CONFIG_HID_ACRUX_FF=y --CONFIG_HID_APPLE=y --CONFIG_HID_BELKIN=y --CONFIG_HID_CHERRY=y --CONFIG_HID_CHICONY=y --CONFIG_HID_PRODIKEYS=y --CONFIG_HID_CYPRESS=y --CONFIG_HID_DRAGONRISE=y --CONFIG_DRAGONRISE_FF=y --CONFIG_HID_EMS_FF=y --CONFIG_HID_ELECOM=y --CONFIG_HID_EZKEY=y --CONFIG_HID_HOLTEK=y --CONFIG_HID_KEYTOUCH=y --CONFIG_HID_KYE=y --CONFIG_HID_UCLOGIC=y --CONFIG_HID_WALTOP=y --CONFIG_HID_GYRATION=y --CONFIG_HID_TWINHAN=y --CONFIG_HID_KENSINGTON=y --CONFIG_HID_LCPOWER=y --CONFIG_HID_LOGITECH=y --CONFIG_HID_LOGITECH_DJ=y --CONFIG_LOGITECH_FF=y --CONFIG_LOGIRUMBLEPAD2_FF=y --CONFIG_LOGIG940_FF=y --CONFIG_HID_MAGICMOUSE=y --CONFIG_HID_MICROSOFT=y --CONFIG_HID_MONTEREY=y --CONFIG_HID_MULTITOUCH=y --CONFIG_HID_NTRIG=y --CONFIG_HID_ORTEK=y --CONFIG_HID_PANTHERLORD=y --CONFIG_PANTHERLORD_FF=y --CONFIG_HID_PETALYNX=y --CONFIG_HID_PICOLCD=y --CONFIG_HID_PRIMAX=y --CONFIG_HID_ROCCAT=y --CONFIG_HID_SAITEK=y --CONFIG_HID_SAMSUNG=y --CONFIG_HID_SONY=y --CONFIG_HID_SPEEDLINK=y --CONFIG_HID_SUNPLUS=y --CONFIG_HID_GREENASIA=y --CONFIG_GREENASIA_FF=y --CONFIG_HID_SMARTJOYPLUS=y --CONFIG_SMARTJOYPLUS_FF=y --CONFIG_HID_TIVO=y --CONFIG_HID_TOPSEED=y --CONFIG_HID_THRUSTMASTER=y --CONFIG_HID_WACOM=y --CONFIG_HID_WIIMOTE=y --CONFIG_HID_ZEROPLUS=y --CONFIG_HID_ZYDACRON=y --CONFIG_USB_HIDDEV=y --CONFIG_USB_ANNOUNCE_NEW_DEVICES=y --CONFIG_USB_EHCI_HCD=y --CONFIG_USB_GADGET=y --CONFIG_USB_DUMMY_HCD=y --CONFIG_USB_CONFIGFS=y --CONFIG_USB_CONFIGFS_UEVENT=y --CONFIG_USB_CONFIGFS_F_FS=y --CONFIG_USB_CONFIGFS_F_ACC=y --CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y --CONFIG_USB_CONFIGFS_F_MIDI=y --CONFIG_MMC=y --# CONFIG_PWRSEQ_EMMC is not set --# CONFIG_PWRSEQ_SIMPLE is not set --# CONFIG_MMC_BLOCK is not set --CONFIG_RTC_CLASS=y --CONFIG_SW_SYNC=y --CONFIG_VIRTIO_PCI=y --CONFIG_VIRTIO_INPUT=y --CONFIG_VIRTIO_MMIO=y --CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y --CONFIG_STAGING=y --CONFIG_ASHMEM=y --CONFIG_ANDROID_VSOC=y --CONFIG_ION=y --CONFIG_ION_SYSTEM_HEAP=y --# CONFIG_X86_PLATFORM_DEVICES is not set --# CONFIG_IOMMU_SUPPORT is not set --CONFIG_ANDROID=y --CONFIG_ANDROID_BINDER_IPC=y --CONFIG_EXT4_FS=y --CONFIG_EXT4_FS_POSIX_ACL=y --CONFIG_EXT4_FS_SECURITY=y --CONFIG_EXT4_ENCRYPTION=y --CONFIG_F2FS_FS=y --CONFIG_F2FS_FS_SECURITY=y --CONFIG_F2FS_FS_ENCRYPTION=y --CONFIG_QUOTA=y --CONFIG_QUOTA_NETLINK_INTERFACE=y --# CONFIG_PRINT_QUOTA_WARNING is not set --CONFIG_QFMT_V2=y --CONFIG_AUTOFS4_FS=y --CONFIG_FUSE_FS=y --CONFIG_OVERLAY_FS=y --CONFIG_MSDOS_FS=y --CONFIG_VFAT_FS=y --CONFIG_PROC_KCORE=y --CONFIG_TMPFS=y --CONFIG_TMPFS_POSIX_ACL=y --CONFIG_HUGETLBFS=y --CONFIG_SDCARD_FS=y --CONFIG_PSTORE=y --CONFIG_PSTORE_CONSOLE=y --CONFIG_PSTORE_RAM=y --CONFIG_NLS_DEFAULT="utf8" --CONFIG_NLS_CODEPAGE_437=y --CONFIG_NLS_ASCII=y --CONFIG_NLS_ISO8859_1=y --CONFIG_NLS_UTF8=y --CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y --CONFIG_SECURITY=y --CONFIG_SECURITY_NETWORK=y --CONFIG_SECURITY_PATH=y --CONFIG_HARDENED_USERCOPY=y --CONFIG_SECURITY_SELINUX=y --CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 --# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set --CONFIG_CRYPTO_ADIANTUM=y --CONFIG_CRYPTO_SHA512=y --CONFIG_CRYPTO_AES_NI_INTEL=y --CONFIG_CRYPTO_LZ4=y --CONFIG_CRYPTO_ZSTD=y --CONFIG_CRYPTO_DEV_VIRTIO=y --CONFIG_PRINTK_TIME=y --CONFIG_DEBUG_INFO=y --# CONFIG_ENABLE_MUST_CHECK is not set --CONFIG_FRAME_WARN=1024 --# CONFIG_UNUSED_SYMBOLS is not set --CONFIG_OPTIMIZE_INLINING=y --CONFIG_MAGIC_SYSRQ=y --CONFIG_DEBUG_STACK_USAGE=y --CONFIG_DEBUG_MEMORY_INIT=y --CONFIG_HARDLOCKUP_DETECTOR=y --CONFIG_PANIC_TIMEOUT=5 --CONFIG_SCHEDSTATS=y --CONFIG_RCU_CPU_STALL_TIMEOUT=60 --CONFIG_ENABLE_DEFAULT_TRACERS=y --CONFIG_IO_DELAY_NONE=y --CONFIG_DEBUG_BOOT_PARAMS=y --CONFIG_UNWINDER_FRAME_POINTER=y -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -deleted file mode 100644 -index b9115335e3fc..000000000000 ---- a/build.config.cuttlefish.aarch64 -+++ /dev/null -@@ -1,18 +0,0 @@ --ARCH=arm64 --BRANCH=android-mainline --CLANG_TRIPLE=aarch64-linux-gnu- --CROSS_COMPILE=aarch64-linux-androidkernel- --CC=clang --DEFCONFIG=cuttlefish_defconfig --EXTRA_CMDS='' --KERNEL_DIR=common --POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin --BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 --LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin --FILES=" --arch/arm64/boot/Image.gz --vmlinux --System.map --" --STOP_SHIP_TRACEPRINTK=1 -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -deleted file mode 100644 -index bdcbecea3ce1..000000000000 ---- a/build.config.cuttlefish.x86_64 -+++ /dev/null -@@ -1,18 +0,0 @@ --ARCH=x86_64 --BRANCH=android-mainline --CLANG_TRIPLE=x86_64-linux-gnu- --CROSS_COMPILE=x86_64-linux-androidkernel- --CC=clang --DEFCONFIG=x86_64_cuttlefish_defconfig --EXTRA_CMDS='' --KERNEL_DIR=common --POST_DEFCONFIG_CMDS="check_defconfig" --CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin --BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 --LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin --FILES=" --arch/x86/boot/bzImage --vmlinux --System.map --" --STOP_SHIP_TRACEPRINTK=1 diff --git a/patches/ANDROID-Removed-extraneous-configs-from-gki.patch b/patches/ANDROID-Removed-extraneous-configs-from-gki.patch index 5323af7051f1..2f8ab3df4b79 100644 --- a/patches/ANDROID-Removed-extraneous-configs-from-gki.patch +++ b/patches/ANDROID-Removed-extraneous-configs-from-gki.patch @@ -9,32 +9,10 @@ Test: Boot x86 cuttlefish and gki Signed-off-by: Ram Muthiah Change-Id: I342ee9a9a2c715565ce5304f37d40575c234efd6 --- - arch/arm64/configs/cuttlefish_defconfig | 2 -- - arch/arm64/configs/gki_defconfig | 2 -- - arch/x86/configs/gki_defconfig | 2 -- - arch/x86/configs/x86_64_cuttlefish_defconfig | 2 -- - 4 files changed, 8 deletions(-) + arch/arm64/configs/gki_defconfig | 2 -- + arch/x86/configs/gki_defconfig | 2 -- + 2 files changed, 4 deletions(-) -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 69ee170e471d..0b89a91037a8 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -204,7 +204,6 @@ CONFIG_UID_SYS_STATS=y - CONFIG_SCSI=y - # CONFIG_SCSI_PROC_FS is not set - CONFIG_BLK_DEV_SD=y --CONFIG_SCSI_VIRTIO=y - CONFIG_MD=y - CONFIG_BLK_DEV_DM=y - CONFIG_DM_CRYPT=y -@@ -382,7 +381,6 @@ CONFIG_RTC_DRV_PL030=y - CONFIG_RTC_DRV_PL031=y - CONFIG_VIRTIO_PCI=y - # CONFIG_VIRTIO_PCI_LEGACY is not set --CONFIG_VIRTIO_BALLOON=y - CONFIG_VIRTIO_INPUT=y - CONFIG_VIRTIO_MMIO=y - CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9bc2782661dc..7eeafbecf1b9 100644 --- a/arch/arm64/configs/gki_defconfig @@ -75,23 +53,3 @@ index 7f4edee2b52d..c0993920b94d 100644 CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index cdb7e31593e1..5baf17714b0c 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -217,7 +217,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y - CONFIG_CHR_DEV_SG=y - CONFIG_SCSI_CONSTANTS=y - CONFIG_SCSI_SPI_ATTRS=y --CONFIG_SCSI_VIRTIO=y - CONFIG_MD=y - CONFIG_BLK_DEV_DM=y - CONFIG_DM_CRYPT=y -@@ -399,7 +398,6 @@ CONFIG_MMC=y - CONFIG_RTC_CLASS=y - CONFIG_SW_SYNC=y - CONFIG_VIRTIO_PCI=y --CONFIG_VIRTIO_BALLOON=y - CONFIG_VIRTIO_INPUT=y - CONFIG_VIRTIO_MMIO=y - CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y diff --git a/patches/ANDROID-Turn-xt_owner-module-on.patch b/patches/ANDROID-Turn-xt_owner-module-on.patch deleted file mode 100644 index 70e652983b0d..000000000000 --- a/patches/ANDROID-Turn-xt_owner-module-on.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chenbo Feng -Date: Fri, 8 Feb 2019 15:53:02 -0800 -Subject: ANDROID: Turn xt_owner module on - -Once xt_qtaguid module is deprecated, the netd strictController which -uses owner match to filter egress traffic will not work because -xt_qtaguid masquerades as (and implements/extends) the "owner" module on -android devices. It can be resolved by turning upstream xt_owner module -back on since strictController only targets egress traffic and the -upstream xt_owner module works fine in this case. - -Signed-off-by: Chenbo Feng -Bug: 79938294 -Test: manual cherry-pick and compile -Change-Id: Ia099db025f17f6042384c9f0caf7b941a40b8b84 ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index d74af2e0e4b1..87a90ea32c2d 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -143,6 +143,7 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y - CONFIG_NETFILTER_XT_MATCH_LIMIT=y - CONFIG_NETFILTER_XT_MATCH_MAC=y - CONFIG_NETFILTER_XT_MATCH_MARK=y -+CONFIG_NETFILTER_XT_MATCH_OWNER=y - CONFIG_NETFILTER_XT_MATCH_POLICY=y - CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y - CONFIG_NETFILTER_XT_MATCH_QUOTA=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 35c800c4bb40..e889c64f64f8 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -147,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y - CONFIG_NETFILTER_XT_MATCH_LIMIT=y - CONFIG_NETFILTER_XT_MATCH_MAC=y - CONFIG_NETFILTER_XT_MATCH_MARK=y -+CONFIG_NETFILTER_XT_MATCH_OWNER=y - CONFIG_NETFILTER_XT_MATCH_POLICY=y - CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y - CONFIG_NETFILTER_XT_MATCH_QUOTA=y diff --git a/patches/ANDROID-build-configs-switch-prebuilt-path-location.patch b/patches/ANDROID-build-configs-switch-prebuilt-path-location.patch index 97cc15c0af60..9eed0e98f5b4 100644 --- a/patches/ANDROID-build-configs-switch-prebuilt-path-location.patch +++ b/patches/ANDROID-build-configs-switch-prebuilt-path-location.patch @@ -9,38 +9,10 @@ Bug: 135922132 Change-Id: I8755f8f0154eecc86ad598be7a7811e9d8f068ed Signed-off-by: Matthias Maennich --- - build.config.cuttlefish.aarch64 | 2 +- - build.config.cuttlefish.x86_64 | 2 +- - build.config.gki.aarch64 | 2 +- - build.config.gki.x86_64 | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + build.config.gki.aarch64 | 2 +- + build.config.gki.x86_64 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index 40c8d7a5219c..b9115335e3fc 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -8,7 +8,7 @@ EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" - CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin --BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 -+BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin - FILES=" - arch/arm64/boot/Image.gz -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index c9496b0d2ce6..bdcbecea3ce1 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -8,7 +8,7 @@ EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" - CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin --BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 -+BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin - FILES=" - arch/x86/boot/bzImage diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 24dade721f96..79871cdc6d07 100644 --- a/build.config.gki.aarch64 diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_INET_UDP_DIAG-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_INET_UDP_DIAG-y.patch deleted file mode 100644 index 252b020f501b..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_INET_UDP_DIAG-y.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Fri, 8 Mar 2019 12:59:37 -0800 -Subject: ANDROID: cuttlefish: enable CONFIG_INET_UDP_DIAG=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror: - https://android-review.googlesource.com/c/kernel/configs/+/721208 - android-base.cfg: enable CONFIG_INET_UDP_DIAG - -Generated via: - echo 'CONFIG_INET_UDP_DIAG=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_INET_UDP_DIAG=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - rm defconfig - -Bug: 127981801 -Signed-off-by: Maciej Żenczykowski -Change-Id: I5d4533b7c3b9a11e45e96b0346a70b3f93d4a812 ---- - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 6bc11c09af2b..e0729ca6bd0e 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -96,6 +96,7 @@ CONFIG_SYN_COOKIES=y - CONFIG_NET_IPVTI=y - CONFIG_INET_ESP=y - # CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_UDP_DIAG=y - CONFIG_INET_DIAG_DESTROY=y - CONFIG_TCP_CONG_ADVANCED=y - # CONFIG_TCP_CONG_BIC is not set diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_NETFILTER_XT_TARGET_CT-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_NETFILTER_XT_TARGET_CT-y.patch deleted file mode 100644 index 55bf2fab3432..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_NETFILTER_XT_TARGET_CT-y.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Tue, 5 Mar 2019 23:04:17 -0800 -Subject: ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror: - https://android-review.googlesource.com/c/kernel/configs/+/919855 - android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config - -Generated via: - echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - rm defconfig - -Bug: 124361845 -Signed-off-by: Maciej Żenczykowski -Change-Id: I6035ef8e75f9daada706a9233999368a22904c4e ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 622db3a8c04b..2bff38b2701f 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -123,6 +123,7 @@ CONFIG_NF_CT_NETLINK=y - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y - CONFIG_NETFILTER_XT_TARGET_CONNMARK=y - CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y -+CONFIG_NETFILTER_XT_TARGET_CT=y - CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y - CONFIG_NETFILTER_XT_TARGET_MARK=y - CONFIG_NETFILTER_XT_TARGET_NFLOG=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index e8da56181903..f2682d56232b 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -127,6 +127,7 @@ CONFIG_NF_CT_NETLINK=y - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y - CONFIG_NETFILTER_XT_TARGET_CONNMARK=y - CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y -+CONFIG_NETFILTER_XT_TARGET_CT=y - CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y - CONFIG_NETFILTER_XT_TARGET_MARK=y - CONFIG_NETFILTER_XT_TARGET_NFLOG=y diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_CLS_BPF-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_NET_CLS_BPF-y.patch deleted file mode 100644 index 7f930fd2b66f..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_CLS_BPF-y.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Tue, 15 Jan 2019 16:35:27 -0800 -Subject: ANDROID: cuttlefish: enable CONFIG_NET_CLS_BPF=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror - https://android-review.googlesource.com/c/kernel/configs/+/870517 - android-4.9+: add CONFIG_NET_CLS_BPF to base - -Generated via: - echo 'CONFIG_NET_CLS_BPF=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_NET_CLS_BPF=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - -Bug: 65674744 -Change-Id: I8e4dfe7a99d38fd5942001a1aab83b7ac9df30dd -Signed-off-by: Maciej Żenczykowski ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 730006337b2c..0aaf923e8c5a 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -178,6 +178,7 @@ CONFIG_L2TP=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y - CONFIG_NET_CLS_U32=y -+CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y - CONFIG_NET_EMATCH_U32=y - CONFIG_NET_CLS_ACT=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 3bd7f24a945f..183dd803421e 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -183,6 +183,7 @@ CONFIG_IP6_NF_RAW=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y - CONFIG_NET_CLS_U32=y -+CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y - CONFIG_NET_EMATCH_U32=y - CONFIG_NET_CLS_ACT=y diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_INGRESS-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_INGRESS-y.patch deleted file mode 100644 index a73f9ea05ecc..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_INGRESS-y.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Thu, 4 Apr 2019 00:40:13 -0700 -Subject: ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror: - https://android-review.googlesource.com/c/kernel/configs/+/939600 - android-4.9+ for Q: require CONFIG_NET_SCH_INGRESS=y - -Generated via: - echo 'CONFIG_NET_SCH_INGRESS=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_NET_SCH_INGRESS=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - rm defconfig - -Bug: 65674744 -Signed-off-by: Maciej Żenczykowski -Change-Id: I3ad4fb15e450392e527563208587b18b8285b3a8 ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 76a68561f2fb..3e13e7149946 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -182,6 +182,7 @@ CONFIG_L2TP=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y - CONFIG_NET_SCH_NETEM=y -+CONFIG_NET_SCH_INGRESS=y - CONFIG_NET_CLS_U32=y - CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index b2ad519f11c7..bc4493329802 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -188,6 +188,7 @@ CONFIG_IP6_NF_RAW=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y - CONFIG_NET_SCH_NETEM=y -+CONFIG_NET_SCH_INGRESS=y - CONFIG_NET_CLS_U32=y - CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_NETEM-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_NETEM-y.patch deleted file mode 100644 index edf8099a1e28..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_NET_SCH_NETEM-y.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Thu, 14 Feb 2019 15:32:55 -0800 -Subject: ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror: - https://android-review.googlesource.com/c/kernel/configs/+/906713 - android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config - -Generated via: - echo 'CONFIG_NET_SCH_NETEM=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_NET_SCH_NETEM=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - rm defconfig - -Bug: 124467469 -Signed-off-by: Maciej Żenczykowski -Change-Id: If06da8f0e77d5523c56fea5d520131e456f9b529 ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 87a90ea32c2d..622db3a8c04b 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -178,6 +178,7 @@ CONFIG_IP6_NF_RAW=y - CONFIG_L2TP=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y -+CONFIG_NET_SCH_NETEM=y - CONFIG_NET_CLS_U32=y - CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index e889c64f64f8..e8da56181903 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -183,6 +183,7 @@ CONFIG_IP6_NF_MANGLE=y - CONFIG_IP6_NF_RAW=y - CONFIG_NET_SCHED=y - CONFIG_NET_SCH_HTB=y -+CONFIG_NET_SCH_NETEM=y - CONFIG_NET_CLS_U32=y - CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y diff --git a/patches/ANDROID-cuttlefish-enable-CONFIG_USB_RTL8152-y.patch b/patches/ANDROID-cuttlefish-enable-CONFIG_USB_RTL8152-y.patch deleted file mode 100644 index 6f7fd2da9e2d..000000000000 --- a/patches/ANDROID-cuttlefish-enable-CONFIG_USB_RTL8152-y.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Wed, 6 Mar 2019 17:02:40 -0800 -Subject: ANDROID: cuttlefish: enable CONFIG_USB_RTL8152=y -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is to mirror: - https://android-review.googlesource.com/c/kernel/configs/+/920741 - Require CONFIG_USB_RTL8152 != n if we have host usb support. - -Generated via: - echo 'CONFIG_USB_RTL8152=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig - echo 'CONFIG_USB_RTL8152=y' >> arch/arm64/configs/cuttlefish_defconfig - make ARCH=x86_64 x86_64_cuttlefish_defconfig - make ARCH=x86_64 savedefconfig - cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig - make ARCH=arm64 cuttlefish_defconfig - make ARCH=arm64 savedefconfig - cat defconfig > arch/arm64/configs/cuttlefish_defconfig - rm defconfig - -Bug: 110755806 -Signed-off-by: Maciej Żenczykowski -Change-Id: Iadca2a11b76296532aa42dde999ee73f58e0bd97 ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 9740f417f74e..4db58d634d7e 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -230,6 +230,7 @@ CONFIG_PPP_DEFLATE=y - CONFIG_PPP_MPPE=y - CONFIG_PPTP=y - CONFIG_PPPOL2TP=y -+CONFIG_USB_RTL8152=y - CONFIG_USB_USBNET=y - # CONFIG_USB_NET_AX8817X is not set - # CONFIG_USB_NET_AX88179_178A is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index cef416b3a97d..6bc11c09af2b 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -235,6 +235,7 @@ CONFIG_PPP=y - CONFIG_PPP_BSDCOMP=y - CONFIG_PPP_DEFLATE=y - CONFIG_PPP_MPPE=y -+CONFIG_USB_RTL8152=y - CONFIG_USB_USBNET=y - # CONFIG_USB_NET_AX8817X is not set - # CONFIG_USB_NET_AX88179_178A is not set diff --git a/patches/ANDROID-cuttlefish-gki-_defconfig-Enable-CONFIG_SDCARD_FS.patch b/patches/ANDROID-cuttlefish-gki-_defconfig-Enable-CONFIG_SDCARD_FS.patch index 1ae01e03b683..f281b1ec1b14 100644 --- a/patches/ANDROID-cuttlefish-gki-_defconfig-Enable-CONFIG_SDCARD_FS.patch +++ b/patches/ANDROID-cuttlefish-gki-_defconfig-Enable-CONFIG_SDCARD_FS.patch @@ -7,24 +7,10 @@ Bug: 118439987 Change-Id: I020ec721d98c5612bfe76dcfc05caabb1f3588c1 Signed-off-by: Alistair Strachan --- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/arm64/configs/gki_defconfig | 1 + - arch/x86/configs/gki_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 4 files changed, 4 insertions(+) + arch/arm64/configs/gki_defconfig | 1 + + arch/x86/configs/gki_defconfig | 1 + + 2 files changed, 2 insertions(+) -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 0b89a91037a8..b84aad53e6d6 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -409,6 +409,7 @@ CONFIG_MSDOS_FS=y - CONFIG_VFAT_FS=y - CONFIG_TMPFS=y - CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_SDCARD_FS=y - CONFIG_PSTORE=y - CONFIG_PSTORE_CONSOLE=y - CONFIG_PSTORE_RAM=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 140804afdd32..18e8f81cc0fb 100644 --- a/arch/arm64/configs/gki_defconfig @@ -49,15 +35,3 @@ index 65c67797fb74..eacebe96e422 100644 CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 5baf17714b0c..cad481541d69 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -430,6 +430,7 @@ CONFIG_PROC_KCORE=y - CONFIG_TMPFS=y - CONFIG_TMPFS_POSIX_ACL=y - CONFIG_HUGETLBFS=y -+CONFIG_SDCARD_FS=y - CONFIG_PSTORE=y - CONFIG_PSTORE_CONSOLE=y - CONFIG_PSTORE_RAM=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Add-support-for-AC97-audio.patch b/patches/ANDROID-cuttlefish_defconfig-Add-support-for-AC97-audio.patch deleted file mode 100644 index 3ded523489dd..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Add-support-for-AC97-audio.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 5 Mar 2019 11:11:34 -0800 -Subject: ANDROID: cuttlefish_defconfig: Add support for AC97 audio - -Enable driver support for the ac97 emulation provided by QEMU and -crosvm. This is for the older 'ac97' soundhw, not 'hda'. - -Bug: 120439617 -Bug: 126955561 -Test: local build and test of sound from cuttlefish -Change-Id: I6c29e352e0be161e2a1dc35fde50b888b7dbf86e -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 6 ++++++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 09b07573dc66..9740f417f74e 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -300,6 +300,12 @@ CONFIG_DRM=y - CONFIG_DRM_VIRTIO_GPU=y - CONFIG_SOUND=y - CONFIG_SND=y -+CONFIG_SND_HRTIMER=y -+# CONFIG_SND_SUPPORT_OLD_API is not set -+# CONFIG_SND_VERBOSE_PROCFS is not set -+# CONFIG_SND_DRIVERS is not set -+CONFIG_SND_INTEL8X0=y -+# CONFIG_SND_USB is not set - CONFIG_HIDRAW=y - CONFIG_UHID=y - CONFIG_HID_A4TECH=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index de163e79ee0a..cef416b3a97d 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -312,6 +312,12 @@ CONFIG_DRM=y - CONFIG_DRM_VIRTIO_GPU=y - CONFIG_SOUND=y - CONFIG_SND=y -+CONFIG_SND_HRTIMER=y -+# CONFIG_SND_SUPPORT_OLD_API is not set -+# CONFIG_SND_VERBOSE_PROCFS is not set -+# CONFIG_SND_DRIVERS is not set -+CONFIG_SND_INTEL8X0=y -+# CONFIG_SND_USB is not set - CONFIG_HIDRAW=y - CONFIG_UHID=y - CONFIG_HID_A4TECH=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch deleted file mode 100644 index 75ecd72d4adb..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 7 Dec 2018 11:50:07 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_ARM64_LSE_ATOMICS - -Enabling this was previously blocked by a lack of support for this -feature in clang, but that problem has been resolved in a newer version -of the compiler. - -Bug: 120439617 -Change-Id: I0f5fd2439c5a71ee0988648970576b46b2c4d20b -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 8d379eb47d34..3c799383ff40 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -45,7 +45,6 @@ CONFIG_SWP_EMULATION=y - CONFIG_CP15_BARRIER_EMULATION=y - CONFIG_SETEND_EMULATION=y - CONFIG_ARM64_SW_TTBR0_PAN=y --# CONFIG_ARM64_LSE_ATOMICS is not set - CONFIG_RANDOMIZE_BASE=y - CONFIG_CMDLINE="console=ttyAMA0" - CONFIG_CMDLINE_EXTEND=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CMDLINE_EXTEND.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CMDLINE_EXTEND.patch deleted file mode 100644 index 70df88315d2d..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CMDLINE_EXTEND.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 4 Dec 2018 17:49:30 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_CMDLINE_EXTEND - -Bug: 118439987 -Bug: 120439617 -Change-Id: Ib00ea9b9fd0d841d23bc902ed57a0c910cad2310 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index e9cfb27a7af3..b5ec7e3c81aa 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -46,6 +46,7 @@ CONFIG_ARM64_SW_TTBR0_PAN=y - # CONFIG_ARM64_LSE_ATOMICS is not set - CONFIG_RANDOMIZE_BASE=y - CONFIG_CMDLINE="console=ttyAMA0" -+CONFIG_CMDLINE_EXTEND=y - # CONFIG_EFI is not set - CONFIG_COMPAT=y - CONFIG_PM_WAKELOCKS=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPUSETS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPUSETS.patch deleted file mode 100644 index c128c4a4d85b..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPUSETS.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:34:22 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS - -Bug: 118439987 -Bug: 120439617 -Change-Id: I2e730890db891b7c258ce21004b382556af434f5 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 2 ++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index ca9d2b3413f2..fce6de5c89a1 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -12,6 +12,8 @@ CONFIG_MEMCG=y - CONFIG_MEMCG_SWAP=y - CONFIG_RT_GROUP_SCHED=y - CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+# CONFIG_PROC_PID_CPUSET is not set - CONFIG_CGROUP_CPUACCT=y - CONFIG_CGROUP_BPF=y - CONFIG_SCHED_AUTOGROUP=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 918218ed6cf6..9b323d60aae5 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -17,6 +17,8 @@ CONFIG_MEMCG_SWAP=y - CONFIG_CGROUP_SCHED=y - CONFIG_RT_GROUP_SCHED=y - CONFIG_CGROUP_FREEZER=y -+CONFIG_CPUSETS=y -+# CONFIG_PROC_PID_CPUSET is not set - CONFIG_CGROUP_CPUACCT=y - CONFIG_CGROUP_BPF=y - CONFIG_NAMESPACES=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch deleted file mode 100644 index 74d4e1075572..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 30 Oct 2018 17:29:12 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_CPU_FREQ_TIMES - -Bug: 118439987 -Bug: 127641090 -Change-Id: If2a7c773f74dd9351815daa5a935eacc40fa5b84 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 2bff38b2701f..09b07573dc66 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -58,6 +58,7 @@ CONFIG_ENERGY_MODEL=y - CONFIG_CPU_IDLE=y - CONFIG_ARM_CPUIDLE=y - CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_TIMES=y - CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y - CONFIG_CPU_FREQ_GOV_POWERSAVE=y - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index f2682d56232b..de163e79ee0a 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -58,6 +58,7 @@ CONFIG_ACPI_PROCFS_POWER=y - # CONFIG_ACPI_FAN is not set - # CONFIG_ACPI_THERMAL is not set - # CONFIG_X86_PM_TIMER is not set -+CONFIG_CPU_FREQ_TIMES=y - CONFIG_CPU_FREQ_GOV_ONDEMAND=y - CONFIG_X86_ACPI_CPUFREQ=y - CONFIG_PCI_MSI=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CRYPTO_ADIANTUM.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CRYPTO_ADIANTUM.patch deleted file mode 100644 index a4502a7681fb..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_CRYPTO_ADIANTUM.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 3 Dec 2018 12:53:02 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_CRYPTO_ADIANTUM - -Bug: 118439987 -Bug: 120439617 -Change-Id: I0a192256b4bbf101221a3bb31c4f288581bbddc5 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 2a6b0a950bc9..8d379eb47d34 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -407,6 +407,7 @@ CONFIG_SECURITY_NETWORK=y - CONFIG_LSM_MMAP_MIN_ADDR=65536 - CONFIG_HARDENED_USERCOPY=y - CONFIG_SECURITY_SELINUX=y -+CONFIG_CRYPTO_ADIANTUM=y - CONFIG_CRYPTO_SHA512=y - CONFIG_CRYPTO_LZ4=y - CONFIG_CRYPTO_ZSTD=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 937f715f5fee..5fd2be0402c5 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -426,6 +426,7 @@ CONFIG_HARDENED_USERCOPY=y - CONFIG_SECURITY_SELINUX=y - CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 - # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -+CONFIG_CRYPTO_ADIANTUM=y - CONFIG_CRYPTO_SHA512=y - CONFIG_CRYPTO_LZ4=y - CONFIG_CRYPTO_ZSTD=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_DM_VERITY_AVB.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_DM_VERITY_AVB.patch deleted file mode 100644 index 85ad0ccd3549..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_DM_VERITY_AVB.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:35:52 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_DM_VERITY_AVB - -Bug: 118439987 -Bug: 120439617 -Change-Id: If92a3c2f23f211ab9b73ea2b41ee339727ad1018 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index fce6de5c89a1..86a3707faf27 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -208,6 +208,7 @@ CONFIG_BLK_DEV_DM=y - CONFIG_DM_CRYPT=y - CONFIG_DM_UEVENT=y - CONFIG_DM_VERITY=y -+CONFIG_DM_VERITY_AVB=y - CONFIG_DM_VERITY_FEC=y - CONFIG_NETDEVICES=y - CONFIG_NETCONSOLE=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 9b323d60aae5..1c362f19e073 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -215,6 +215,7 @@ CONFIG_DM_MIRROR=y - CONFIG_DM_ZERO=y - CONFIG_DM_UEVENT=y - CONFIG_DM_VERITY=y -+CONFIG_DM_VERITY_AVB=y - CONFIG_DM_VERITY_FEC=y - CONFIG_NETDEVICES=y - CONFIG_NETCONSOLE=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_FUSE_FS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_FUSE_FS.patch deleted file mode 100644 index 527f4ce5b007..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_FUSE_FS.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 2 Apr 2019 23:59:58 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_FUSE_FS - -Bug: 120439617 -Bug: 129901600 -Change-Id: Iff554123147f7761ca639b89612138b82a4a400a -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 420ff37f91fb..435332a06662 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -411,6 +411,7 @@ CONFIG_F2FS_FS_ENCRYPTION=y - # CONFIG_DNOTIFY is not set - CONFIG_QUOTA=y - CONFIG_QFMT_V2=y -+CONFIG_FUSE_FS=y - CONFIG_OVERLAY_FS=y - CONFIG_MSDOS_FS=y - CONFIG_VFAT_FS=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index e93ce3c519d6..304c572750ed 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -424,6 +424,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y - # CONFIG_PRINT_QUOTA_WARNING is not set - CONFIG_QFMT_V2=y - CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=y - CONFIG_OVERLAY_FS=y - CONFIG_MSDOS_FS=y - CONFIG_VFAT_FS=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch deleted file mode 100644 index 64e518965834..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 22 Mar 2019 16:52:47 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_INPUT_MOUSEDEV - -Bug: 120439617 -Bug: 128633328 -Change-Id: I2186d8070f7885937925a25e85ce7b5722a73d57 -Signed-off-by: Alistair Strachan ---- - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 3deac5da306a..abd24a4f017d 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -264,6 +264,7 @@ CONFIG_USB_USBNET=y - # CONFIG_WLAN_VENDOR_QUANTENNA is not set - CONFIG_MAC80211_HWSIM=y - CONFIG_VIRT_WIFI=y -+CONFIG_INPUT_MOUSEDEV=y - CONFIG_INPUT_EVDEV=y - # CONFIG_INPUT_KEYBOARD is not set - # CONFIG_INPUT_MOUSE is not set diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_MMC.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_MMC.patch deleted file mode 100644 index db4c9aa4bd32..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_MMC.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:37:18 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_MMC - -Bug: 118439987 -Bug: 120439617 -Change-Id: I7c63e4b9462bfe6fe46c6f7d5661b48dcecdb5e8 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 4 ++++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 97a45ba040a2..fa86d0682e21 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -356,6 +356,10 @@ CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_ACC=y - CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y - CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_MMC=y -+# CONFIG_PWRSEQ_EMMC is not set -+# CONFIG_PWRSEQ_SIMPLE is not set -+# CONFIG_MMC_BLOCK is not set - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - # CONFIG_RTC_SYSTOHC is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 3ad5e6d87a5d..5ce93372e6a7 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -368,6 +368,10 @@ CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_ACC=y - CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y - CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_MMC=y -+# CONFIG_PWRSEQ_EMMC is not set -+# CONFIG_PWRSEQ_SIMPLE is not set -+# CONFIG_MMC_BLOCK is not set - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set - CONFIG_SW_SYNC=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch deleted file mode 100644 index 73c17aa05b16..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 30 Oct 2018 17:29:12 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable - CONFIG_NETFILTER_XT_MATCH_QUOTA2 - -Bug: 118439987 -Bug: 120439617 -Change-Id: I88fad3590ef2f37daedfd4fe005bd196649f2384 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 86a3707faf27..8897572788d2 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -147,6 +147,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y - CONFIG_NETFILTER_XT_MATCH_POLICY=y - CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y - CONFIG_NETFILTER_XT_MATCH_QUOTA=y -+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y - CONFIG_NETFILTER_XT_MATCH_SOCKET=y - CONFIG_NETFILTER_XT_MATCH_STATE=y - CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 1c362f19e073..40026fb95672 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -150,6 +150,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y - CONFIG_NETFILTER_XT_MATCH_POLICY=y - CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y - CONFIG_NETFILTER_XT_MATCH_QUOTA=y -+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y - CONFIG_NETFILTER_XT_MATCH_SOCKET=y - CONFIG_NETFILTER_XT_MATCH_STATE=y - CONFIG_NETFILTER_XT_MATCH_STATISTIC=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_OVERLAY_FS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_OVERLAY_FS.patch deleted file mode 100644 index 3517e9ceb7fa..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_OVERLAY_FS.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 2 Apr 2019 23:59:58 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS - -Bug: 120439617 -Bug: 123755887 -Change-Id: I5e1225c0ba82ac6d12133ed0e118bf31c21b8da5 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 3e13e7149946..420ff37f91fb 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -411,6 +411,7 @@ CONFIG_F2FS_FS_ENCRYPTION=y - # CONFIG_DNOTIFY is not set - CONFIG_QUOTA=y - CONFIG_QFMT_V2=y -+CONFIG_OVERLAY_FS=y - CONFIG_MSDOS_FS=y - CONFIG_VFAT_FS=y - CONFIG_TMPFS=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index bc4493329802..e93ce3c519d6 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -424,6 +424,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y - # CONFIG_PRINT_QUOTA_WARNING is not set - CONFIG_QFMT_V2=y - CONFIG_AUTOFS4_FS=y -+CONFIG_OVERLAY_FS=y - CONFIG_MSDOS_FS=y - CONFIG_VFAT_FS=y - CONFIG_PROC_KCORE=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_PSI.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_PSI.patch deleted file mode 100644 index 58b29a432af0..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_PSI.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 22 Mar 2019 14:10:59 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_PSI - -Bug: 120439617 -Bug: 127712811 -Change-Id: Id3531e3573ccea1720047d502288f60ee151cbff -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 4db58d634d7e..b3116d935c84 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -6,6 +6,7 @@ CONFIG_TASKSTATS=y - CONFIG_TASK_DELAY_ACCT=y - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_PSI=y - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y - CONFIG_MEMCG=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index e0729ca6bd0e..3deac5da306a 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -9,6 +9,7 @@ CONFIG_TASKSTATS=y - CONFIG_TASK_DELAY_ACCT=y - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_PSI=y - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y - CONFIG_CGROUPS=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_RTC_HCTOSYS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_RTC_HCTOSYS.patch deleted file mode 100644 index 98c91dabdbfc..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_RTC_HCTOSYS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthias Maennich -Date: Mon, 4 Feb 2019 17:33:19 +0000 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_RTC_HCTOSYS - -This configuration is required for the VTS test -VtsKernelApiSysfsTest#testRtcHctosys to pass. - -Bug: 123860857 -Test: run vts-kernel -m VtsKernelApiSysfsTest -Signed-off-by: Matthias Maennich -Change-Id: Icae17c74460bcd2aef4cf4e3ec5381de9ea0a66c ---- - arch/arm64/configs/cuttlefish_defconfig | 1 - - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index ec0149bf7246..d74af2e0e4b1 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -369,7 +369,6 @@ CONFIG_MMC=y - # CONFIG_PWRSEQ_SIMPLE is not set - # CONFIG_MMC_BLOCK is not set - CONFIG_RTC_CLASS=y --# CONFIG_RTC_HCTOSYS is not set - # CONFIG_RTC_SYSTOHC is not set - CONFIG_RTC_DRV_PL031=y - CONFIG_VIRTIO_PCI=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index ab7fced951fa..35c800c4bb40 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -382,7 +382,6 @@ CONFIG_MMC=y - # CONFIG_PWRSEQ_SIMPLE is not set - # CONFIG_MMC_BLOCK is not set - CONFIG_RTC_CLASS=y --# CONFIG_RTC_HCTOSYS is not set - CONFIG_SW_SYNC=y - CONFIG_VIRTIO_PCI=y - CONFIG_VIRTIO_BALLOON=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_UID_SYS_STATS.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_UID_SYS_STATS.patch deleted file mode 100644 index 34fa6f09e9af..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_UID_SYS_STATS.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 30 Oct 2018 17:29:25 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_UID_SYS_STATS - -Bug: 118439987 -Bug: 120439617 -Change-Id: I0a62a9c17f58d79201640be311ea7280a2a040fd -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index fa86d0682e21..ca9d2b3413f2 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -195,6 +195,7 @@ CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_RAM=y - CONFIG_BLK_DEV_RAM_SIZE=8192 - CONFIG_VIRTIO_BLK=y -+CONFIG_UID_SYS_STATS=y - CONFIG_SCSI=y - # CONFIG_SCSI_MQ_DEFAULT is not set - # CONFIG_SCSI_PROC_FS is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 5ce93372e6a7..918218ed6cf6 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -197,6 +197,7 @@ CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_RAM=y - CONFIG_BLK_DEV_RAM_SIZE=8192 - CONFIG_VIRTIO_BLK=y -+CONFIG_UID_SYS_STATS=y - CONFIG_SCSI=y - CONFIG_BLK_DEV_SD=y - CONFIG_BLK_DEV_SR=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch deleted file mode 100644 index 555830a308f9..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:38:12 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_USB_CONFIGFS_F_ACC - -Bug: 118439987 -Bug: 120439617 -Change-Id: I16cd3772a5511842b02ed6114ccc0b0eee5126f8 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index c3f86180e65c..bb22c11a7eb3 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -353,6 +353,7 @@ CONFIG_USB_GADGET=y - CONFIG_USB_CONFIGFS=y - CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_ACC=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 0f72dfca13fa..6de2240beeb9 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -365,6 +365,7 @@ CONFIG_USB_DUMMY_HCD=y - CONFIG_USB_CONFIGFS=y - CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_ACC=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch deleted file mode 100644 index 01ad77f58221..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:38:37 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_USB_CONFIGFS_F_AUDIO_SRC - -Bug: 118439987 -Bug: 120439617 -Change-Id: I0efbdae061dc79eb4a006b2499c9afd82fbd62fc -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index bb22c11a7eb3..97a45ba040a2 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -354,6 +354,7 @@ CONFIG_USB_CONFIGFS=y - CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_ACC=y -+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 6de2240beeb9..3ad5e6d87a5d 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -366,6 +366,7 @@ CONFIG_USB_CONFIGFS=y - CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_ACC=y -+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y - # CONFIG_RTC_HCTOSYS is not set diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch deleted file mode 100644 index 9f09660bb154..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Mon, 29 Oct 2018 14:36:30 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable CONFIG_USB_CONFIGFS_UEVENT - -Bug: 118439987 -Bug: 120439617 -Change-Id: Iab0c48a56c74ce6240bac696494a8de6e936660b -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index b5ec7e3c81aa..c3f86180e65c 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -351,6 +351,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_GADGET=y - CONFIG_USB_CONFIGFS=y -+CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index a30f92646583..0f72dfca13fa 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -363,6 +363,7 @@ CONFIG_USB_EHCI_HCD=y - CONFIG_USB_GADGET=y - CONFIG_USB_DUMMY_HCD=y - CONFIG_USB_CONFIGFS=y -+CONFIG_USB_CONFIGFS_UEVENT=y - CONFIG_USB_CONFIGFS_F_FS=y - CONFIG_USB_CONFIGFS_F_MIDI=y - CONFIG_RTC_CLASS=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-EAS-related-defines.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-EAS-related-defines.patch deleted file mode 100644 index 017fd6cdac1a..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-EAS-related-defines.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Thu, 8 Nov 2018 11:16:03 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable EAS related defines - -Provides build coverage for features coming from eas-dev. For now, make -this specific to the arm64 defconfig. - -Bug: 118439987 -Bug: 120439617 -Test: make ARCH=arm64 cuttlefish_defconfig && make ARCH=arm64 -Change-Id: Id018290a2d38631b4b88f15ee7a1a85fcce25798 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 26 ++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index e6f0856cd790..e9cfb27a7af3 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -8,14 +8,14 @@ CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y --CONFIG_CGROUPS=y - CONFIG_MEMCG=y - CONFIG_MEMCG_SWAP=y --CONFIG_CGROUP_SCHED=y - CONFIG_RT_GROUP_SCHED=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CGROUP_CPUACCT=y - CONFIG_CGROUP_BPF=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_SCHED_TUNE=y - CONFIG_BLK_DEV_INITRD=y - # CONFIG_RD_BZIP2 is not set - # CONFIG_RD_LZMA is not set -@@ -52,8 +52,22 @@ CONFIG_PM_WAKELOCKS=y - CONFIG_PM_WAKELOCKS_LIMIT=0 - # CONFIG_PM_WAKELOCKS_GC is not set - CONFIG_PM_DEBUG=y -+CONFIG_ENERGY_MODEL=y -+CONFIG_CPU_IDLE=y -+CONFIG_ARM_CPUIDLE=y - CONFIG_CPU_FREQ=y --CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y -+CONFIG_CPU_FREQ_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+CONFIG_CPUFREQ_DT=y -+CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -+CONFIG_ARM_DT_BL_CPUFREQ=y -+CONFIG_ARM_SCPI_CPUFREQ=y -+CONFIG_ARM_SCMI_CPUFREQ=y -+CONFIG_ARM_SCMI_PROTOCOL=y -+# CONFIG_ARM_SCMI_POWER_DOMAIN is not set -+CONFIG_ARM_SCPI_PROTOCOL=y -+# CONFIG_ARM_SCPI_POWER_DOMAIN is not set - CONFIG_KPROBES=y - CONFIG_JUMP_LABEL=y - CONFIG_MODULES=y -@@ -264,6 +278,8 @@ CONFIG_HW_RANDOM_VIRTIO=y - # CONFIG_I2C_COMPAT is not set - # CONFIG_I2C_HELPER_AUTO is not set - # CONFIG_HWMON is not set -+CONFIG_THERMAL=y -+CONFIG_CPU_THERMAL=y - CONFIG_MEDIA_SUPPORT=y - # CONFIG_VGA_ARB is not set - CONFIG_DRM=y -@@ -349,9 +365,13 @@ CONFIG_STAGING=y - CONFIG_ASHMEM=y - CONFIG_ANDROID_VSOC=y - CONFIG_ION=y -+CONFIG_COMMON_CLK_SCPI=y -+# CONFIG_COMMON_CLK_XGENE is not set -+CONFIG_MAILBOX=y - # CONFIG_IOMMU_SUPPORT is not set - CONFIG_ANDROID=y - CONFIG_ANDROID_BINDER_IPC=y -+CONFIG_LEGACY_ENERGY_MODEL_DT=y - CONFIG_EXT4_FS=y - CONFIG_EXT4_FS_SECURITY=y - CONFIG_EXT4_ENCRYPTION=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-SECURITY_PERF_EVENTS_RESTRICT.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-SECURITY_PERF_EVENTS_RESTRICT.patch deleted file mode 100644 index ad2b52c64237..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-SECURITY_PERF_EVENTS_RESTRICT.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 26 Oct 2018 10:02:08 -0700 -Subject: ANDROID: cuttlefish_defconfig: Enable SECURITY_PERF_EVENTS_RESTRICT - -Bug: 118439987 -Bug: 120439617 -Change-Id: Ic7dd653292a565a2d4323d68692318e8d881aaeb -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 8897572788d2..2a6b0a950bc9 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -401,6 +401,7 @@ CONFIG_TMPFS_POSIX_ACL=y - CONFIG_PSTORE=y - CONFIG_PSTORE_CONSOLE=y - CONFIG_PSTORE_RAM=y -+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y - CONFIG_SECURITY=y - CONFIG_SECURITY_NETWORK=y - CONFIG_LSM_MMAP_MIN_ADDR=65536 -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 40026fb95672..937f715f5fee 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -418,6 +418,7 @@ CONFIG_NLS_CODEPAGE_437=y - CONFIG_NLS_ASCII=y - CONFIG_NLS_ISO8859_1=y - CONFIG_NLS_UTF8=y -+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y - CONFIG_SECURITY=y - CONFIG_SECURITY_NETWORK=y - CONFIG_SECURITY_PATH=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-VIRTIO_INPUT.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-VIRTIO_INPUT.patch deleted file mode 100644 index 0c51a502e494..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-VIRTIO_INPUT.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Wed, 2 Jan 2019 15:24:37 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable VIRTIO_INPUT - -Bug: 120439617 -Change-Id: I83fdb2088f17e71f377e5864d217655b47839267 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 7506d19bd6fb..730006337b2c 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -372,6 +372,7 @@ CONFIG_RTC_DRV_PL031=y - CONFIG_VIRTIO_PCI=y - # CONFIG_VIRTIO_PCI_LEGACY is not set - CONFIG_VIRTIO_BALLOON=y -+CONFIG_VIRTIO_INPUT=y - CONFIG_VIRTIO_MMIO=y - CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - CONFIG_STAGING=y -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 94ca3e49694c..3bd7f24a945f 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -383,6 +383,7 @@ CONFIG_RTC_CLASS=y - CONFIG_SW_SYNC=y - CONFIG_VIRTIO_PCI=y - CONFIG_VIRTIO_BALLOON=y -+CONFIG_VIRTIO_INPUT=y - CONFIG_VIRTIO_MMIO=y - CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y - CONFIG_STAGING=y diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-VIRT_WIFI.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-VIRT_WIFI.patch deleted file mode 100644 index 354dac4ea0b7..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-VIRT_WIFI.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Fri, 7 Dec 2018 16:40:23 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable VIRT_WIFI - -Bug: 120439617 -Bug: 120682817 -Change-Id: Ia1b66528bd9cb1e6e95bd75ac60f393978caa582 -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 1 + - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 3c799383ff40..7506d19bd6fb 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -247,6 +247,7 @@ CONFIG_USB_USBNET=y - # CONFIG_WLAN_VENDOR_TI is not set - # CONFIG_WLAN_VENDOR_ZYDAS is not set - # CONFIG_WLAN_VENDOR_QUANTENNA is not set -+CONFIG_VIRT_WIFI=y - CONFIG_INPUT_EVDEV=y - # CONFIG_INPUT_KEYBOARD is not set - # CONFIG_INPUT_MOUSE is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 5fd2be0402c5..94ca3e49694c 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -253,6 +253,7 @@ CONFIG_USB_USBNET=y - # CONFIG_WLAN_VENDOR_ZYDAS is not set - # CONFIG_WLAN_VENDOR_QUANTENNA is not set - CONFIG_MAC80211_HWSIM=y -+CONFIG_VIRT_WIFI=y - CONFIG_INPUT_EVDEV=y - # CONFIG_INPUT_KEYBOARD is not set - # CONFIG_INPUT_MOUSE is not set diff --git a/patches/ANDROID-cuttlefish_defconfig-Enable-vsock-options.patch b/patches/ANDROID-cuttlefish_defconfig-Enable-vsock-options.patch deleted file mode 100644 index c06b9722aff4..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-Enable-vsock-options.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cody Schuffelen -Date: Mon, 14 Jan 2019 18:37:28 -0800 -Subject: ANDROID: cuttlefish_defconfig: Enable vsock options - -Bug: 121166534 -Test: Ran cuttlefish with common kernel + vsock adb tunnel -Signed-off-by: Cody Schuffelen -Change-Id: I8168a710052c7daada306a915c56230c961accd4 ---- - arch/arm64/configs/cuttlefish_defconfig | 2 ++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 0aaf923e8c5a..ec0149bf7246 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -182,6 +182,8 @@ CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y - CONFIG_NET_EMATCH_U32=y - CONFIG_NET_CLS_ACT=y -+CONFIG_VSOCKETS=y -+CONFIG_VIRTIO_VSOCKETS=y - CONFIG_CFG80211=y - # CONFIG_CFG80211_DEFAULT_PS is not set - # CONFIG_CFG80211_CRDA_SUPPORT is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 183dd803421e..ab7fced951fa 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -187,6 +187,8 @@ CONFIG_NET_CLS_BPF=y - CONFIG_NET_EMATCH=y - CONFIG_NET_EMATCH_U32=y - CONFIG_NET_CLS_ACT=y -+CONFIG_VSOCKETS=y -+CONFIG_VIRTIO_VSOCKETS=y - CONFIG_CFG80211=y - CONFIG_MAC80211=y - CONFIG_RFKILL=y diff --git a/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking-2.patch b/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking-2.patch deleted file mode 100644 index 3b85abd3f04f..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking-2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Tue, 14 May 2019 16:04:54 -0700 -Subject: ANDROID: cuttlefish_defconfig: sync with android-mainline-tracking - (#2) - -Synchronize the x86_64 defconfig too. - -Change-Id: If959b35778b645a9443d9620a9a77283b71edd04 -Signed-off-by: Alistair Strachan ---- - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -index 304c572750ed..d1f0fa08eacf 100644 ---- a/arch/x86/configs/x86_64_cuttlefish_defconfig -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -450,6 +450,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 - # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set - CONFIG_CRYPTO_ADIANTUM=y - CONFIG_CRYPTO_SHA512=y -+CONFIG_CRYPTO_AES_NI_INTEL=y - CONFIG_CRYPTO_LZ4=y - CONFIG_CRYPTO_ZSTD=y - CONFIG_CRYPTO_DEV_VIRTIO=y diff --git a/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking.patch b/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking.patch deleted file mode 100644 index c2d1ce8e06b6..000000000000 --- a/patches/ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tri Vo -Date: Mon, 13 May 2019 10:05:49 -0700 -Subject: ANDROID: cuttlefish_defconfig: sync with android-mainline-tracking - -Note that savedefconfig dropped CONFIG_SCHED_TUNE, which is not present -on this branch (yet). - -Test: boot cuttlefish on arm64 -Signed-off-by: Tri Vo ---- - arch/arm64/configs/cuttlefish_defconfig | 20 ++++++++------------ - 1 file changed, 8 insertions(+), 12 deletions(-) - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 435332a06662..5f7157425a31 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -14,11 +14,9 @@ CONFIG_MEMCG_SWAP=y - CONFIG_RT_GROUP_SCHED=y - CONFIG_CGROUP_FREEZER=y - CONFIG_CPUSETS=y --# CONFIG_PROC_PID_CPUSET is not set - CONFIG_CGROUP_CPUACCT=y - CONFIG_CGROUP_BPF=y - CONFIG_SCHED_AUTOGROUP=y --CONFIG_SCHED_TUNE=y - CONFIG_BLK_DEV_INITRD=y - # CONFIG_RD_BZIP2 is not set - # CONFIG_RD_LZMA is not set -@@ -36,8 +34,7 @@ CONFIG_EMBEDDED=y - # CONFIG_COMPAT_BRK is not set - # CONFIG_SLAB_MERGE_DEFAULT is not set - CONFIG_PROFILING=y --CONFIG_PCI=y --CONFIG_PCI_HOST_GENERIC=y -+CONFIG_SCHED_MC=y - CONFIG_HZ_100=y - CONFIG_SECCOMP=y - CONFIG_PARAVIRT=y -@@ -47,8 +44,6 @@ CONFIG_CP15_BARRIER_EMULATION=y - CONFIG_SETEND_EMULATION=y - CONFIG_ARM64_SW_TTBR0_PAN=y - CONFIG_RANDOMIZE_BASE=y --CONFIG_CMDLINE="console=ttyAMA0" --CONFIG_CMDLINE_EXTEND=y - # CONFIG_EFI is not set - CONFIG_COMPAT=y - CONFIG_PM_WAKELOCKS=y -@@ -64,8 +59,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y - CONFIG_CPU_FREQ_GOV_POWERSAVE=y - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y - CONFIG_CPUFREQ_DT=y --CONFIG_ARM_BIG_LITTLE_CPUFREQ=y --CONFIG_ARM_DT_BL_CPUFREQ=y - CONFIG_ARM_SCPI_CPUFREQ=y - CONFIG_ARM_SCMI_CPUFREQ=y - CONFIG_ARM_SCMI_PROTOCOL=y -@@ -86,6 +79,8 @@ CONFIG_NET=y - CONFIG_PACKET=y - CONFIG_UNIX=y - CONFIG_XFRM_USER=y -+CONFIG_XFRM_INTERFACE=y -+CONFIG_XFRM_STATISTICS=y - CONFIG_NET_KEY=y - CONFIG_INET=y - CONFIG_IP_MULTICAST=y -@@ -196,6 +191,8 @@ CONFIG_CFG80211=y - CONFIG_MAC80211=y - # CONFIG_MAC80211_RC_MINSTREL is not set - CONFIG_RFKILL=y -+CONFIG_PCI=y -+CONFIG_PCI_HOST_GENERIC=y - # CONFIG_UEVENT_HELPER is not set - CONFIG_DEVTMPFS=y - # CONFIG_ALLOW_DEV_COREDUMP is not set -@@ -208,7 +205,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 - CONFIG_VIRTIO_BLK=y - CONFIG_UID_SYS_STATS=y - CONFIG_SCSI=y --# CONFIG_SCSI_MQ_DEFAULT is not set - # CONFIG_SCSI_PROC_FS is not set - CONFIG_BLK_DEV_SD=y - CONFIG_SCSI_VIRTIO=y -@@ -285,6 +281,7 @@ CONFIG_SERIAL_8250_NR_UARTS=48 - CONFIG_SERIAL_8250_EXTENDED=y - CONFIG_SERIAL_8250_MANY_PORTS=y - CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_OF_PLATFORM=y - CONFIG_SERIAL_AMBA_PL011=y - CONFIG_SERIAL_AMBA_PL011_CONSOLE=y - CONFIG_VIRTIO_CONSOLE=y -@@ -384,6 +381,7 @@ CONFIG_MMC=y - # CONFIG_MMC_BLOCK is not set - CONFIG_RTC_CLASS=y - # CONFIG_RTC_SYSTOHC is not set -+CONFIG_RTC_DRV_PL030=y - CONFIG_RTC_DRV_PL031=y - CONFIG_VIRTIO_PCI=y - # CONFIG_VIRTIO_PCI_LEGACY is not set -@@ -401,13 +399,11 @@ CONFIG_MAILBOX=y - # CONFIG_IOMMU_SUPPORT is not set - CONFIG_ANDROID=y - CONFIG_ANDROID_BINDER_IPC=y --CONFIG_LEGACY_ENERGY_MODEL_DT=y - CONFIG_EXT4_FS=y - CONFIG_EXT4_FS_SECURITY=y --CONFIG_EXT4_ENCRYPTION=y - CONFIG_F2FS_FS=y - CONFIG_F2FS_FS_SECURITY=y --CONFIG_F2FS_FS_ENCRYPTION=y -+CONFIG_FS_ENCRYPTION=y - # CONFIG_DNOTIFY is not set - CONFIG_QUOTA=y - CONFIG_QFMT_V2=y diff --git a/patches/ANDROID-defconfig-build-config-for-cuttlefish.patch b/patches/ANDROID-defconfig-build-config-for-cuttlefish.patch deleted file mode 100644 index 29a5a25a725b..000000000000 --- a/patches/ANDROID-defconfig-build-config-for-cuttlefish.patch +++ /dev/null @@ -1,914 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alistair Strachan -Date: Thu, 5 Apr 2018 18:01:04 -0700 -Subject: ANDROID: defconfig / build config for cuttlefish - -Add defconfigs for x86_64 and arm64 for the cuttlefish virtual device -platform. This change also add the build.config files needed by the -kernel/build project. - -Bug: 120439617 -Test: make ARCH=x86_64 x86_64_cuttlefish_defconfig && make ARCH=x86_64 -Test: make ARCH=arm64 cuttlefish_defconfig && make ARCH=arm64 -Change-Id: I61bde941e8cfef2dd83cb4ff040f7380922cc44e -Signed-off-by: Alistair Strachan ---- - arch/arm64/configs/cuttlefish_defconfig | 396 +++++++++++++++++ - arch/x86/configs/x86_64_cuttlefish_defconfig | 437 +++++++++++++++++++ - build.config.cuttlefish.aarch64 | 16 + - build.config.cuttlefish.x86_64 | 16 + - 4 files changed, 865 insertions(+) - create mode 100644 arch/arm64/configs/cuttlefish_defconfig - create mode 100644 arch/x86/configs/x86_64_cuttlefish_defconfig - create mode 100644 build.config.cuttlefish.aarch64 - create mode 100644 build.config.cuttlefish.x86_64 - -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -new file mode 100644 -index 000000000000..e6f0856cd790 ---- /dev/null -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -0,0 +1,396 @@ -+CONFIG_AUDIT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_CGROUPS=y -+CONFIG_MEMCG=y -+CONFIG_MEMCG_SWAP=y -+CONFIG_CGROUP_SCHED=y -+CONFIG_RT_GROUP_SCHED=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_CGROUP_BPF=y -+CONFIG_BLK_DEV_INITRD=y -+# CONFIG_RD_BZIP2 is not set -+# CONFIG_RD_LZMA is not set -+# CONFIG_RD_XZ is not set -+# CONFIG_RD_LZO is not set -+# CONFIG_RD_LZ4 is not set -+CONFIG_SGETMASK_SYSCALL=y -+# CONFIG_SYSFS_SYSCALL is not set -+# CONFIG_FHANDLE is not set -+CONFIG_KALLSYMS_ALL=y -+CONFIG_BPF_SYSCALL=y -+# CONFIG_RSEQ is not set -+CONFIG_EMBEDDED=y -+# CONFIG_VM_EVENT_COUNTERS is not set -+# CONFIG_COMPAT_BRK is not set -+# CONFIG_SLAB_MERGE_DEFAULT is not set -+CONFIG_PROFILING=y -+CONFIG_PCI=y -+CONFIG_PCI_HOST_GENERIC=y -+CONFIG_HZ_100=y -+CONFIG_SECCOMP=y -+CONFIG_PARAVIRT=y -+CONFIG_ARMV8_DEPRECATED=y -+CONFIG_SWP_EMULATION=y -+CONFIG_CP15_BARRIER_EMULATION=y -+CONFIG_SETEND_EMULATION=y -+CONFIG_ARM64_SW_TTBR0_PAN=y -+# CONFIG_ARM64_LSE_ATOMICS is not set -+CONFIG_RANDOMIZE_BASE=y -+CONFIG_CMDLINE="console=ttyAMA0" -+# CONFIG_EFI is not set -+CONFIG_COMPAT=y -+CONFIG_PM_WAKELOCKS=y -+CONFIG_PM_WAKELOCKS_LIMIT=0 -+# CONFIG_PM_WAKELOCKS_GC is not set -+CONFIG_PM_DEBUG=y -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -+# CONFIG_SPARSEMEM_VMEMMAP is not set -+CONFIG_KSM=y -+CONFIG_TRANSPARENT_HUGEPAGE=y -+CONFIG_ZSMALLOC=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=y -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_NET_IPGRE_DEMUX=y -+CONFIG_NET_IPVTI=y -+CONFIG_INET_ESP=y -+# CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_UDP_DIAG=y -+CONFIG_INET_DIAG_DESTROY=y -+CONFIG_TCP_CONG_ADVANCED=y -+# CONFIG_TCP_CONG_BIC is not set -+# CONFIG_TCP_CONG_WESTWOOD is not set -+# CONFIG_TCP_CONG_HTCP is not set -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_IPV6_OPTIMISTIC_DAD=y -+CONFIG_INET6_ESP=y -+CONFIG_INET6_IPCOMP=y -+CONFIG_IPV6_MIP6=y -+CONFIG_IPV6_VTI=y -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=y -+CONFIG_NF_CONNTRACK_SECMARK=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_AMANDA=y -+CONFIG_NF_CONNTRACK_FTP=y -+CONFIG_NF_CONNTRACK_H323=y -+CONFIG_NF_CONNTRACK_IRC=y -+CONFIG_NF_CONNTRACK_NETBIOS_NS=y -+CONFIG_NF_CONNTRACK_PPTP=y -+CONFIG_NF_CONNTRACK_SANE=y -+CONFIG_NF_CONNTRACK_TFTP=y -+CONFIG_NF_CT_NETLINK=y -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y -+CONFIG_NETFILTER_XT_TARGET_MARK=y -+CONFIG_NETFILTER_XT_TARGET_NFLOG=y -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -+CONFIG_NETFILTER_XT_TARGET_TPROXY=y -+CONFIG_NETFILTER_XT_TARGET_TRACE=y -+CONFIG_NETFILTER_XT_TARGET_SECMARK=y -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -+CONFIG_NETFILTER_XT_MATCH_BPF=y -+CONFIG_NETFILTER_XT_MATCH_COMMENT=y -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -+CONFIG_NETFILTER_XT_MATCH_HELPER=y -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -+CONFIG_NETFILTER_XT_MATCH_LENGTH=y -+CONFIG_NETFILTER_XT_MATCH_LIMIT=y -+CONFIG_NETFILTER_XT_MATCH_MAC=y -+CONFIG_NETFILTER_XT_MATCH_MARK=y -+CONFIG_NETFILTER_XT_MATCH_POLICY=y -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -+CONFIG_NETFILTER_XT_MATCH_QUOTA=y -+CONFIG_NETFILTER_XT_MATCH_SOCKET=y -+CONFIG_NETFILTER_XT_MATCH_STATE=y -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -+CONFIG_NETFILTER_XT_MATCH_STRING=y -+CONFIG_NETFILTER_XT_MATCH_TIME=y -+CONFIG_NETFILTER_XT_MATCH_U32=y -+CONFIG_IP_NF_IPTABLES=y -+CONFIG_IP_NF_MATCH_ECN=y -+CONFIG_IP_NF_MATCH_TTL=y -+CONFIG_IP_NF_FILTER=y -+CONFIG_IP_NF_TARGET_REJECT=y -+CONFIG_IP_NF_NAT=y -+CONFIG_IP_NF_TARGET_MASQUERADE=y -+CONFIG_IP_NF_TARGET_NETMAP=y -+CONFIG_IP_NF_TARGET_REDIRECT=y -+CONFIG_IP_NF_MANGLE=y -+CONFIG_IP_NF_RAW=y -+CONFIG_IP_NF_SECURITY=y -+CONFIG_IP_NF_ARPTABLES=y -+CONFIG_IP_NF_ARPFILTER=y -+CONFIG_IP_NF_ARP_MANGLE=y -+CONFIG_IP6_NF_IPTABLES=y -+CONFIG_IP6_NF_MATCH_RPFILTER=y -+CONFIG_IP6_NF_FILTER=y -+CONFIG_IP6_NF_TARGET_REJECT=y -+CONFIG_IP6_NF_MANGLE=y -+CONFIG_IP6_NF_RAW=y -+CONFIG_L2TP=y -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_HTB=y -+CONFIG_NET_CLS_U32=y -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_U32=y -+CONFIG_NET_CLS_ACT=y -+CONFIG_CFG80211=y -+# CONFIG_CFG80211_DEFAULT_PS is not set -+# CONFIG_CFG80211_CRDA_SUPPORT is not set -+CONFIG_MAC80211=y -+# CONFIG_MAC80211_RC_MINSTREL is not set -+CONFIG_RFKILL=y -+# CONFIG_UEVENT_HELPER is not set -+CONFIG_DEVTMPFS=y -+# CONFIG_ALLOW_DEV_COREDUMP is not set -+CONFIG_DEBUG_DEVRES=y -+CONFIG_OF_UNITTEST=y -+CONFIG_ZRAM=y -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_SIZE=8192 -+CONFIG_VIRTIO_BLK=y -+CONFIG_SCSI=y -+# CONFIG_SCSI_MQ_DEFAULT is not set -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_SCSI_VIRTIO=y -+CONFIG_MD=y -+CONFIG_BLK_DEV_DM=y -+CONFIG_DM_CRYPT=y -+CONFIG_DM_UEVENT=y -+CONFIG_DM_VERITY=y -+CONFIG_DM_VERITY_FEC=y -+CONFIG_NETDEVICES=y -+CONFIG_NETCONSOLE=y -+CONFIG_NETCONSOLE_DYNAMIC=y -+CONFIG_TUN=y -+CONFIG_VIRTIO_NET=y -+# CONFIG_ETHERNET is not set -+CONFIG_PHYLIB=y -+CONFIG_PPP=y -+CONFIG_PPP_BSDCOMP=y -+CONFIG_PPP_DEFLATE=y -+CONFIG_PPP_MPPE=y -+CONFIG_PPTP=y -+CONFIG_PPPOL2TP=y -+CONFIG_USB_USBNET=y -+# CONFIG_USB_NET_AX8817X is not set -+# CONFIG_USB_NET_AX88179_178A is not set -+# CONFIG_USB_NET_CDCETHER is not set -+# CONFIG_USB_NET_CDC_NCM is not set -+# CONFIG_USB_NET_NET1080 is not set -+# CONFIG_USB_NET_CDC_SUBSET is not set -+# CONFIG_USB_NET_ZAURUS is not set -+# CONFIG_WLAN_VENDOR_ADMTEK is not set -+# CONFIG_WLAN_VENDOR_ATH is not set -+# CONFIG_WLAN_VENDOR_ATMEL is not set -+# CONFIG_WLAN_VENDOR_BROADCOM is not set -+# CONFIG_WLAN_VENDOR_CISCO is not set -+# CONFIG_WLAN_VENDOR_INTEL is not set -+# CONFIG_WLAN_VENDOR_INTERSIL is not set -+# CONFIG_WLAN_VENDOR_MARVELL is not set -+# CONFIG_WLAN_VENDOR_MEDIATEK is not set -+# CONFIG_WLAN_VENDOR_RALINK is not set -+# CONFIG_WLAN_VENDOR_REALTEK is not set -+# CONFIG_WLAN_VENDOR_RSI is not set -+# CONFIG_WLAN_VENDOR_ST is not set -+# CONFIG_WLAN_VENDOR_TI is not set -+# CONFIG_WLAN_VENDOR_ZYDAS is not set -+# CONFIG_WLAN_VENDOR_QUANTENNA is not set -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_KEYBOARD is not set -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_XPAD=y -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_INPUT_TABLET=y -+CONFIG_TABLET_USB_ACECAD=y -+CONFIG_TABLET_USB_AIPTEK=y -+CONFIG_TABLET_USB_GTCO=y -+CONFIG_TABLET_USB_HANWANG=y -+CONFIG_TABLET_USB_KBTAB=y -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_UINPUT=y -+# CONFIG_VT is not set -+# CONFIG_LEGACY_PTYS is not set -+# CONFIG_DEVMEM is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_EXAR is not set -+CONFIG_SERIAL_8250_NR_UARTS=48 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_MANY_PORTS=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_VIRTIO_CONSOLE=y -+CONFIG_HW_RANDOM=y -+CONFIG_HW_RANDOM_VIRTIO=y -+# CONFIG_HW_RANDOM_CAVIUM is not set -+# CONFIG_DEVPORT is not set -+# CONFIG_I2C_COMPAT is not set -+# CONFIG_I2C_HELPER_AUTO is not set -+# CONFIG_HWMON is not set -+CONFIG_MEDIA_SUPPORT=y -+# CONFIG_VGA_ARB is not set -+CONFIG_DRM=y -+# CONFIG_DRM_FBDEV_EMULATION is not set -+CONFIG_DRM_VIRTIO_GPU=y -+CONFIG_SOUND=y -+CONFIG_SND=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=y -+CONFIG_HID_A4TECH=y -+CONFIG_HID_ACRUX=y -+CONFIG_HID_ACRUX_FF=y -+CONFIG_HID_APPLE=y -+CONFIG_HID_BELKIN=y -+CONFIG_HID_CHERRY=y -+CONFIG_HID_CHICONY=y -+CONFIG_HID_PRODIKEYS=y -+CONFIG_HID_CYPRESS=y -+CONFIG_HID_DRAGONRISE=y -+CONFIG_DRAGONRISE_FF=y -+CONFIG_HID_EMS_FF=y -+CONFIG_HID_ELECOM=y -+CONFIG_HID_EZKEY=y -+CONFIG_HID_HOLTEK=y -+CONFIG_HID_KEYTOUCH=y -+CONFIG_HID_KYE=y -+CONFIG_HID_UCLOGIC=y -+CONFIG_HID_WALTOP=y -+CONFIG_HID_GYRATION=y -+CONFIG_HID_TWINHAN=y -+CONFIG_HID_KENSINGTON=y -+CONFIG_HID_LCPOWER=y -+CONFIG_HID_LOGITECH=y -+CONFIG_HID_LOGITECH_DJ=y -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=y -+CONFIG_HID_MICROSOFT=y -+CONFIG_HID_MONTEREY=y -+CONFIG_HID_MULTITOUCH=y -+CONFIG_HID_NTRIG=y -+CONFIG_HID_ORTEK=y -+CONFIG_HID_PANTHERLORD=y -+CONFIG_PANTHERLORD_FF=y -+CONFIG_HID_PETALYNX=y -+CONFIG_HID_PICOLCD=y -+CONFIG_HID_PRIMAX=y -+CONFIG_HID_ROCCAT=y -+CONFIG_HID_SAITEK=y -+CONFIG_HID_SAMSUNG=y -+CONFIG_HID_SONY=y -+CONFIG_HID_SPEEDLINK=y -+CONFIG_HID_SUNPLUS=y -+CONFIG_HID_GREENASIA=y -+CONFIG_GREENASIA_FF=y -+CONFIG_HID_SMARTJOYPLUS=y -+CONFIG_SMARTJOYPLUS_FF=y -+CONFIG_HID_TIVO=y -+CONFIG_HID_TOPSEED=y -+CONFIG_HID_THRUSTMASTER=y -+CONFIG_HID_WACOM=y -+CONFIG_HID_WIIMOTE=y -+CONFIG_HID_ZEROPLUS=y -+CONFIG_HID_ZYDACRON=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_CONFIGFS=y -+CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+# CONFIG_RTC_SYSTOHC is not set -+CONFIG_RTC_DRV_PL031=y -+CONFIG_VIRTIO_PCI=y -+# CONFIG_VIRTIO_PCI_LEGACY is not set -+CONFIG_VIRTIO_BALLOON=y -+CONFIG_VIRTIO_MMIO=y -+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -+CONFIG_STAGING=y -+CONFIG_ASHMEM=y -+CONFIG_ANDROID_VSOC=y -+CONFIG_ION=y -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_ANDROID=y -+CONFIG_ANDROID_BINDER_IPC=y -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_EXT4_ENCRYPTION=y -+CONFIG_F2FS_FS=y -+CONFIG_F2FS_FS_SECURITY=y -+CONFIG_F2FS_FS_ENCRYPTION=y -+# CONFIG_DNOTIFY is not set -+CONFIG_QUOTA=y -+CONFIG_QFMT_V2=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_PSTORE=y -+CONFIG_PSTORE_CONSOLE=y -+CONFIG_PSTORE_RAM=y -+CONFIG_SECURITY=y -+CONFIG_SECURITY_NETWORK=y -+CONFIG_LSM_MMAP_MIN_ADDR=65536 -+CONFIG_HARDENED_USERCOPY=y -+CONFIG_SECURITY_SELINUX=y -+CONFIG_CRYPTO_SHA512=y -+CONFIG_CRYPTO_LZ4=y -+CONFIG_CRYPTO_ZSTD=y -+CONFIG_CRYPTO_ANSI_CPRNG=y -+CONFIG_CRYPTO_DEV_VIRTIO=y -+CONFIG_XZ_DEC=y -+CONFIG_PRINTK_TIME=y -+CONFIG_DEBUG_INFO=y -+# CONFIG_ENABLE_MUST_CHECK is not set -+CONFIG_FRAME_WARN=1024 -+# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set -+CONFIG_MAGIC_SYSRQ=y -+CONFIG_DEBUG_STACK_USAGE=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_SOFTLOCKUP_DETECTOR=y -+# CONFIG_DETECT_HUNG_TASK is not set -+CONFIG_PANIC_TIMEOUT=5 -+CONFIG_SCHEDSTATS=y -+CONFIG_RCU_CPU_STALL_TIMEOUT=60 -+CONFIG_ENABLE_DEFAULT_TRACERS=y -+# CONFIG_RUNTIME_TESTING_MENU is not set -diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig -new file mode 100644 -index 000000000000..a30f92646583 ---- /dev/null -+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig -@@ -0,0 +1,437 @@ -+CONFIG_POSIX_MQUEUE=y -+# CONFIG_USELIB is not set -+CONFIG_AUDIT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_PREEMPT=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_CGROUPS=y -+CONFIG_MEMCG=y -+CONFIG_MEMCG_SWAP=y -+CONFIG_CGROUP_SCHED=y -+CONFIG_RT_GROUP_SCHED=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_CGROUP_BPF=y -+CONFIG_NAMESPACES=y -+CONFIG_BLK_DEV_INITRD=y -+# CONFIG_RD_LZ4 is not set -+# CONFIG_FHANDLE is not set -+# CONFIG_PCSPKR_PLATFORM is not set -+CONFIG_KALLSYMS_ALL=y -+CONFIG_BPF_SYSCALL=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_PROFILING=y -+CONFIG_SMP=y -+CONFIG_HYPERVISOR_GUEST=y -+CONFIG_PARAVIRT=y -+CONFIG_PARAVIRT_SPINLOCKS=y -+CONFIG_MCORE2=y -+CONFIG_PROCESSOR_SELECT=y -+# CONFIG_CPU_SUP_CENTAUR is not set -+CONFIG_NR_CPUS=8 -+# CONFIG_MICROCODE is not set -+CONFIG_X86_MSR=y -+CONFIG_X86_CPUID=y -+# CONFIG_MTRR is not set -+CONFIG_HZ_100=y -+CONFIG_KEXEC=y -+CONFIG_CRASH_DUMP=y -+CONFIG_PHYSICAL_START=0x200000 -+CONFIG_PHYSICAL_ALIGN=0x1000000 -+CONFIG_CMDLINE_BOOL=y -+CONFIG_CMDLINE="console=ttyS0 reboot=p" -+CONFIG_PM_WAKELOCKS=y -+CONFIG_PM_WAKELOCKS_LIMIT=0 -+# CONFIG_PM_WAKELOCKS_GC is not set -+CONFIG_PM_DEBUG=y -+CONFIG_ACPI_PROCFS_POWER=y -+# CONFIG_ACPI_FAN is not set -+# CONFIG_ACPI_THERMAL is not set -+# CONFIG_X86_PM_TIMER is not set -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_X86_ACPI_CPUFREQ=y -+CONFIG_PCI_MSI=y -+CONFIG_IA32_EMULATION=y -+# CONFIG_FIRMWARE_MEMMAP is not set -+CONFIG_OPROFILE=y -+CONFIG_KPROBES=y -+CONFIG_JUMP_LABEL=y -+CONFIG_REFCOUNT_FULL=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -+CONFIG_BINFMT_MISC=y -+CONFIG_KSM=y -+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -+CONFIG_TRANSPARENT_HUGEPAGE=y -+CONFIG_ZSMALLOC=y -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=y -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_MROUTE=y -+CONFIG_IP_PIMSM_V1=y -+CONFIG_IP_PIMSM_V2=y -+CONFIG_SYN_COOKIES=y -+CONFIG_NET_IPVTI=y -+CONFIG_INET_ESP=y -+# CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_DIAG_DESTROY=y -+CONFIG_TCP_CONG_ADVANCED=y -+# CONFIG_TCP_CONG_BIC is not set -+# CONFIG_TCP_CONG_WESTWOOD is not set -+# CONFIG_TCP_CONG_HTCP is not set -+CONFIG_TCP_MD5SIG=y -+CONFIG_IPV6_ROUTER_PREF=y -+CONFIG_IPV6_ROUTE_INFO=y -+CONFIG_IPV6_OPTIMISTIC_DAD=y -+CONFIG_INET6_AH=y -+CONFIG_INET6_ESP=y -+CONFIG_INET6_IPCOMP=y -+CONFIG_IPV6_MIP6=y -+CONFIG_IPV6_VTI=y -+CONFIG_IPV6_MULTIPLE_TABLES=y -+CONFIG_NETLABEL=y -+CONFIG_NETFILTER=y -+CONFIG_NF_CONNTRACK=y -+CONFIG_NF_CONNTRACK_SECMARK=y -+CONFIG_NF_CONNTRACK_EVENTS=y -+CONFIG_NF_CONNTRACK_AMANDA=y -+CONFIG_NF_CONNTRACK_FTP=y -+CONFIG_NF_CONNTRACK_H323=y -+CONFIG_NF_CONNTRACK_IRC=y -+CONFIG_NF_CONNTRACK_NETBIOS_NS=y -+CONFIG_NF_CONNTRACK_PPTP=y -+CONFIG_NF_CONNTRACK_SANE=y -+CONFIG_NF_CONNTRACK_TFTP=y -+CONFIG_NF_CT_NETLINK=y -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y -+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y -+CONFIG_NETFILTER_XT_TARGET_MARK=y -+CONFIG_NETFILTER_XT_TARGET_NFLOG=y -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -+CONFIG_NETFILTER_XT_TARGET_TPROXY=y -+CONFIG_NETFILTER_XT_TARGET_TRACE=y -+CONFIG_NETFILTER_XT_TARGET_SECMARK=y -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -+CONFIG_NETFILTER_XT_MATCH_BPF=y -+CONFIG_NETFILTER_XT_MATCH_COMMENT=y -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y -+CONFIG_NETFILTER_XT_MATCH_HELPER=y -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -+CONFIG_NETFILTER_XT_MATCH_LENGTH=y -+CONFIG_NETFILTER_XT_MATCH_LIMIT=y -+CONFIG_NETFILTER_XT_MATCH_MAC=y -+CONFIG_NETFILTER_XT_MATCH_MARK=y -+CONFIG_NETFILTER_XT_MATCH_POLICY=y -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -+CONFIG_NETFILTER_XT_MATCH_QUOTA=y -+CONFIG_NETFILTER_XT_MATCH_SOCKET=y -+CONFIG_NETFILTER_XT_MATCH_STATE=y -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -+CONFIG_NETFILTER_XT_MATCH_STRING=y -+CONFIG_NETFILTER_XT_MATCH_TIME=y -+CONFIG_NETFILTER_XT_MATCH_U32=y -+CONFIG_IP_NF_IPTABLES=y -+CONFIG_IP_NF_MATCH_AH=y -+CONFIG_IP_NF_MATCH_ECN=y -+CONFIG_IP_NF_MATCH_TTL=y -+CONFIG_IP_NF_FILTER=y -+CONFIG_IP_NF_TARGET_REJECT=y -+CONFIG_IP_NF_NAT=y -+CONFIG_IP_NF_TARGET_MASQUERADE=y -+CONFIG_IP_NF_TARGET_NETMAP=y -+CONFIG_IP_NF_TARGET_REDIRECT=y -+CONFIG_IP_NF_MANGLE=y -+CONFIG_IP_NF_RAW=y -+CONFIG_IP_NF_SECURITY=y -+CONFIG_IP_NF_ARPTABLES=y -+CONFIG_IP_NF_ARPFILTER=y -+CONFIG_IP_NF_ARP_MANGLE=y -+CONFIG_IP6_NF_IPTABLES=y -+CONFIG_IP6_NF_MATCH_IPV6HEADER=y -+CONFIG_IP6_NF_MATCH_RPFILTER=y -+CONFIG_IP6_NF_FILTER=y -+CONFIG_IP6_NF_TARGET_REJECT=y -+CONFIG_IP6_NF_MANGLE=y -+CONFIG_IP6_NF_RAW=y -+CONFIG_NET_SCHED=y -+CONFIG_NET_SCH_HTB=y -+CONFIG_NET_CLS_U32=y -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_U32=y -+CONFIG_NET_CLS_ACT=y -+CONFIG_CFG80211=y -+CONFIG_MAC80211=y -+CONFIG_RFKILL=y -+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -+CONFIG_DEVTMPFS=y -+CONFIG_DEBUG_DEVRES=y -+CONFIG_OF=y -+CONFIG_OF_UNITTEST=y -+# CONFIG_PNP_DEBUG_MESSAGES is not set -+CONFIG_ZRAM=y -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_SIZE=8192 -+CONFIG_VIRTIO_BLK=y -+CONFIG_SCSI=y -+CONFIG_BLK_DEV_SD=y -+CONFIG_BLK_DEV_SR=y -+CONFIG_BLK_DEV_SR_VENDOR=y -+CONFIG_CHR_DEV_SG=y -+CONFIG_SCSI_CONSTANTS=y -+CONFIG_SCSI_SPI_ATTRS=y -+CONFIG_SCSI_VIRTIO=y -+CONFIG_MD=y -+CONFIG_BLK_DEV_DM=y -+CONFIG_DM_CRYPT=y -+CONFIG_DM_MIRROR=y -+CONFIG_DM_ZERO=y -+CONFIG_DM_UEVENT=y -+CONFIG_DM_VERITY=y -+CONFIG_DM_VERITY_FEC=y -+CONFIG_NETDEVICES=y -+CONFIG_NETCONSOLE=y -+CONFIG_NETCONSOLE_DYNAMIC=y -+CONFIG_TUN=y -+CONFIG_VIRTIO_NET=y -+# CONFIG_ETHERNET is not set -+CONFIG_PPP=y -+CONFIG_PPP_BSDCOMP=y -+CONFIG_PPP_DEFLATE=y -+CONFIG_PPP_MPPE=y -+CONFIG_USB_USBNET=y -+# CONFIG_USB_NET_AX8817X is not set -+# CONFIG_USB_NET_AX88179_178A is not set -+# CONFIG_USB_NET_CDCETHER is not set -+# CONFIG_USB_NET_CDC_NCM is not set -+# CONFIG_USB_NET_NET1080 is not set -+# CONFIG_USB_NET_CDC_SUBSET is not set -+# CONFIG_USB_NET_ZAURUS is not set -+# CONFIG_WLAN_VENDOR_ADMTEK is not set -+# CONFIG_WLAN_VENDOR_ATH is not set -+# CONFIG_WLAN_VENDOR_ATMEL is not set -+# CONFIG_WLAN_VENDOR_BROADCOM is not set -+# CONFIG_WLAN_VENDOR_CISCO is not set -+# CONFIG_WLAN_VENDOR_INTEL is not set -+# CONFIG_WLAN_VENDOR_INTERSIL is not set -+# CONFIG_WLAN_VENDOR_MARVELL is not set -+# CONFIG_WLAN_VENDOR_MEDIATEK is not set -+# CONFIG_WLAN_VENDOR_RALINK is not set -+# CONFIG_WLAN_VENDOR_REALTEK is not set -+# CONFIG_WLAN_VENDOR_RSI is not set -+# CONFIG_WLAN_VENDOR_ST is not set -+# CONFIG_WLAN_VENDOR_TI is not set -+# CONFIG_WLAN_VENDOR_ZYDAS is not set -+# CONFIG_WLAN_VENDOR_QUANTENNA is not set -+CONFIG_MAC80211_HWSIM=y -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_KEYBOARD is not set -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_JOYSTICK=y -+CONFIG_JOYSTICK_XPAD=y -+CONFIG_JOYSTICK_XPAD_FF=y -+CONFIG_JOYSTICK_XPAD_LEDS=y -+CONFIG_INPUT_TABLET=y -+CONFIG_TABLET_USB_ACECAD=y -+CONFIG_TABLET_USB_AIPTEK=y -+CONFIG_TABLET_USB_GTCO=y -+CONFIG_TABLET_USB_HANWANG=y -+CONFIG_TABLET_USB_KBTAB=y -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_UINPUT=y -+# CONFIG_SERIO_I8042 is not set -+# CONFIG_VT is not set -+# CONFIG_LEGACY_PTYS is not set -+# CONFIG_DEVMEM is not set -+CONFIG_SERIAL_8250=y -+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -+CONFIG_SERIAL_8250_CONSOLE=y -+# CONFIG_SERIAL_8250_EXAR is not set -+CONFIG_SERIAL_8250_NR_UARTS=48 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_MANY_PORTS=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_VIRTIO_CONSOLE=y -+CONFIG_HW_RANDOM=y -+# CONFIG_HW_RANDOM_INTEL is not set -+# CONFIG_HW_RANDOM_AMD is not set -+# CONFIG_HW_RANDOM_VIA is not set -+CONFIG_HW_RANDOM_VIRTIO=y -+CONFIG_HPET=y -+# CONFIG_HPET_MMAP_DEFAULT is not set -+# CONFIG_DEVPORT is not set -+# CONFIG_ACPI_I2C_OPREGION is not set -+# CONFIG_I2C_COMPAT is not set -+# CONFIG_I2C_HELPER_AUTO is not set -+CONFIG_PTP_1588_CLOCK=y -+# CONFIG_HWMON is not set -+# CONFIG_X86_PKG_TEMP_THERMAL is not set -+CONFIG_WATCHDOG=y -+CONFIG_SOFT_WATCHDOG=y -+CONFIG_MEDIA_SUPPORT=y -+# CONFIG_VGA_ARB is not set -+CONFIG_DRM=y -+# CONFIG_DRM_FBDEV_EMULATION is not set -+CONFIG_DRM_VIRTIO_GPU=y -+CONFIG_SOUND=y -+CONFIG_SND=y -+CONFIG_HIDRAW=y -+CONFIG_UHID=y -+CONFIG_HID_A4TECH=y -+CONFIG_HID_ACRUX=y -+CONFIG_HID_ACRUX_FF=y -+CONFIG_HID_APPLE=y -+CONFIG_HID_BELKIN=y -+CONFIG_HID_CHERRY=y -+CONFIG_HID_CHICONY=y -+CONFIG_HID_PRODIKEYS=y -+CONFIG_HID_CYPRESS=y -+CONFIG_HID_DRAGONRISE=y -+CONFIG_DRAGONRISE_FF=y -+CONFIG_HID_EMS_FF=y -+CONFIG_HID_ELECOM=y -+CONFIG_HID_EZKEY=y -+CONFIG_HID_HOLTEK=y -+CONFIG_HID_KEYTOUCH=y -+CONFIG_HID_KYE=y -+CONFIG_HID_UCLOGIC=y -+CONFIG_HID_WALTOP=y -+CONFIG_HID_GYRATION=y -+CONFIG_HID_TWINHAN=y -+CONFIG_HID_KENSINGTON=y -+CONFIG_HID_LCPOWER=y -+CONFIG_HID_LOGITECH=y -+CONFIG_HID_LOGITECH_DJ=y -+CONFIG_LOGITECH_FF=y -+CONFIG_LOGIRUMBLEPAD2_FF=y -+CONFIG_LOGIG940_FF=y -+CONFIG_HID_MAGICMOUSE=y -+CONFIG_HID_MICROSOFT=y -+CONFIG_HID_MONTEREY=y -+CONFIG_HID_MULTITOUCH=y -+CONFIG_HID_NTRIG=y -+CONFIG_HID_ORTEK=y -+CONFIG_HID_PANTHERLORD=y -+CONFIG_PANTHERLORD_FF=y -+CONFIG_HID_PETALYNX=y -+CONFIG_HID_PICOLCD=y -+CONFIG_HID_PRIMAX=y -+CONFIG_HID_ROCCAT=y -+CONFIG_HID_SAITEK=y -+CONFIG_HID_SAMSUNG=y -+CONFIG_HID_SONY=y -+CONFIG_HID_SPEEDLINK=y -+CONFIG_HID_SUNPLUS=y -+CONFIG_HID_GREENASIA=y -+CONFIG_GREENASIA_FF=y -+CONFIG_HID_SMARTJOYPLUS=y -+CONFIG_SMARTJOYPLUS_FF=y -+CONFIG_HID_TIVO=y -+CONFIG_HID_TOPSEED=y -+CONFIG_HID_THRUSTMASTER=y -+CONFIG_HID_WACOM=y -+CONFIG_HID_WIIMOTE=y -+CONFIG_HID_ZEROPLUS=y -+CONFIG_HID_ZYDACRON=y -+CONFIG_USB_HIDDEV=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_DUMMY_HCD=y -+CONFIG_USB_CONFIGFS=y -+CONFIG_USB_CONFIGFS_F_FS=y -+CONFIG_USB_CONFIGFS_F_MIDI=y -+CONFIG_RTC_CLASS=y -+# CONFIG_RTC_HCTOSYS is not set -+CONFIG_SW_SYNC=y -+CONFIG_VIRTIO_PCI=y -+CONFIG_VIRTIO_BALLOON=y -+CONFIG_VIRTIO_MMIO=y -+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -+CONFIG_STAGING=y -+CONFIG_ASHMEM=y -+CONFIG_ANDROID_VSOC=y -+CONFIG_ION=y -+# CONFIG_X86_PLATFORM_DEVICES is not set -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_ANDROID=y -+CONFIG_ANDROID_BINDER_IPC=y -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_EXT4_ENCRYPTION=y -+CONFIG_F2FS_FS=y -+CONFIG_F2FS_FS_SECURITY=y -+CONFIG_F2FS_FS_ENCRYPTION=y -+CONFIG_QUOTA=y -+CONFIG_QUOTA_NETLINK_INTERFACE=y -+# CONFIG_PRINT_QUOTA_WARNING is not set -+CONFIG_QFMT_V2=y -+CONFIG_AUTOFS4_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_PROC_KCORE=y -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_HUGETLBFS=y -+CONFIG_PSTORE=y -+CONFIG_PSTORE_CONSOLE=y -+CONFIG_PSTORE_RAM=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=y -+CONFIG_NLS_UTF8=y -+CONFIG_SECURITY=y -+CONFIG_SECURITY_NETWORK=y -+CONFIG_SECURITY_PATH=y -+CONFIG_HARDENED_USERCOPY=y -+CONFIG_SECURITY_SELINUX=y -+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -+CONFIG_CRYPTO_SHA512=y -+CONFIG_CRYPTO_LZ4=y -+CONFIG_CRYPTO_ZSTD=y -+CONFIG_CRYPTO_DEV_VIRTIO=y -+CONFIG_PRINTK_TIME=y -+CONFIG_DEBUG_INFO=y -+# CONFIG_ENABLE_MUST_CHECK is not set -+CONFIG_FRAME_WARN=1024 -+# CONFIG_UNUSED_SYMBOLS is not set -+CONFIG_MAGIC_SYSRQ=y -+CONFIG_DEBUG_STACK_USAGE=y -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_DEBUG_STACKOVERFLOW=y -+CONFIG_HARDLOCKUP_DETECTOR=y -+CONFIG_PANIC_TIMEOUT=5 -+CONFIG_SCHEDSTATS=y -+CONFIG_RCU_CPU_STALL_TIMEOUT=60 -+CONFIG_ENABLE_DEFAULT_TRACERS=y -+CONFIG_IO_DELAY_NONE=y -+CONFIG_DEBUG_BOOT_PARAMS=y -+CONFIG_OPTIMIZE_INLINING=y -+CONFIG_UNWINDER_FRAME_POINTER=y -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -new file mode 100644 -index 000000000000..bfb1f560b298 ---- /dev/null -+++ b/build.config.cuttlefish.aarch64 -@@ -0,0 +1,16 @@ -+ARCH=arm64 -+BRANCH=android-4.19 -+CLANG_TRIPLE=aarch64-linux-gnu- -+CROSS_COMPILE=aarch64-linux-androidkernel- -+DEFCONFIG=cuttlefish_defconfig -+EXTRA_CMDS='' -+KERNEL_DIR=common -+POST_DEFCONFIG_CMDS="check_defconfig" -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r328903/bin -+LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin -+FILES=" -+arch/arm64/boot/Image.gz -+vmlinux -+System.map -+" -+STOP_SHIP_TRACEPRINTK=1 -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -new file mode 100644 -index 000000000000..69813b30c8ea ---- /dev/null -+++ b/build.config.cuttlefish.x86_64 -@@ -0,0 +1,16 @@ -+ARCH=x86_64 -+BRANCH=android-4.19 -+CLANG_TRIPLE=x86_64-linux-gnu- -+CROSS_COMPILE=x86_64-linux-androidkernel- -+DEFCONFIG=x86_64_cuttlefish_defconfig -+EXTRA_CMDS='' -+KERNEL_DIR=common -+POST_DEFCONFIG_CMDS="check_defconfig" -+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r328903/bin -+LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin -+FILES=" -+arch/x86/boot/bzImage -+vmlinux -+System.map -+" -+STOP_SHIP_TRACEPRINTK=1 diff --git a/patches/ANDROID-gki-cuttlefish-defconfigs-use-prebuilt-build-tools.patch b/patches/ANDROID-gki-cuttlefish-defconfigs-use-prebuilt-build-tools.patch index a4fbc012f248..8e210a466e7b 100644 --- a/patches/ANDROID-gki-cuttlefish-defconfigs-use-prebuilt-build-tools.patch +++ b/patches/ANDROID-gki-cuttlefish-defconfigs-use-prebuilt-build-tools.patch @@ -11,36 +11,10 @@ Bug: 135922132 Change-Id: Ie6b0bd208c684c9f153eb2f0bfac4712e02e8e05 Signed-off-by: Matthias Maennich --- - build.config.cuttlefish.aarch64 | 1 + - build.config.cuttlefish.x86_64 | 1 + - build.config.gki.aarch64 | 1 + - build.config.gki.x86_64 | 1 + - 4 files changed, 4 insertions(+) + build.config.gki.aarch64 | 1 + + build.config.gki.x86_64 | 1 + + 2 files changed, 2 insertions(+) -diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 -index bec1288d65e1..40c8d7a5219c 100644 ---- a/build.config.cuttlefish.aarch64 -+++ b/build.config.cuttlefish.aarch64 -@@ -8,6 +8,7 @@ EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" - CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -+BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin - FILES=" - arch/arm64/boot/Image.gz -diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 -index 33063abed0ed..c9496b0d2ce6 100644 ---- a/build.config.cuttlefish.x86_64 -+++ b/build.config.cuttlefish.x86_64 -@@ -8,6 +8,7 @@ EXTRA_CMDS='' - KERNEL_DIR=common - POST_DEFCONFIG_CMDS="check_defconfig" - CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -+BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 - LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin - FILES=" - arch/x86/boot/bzImage diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index ecc2985e92cb..24dade721f96 100644 --- a/build.config.gki.aarch64 diff --git a/patches/ANDROID-sync-defconfigs-with-savedefconfig.patch b/patches/ANDROID-sync-defconfigs-with-savedefconfig.patch index 2a2236f356ff..f0f92c8ab6a3 100644 --- a/patches/ANDROID-sync-defconfigs-with-savedefconfig.patch +++ b/patches/ANDROID-sync-defconfigs-with-savedefconfig.patch @@ -7,55 +7,9 @@ Test: boot gki_defconfig and cuttlefish_defconfig on arm64 cuttlefish Signed-off-by: Tri Vo Change-Id: Ie0b518c0fd5100a39312069fe3b193684feb634d --- - arch/arm64/configs/cuttlefish_defconfig | 7 ++----- - arch/arm64/configs/gki_defconfig | 5 +---- - 2 files changed, 3 insertions(+), 9 deletions(-) + arch/arm64/configs/gki_defconfig | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig -index 5f7157425a31..41502bd397dd 100644 ---- a/arch/arm64/configs/cuttlefish_defconfig -+++ b/arch/arm64/configs/cuttlefish_defconfig -@@ -38,14 +38,14 @@ CONFIG_SCHED_MC=y - CONFIG_HZ_100=y - CONFIG_SECCOMP=y - CONFIG_PARAVIRT=y -+CONFIG_ARM64_SW_TTBR0_PAN=y -+CONFIG_COMPAT=y - CONFIG_ARMV8_DEPRECATED=y - CONFIG_SWP_EMULATION=y - CONFIG_CP15_BARRIER_EMULATION=y - CONFIG_SETEND_EMULATION=y --CONFIG_ARM64_SW_TTBR0_PAN=y - CONFIG_RANDOMIZE_BASE=y - # CONFIG_EFI is not set --CONFIG_COMPAT=y - CONFIG_PM_WAKELOCKS=y - CONFIG_PM_WAKELOCKS_LIMIT=0 - # CONFIG_PM_WAKELOCKS_GC is not set -@@ -66,7 +66,6 @@ CONFIG_ARM_SCMI_PROTOCOL=y - CONFIG_ARM_SCPI_PROTOCOL=y - # CONFIG_ARM_SCPI_POWER_DOMAIN is not set - CONFIG_KPROBES=y --CONFIG_JUMP_LABEL=y - CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODVERSIONS=y -@@ -89,7 +88,6 @@ CONFIG_IP_MULTIPLE_TABLES=y - CONFIG_NET_IPGRE_DEMUX=y - CONFIG_NET_IPVTI=y - CONFIG_INET_ESP=y --# CONFIG_INET_XFRM_MODE_BEET is not set - CONFIG_INET_UDP_DIAG=y - CONFIG_INET_DIAG_DESTROY=y - CONFIG_TCP_CONG_ADVANCED=y -@@ -193,7 +191,6 @@ CONFIG_MAC80211=y - CONFIG_RFKILL=y - CONFIG_PCI=y - CONFIG_PCI_HOST_GENERIC=y --# CONFIG_UEVENT_HELPER is not set - CONFIG_DEVTMPFS=y - # CONFIG_ALLOW_DEV_COREDUMP is not set - CONFIG_DEBUG_DEVRES=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 04f531ef2511..c9720858fd9a 100644 --- a/arch/arm64/configs/gki_defconfig diff --git a/patches/series b/patches/series index 18e4d096112c..372638712df3 100644 --- a/patches/series +++ b/patches/series @@ -6,84 +6,48 @@ # ANDROID-x86-Remove-a-useless-warning-message.patch ANDROID-Kbuild-LLVMLinux-allow-overriding-clang-target-triple.patch -ANDROID-defconfig-build-config-for-cuttlefish.patch -ANDROID-cuttlefish_defconfig-Enable-EAS-related-defines.patch ANDROID-net-xfrm-make-PF_KEY-SHA256-use-RFC-compliant-truncation.patch ANDROID-arm64-copy-CONFIG_CMDLINE_EXTEND-from-ARM.patch ANDROID-of-Support-CONFIG_CMDLINE_EXTEND-config-option.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_CMDLINE_EXTEND.patch ANDROID-fs-epoll-use-freezable-blocking-call.patch ANDROID-mm-add-a-field-to-store-names-for-private-anonymous-memory.patch ANDROID-usb-gadget-configfs-Add-usb_function-ptr-to-fi-struct.patch ANDROID-usb-gadget-configfs-Add-Uevent-to-notify-userspace.patch ANDROID-usb-gadget-configfs-Add-function-devices-to-the-parent.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_UEVENT.patch ANDROID-usb-gadget-configfs-Add-state-attribute-to-android_device.patch ANDROID-usb-gadget-configfs-Add-device-attribute-to-determine-gadget-state.patch ANDROID-usb-gadget-f_accessory-Add-Android-Accessory-function.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_ACC.patch ANDROID-usb-gadget-f_midi-create-F_midi-device.patch ANDROID-usb-gadget-f_midi-set-fi-f-to-NULL-when-free-f_midi-function.patch ANDROID-usb-gadget-f_audio_source-New-gadget-driver-for-audio-output.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_USB_CONFIGFS_F_AUDIO_SRC.patch ANDROID-mmc-core-Add-ignore-mmc-pm-notify-functionality.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_MMC.patch ANDROID-uid_cputime-Adds-accounting-for-the-cputimes-per-uid.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_UID_SYS_STATS.patch ANDROID-uid_cputime-add-per-uid-IO-usage-accounting.patch ANDROID-taskstats-track-fsync-syscalls.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPUSETS.patch ANDROID-AVB-error-handler-to-invalidate-vbmeta-partition.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_DM_VERITY_AVB.patch ANDROID-fs-FS-tracepoints-to-track-IO.patch ANDROID-cpu-send-KOBJ_ONLINE-event-when-enabling-cpus.patch ANDROID-add-extra-free-kbytes-tunable.patch ANDROID-power-wakeup_reason-add-an-API-to-log-wakeup-reasons.patch ANDROID-netfilter-xt_quota2-adding-the-original-quota2-from-xtables-addons.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_NETFILTER_XT_MATCH_QUOTA2.patch ANDROID-netfilter-xt_IDLETIMER-Add-new-netlink-msg-type.patch ANDROID-security-perf-Allow-further-restriction-of-perf_event_open.patch -ANDROID-cuttlefish_defconfig-Enable-SECURITY_PERF_EVENTS_RESTRICT.patch ANDROID-net-ipv6-autoconf-routes-into-per-device-tables.patch ANDROID-binder-add-support-for-RT-prio-inheritance.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_CRYPTO_ADIANTUM.patch -ANDROID-Move-from-clang-r328903-to-r346389b.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_ARM64_LSE_ATOMICS.patch -ANDROID-cuttlefish_defconfig-Enable-VIRT_WIFI.patch -ANDROID-cuttlefish_defconfig-Enable-VIRTIO_INPUT.patch -ANDROID-cuttlefish-enable-CONFIG_NET_CLS_BPF-y.patch -ANDROID-cuttlefish_defconfig-Enable-vsock-options.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_RTC_HCTOSYS.patch -ANDROID-Turn-xt_owner-module-on.patch -ANDROID-Move-from-clang-r346389b-to-r349610.patch -ANDROID-cuttlefish-enable-CONFIG_NET_SCH_NETEM-y.patch -ANDROID-cuttlefish-enable-CONFIG_NETFILTER_XT_TARGET_CT-y.patch ANDROID-cpufreq-track-per-task-time-in-state.patch ANDROID-cpufreq-times-track-per-uid-time-in-state.patch ANDROID-proc-Add-proc-uid-directory.patch ANDROID-cpufreq-Add-time_in_state-to-proc-uid-directories.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_CPU_FREQ_TIMES.patch ANDROID-cpufreq-times-add-proc-uid_concurrent_-active-policy-_time.patch ANDROID-cpufreq-times-record-fast-switch-frequency-transitions.patch ANDROID-cpufreq-times-optimize-proc-files.patch -ANDROID-cuttlefish_defconfig-Add-support-for-AC97-audio.patch -ANDROID-cuttlefish-enable-CONFIG_USB_RTL8152-y.patch -ANDROID-cuttlefish-enable-CONFIG_INET_UDP_DIAG-y.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_PSI.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_INPUT_MOUSEDEV.patch ANDROID-dm-bow-Add-dm-bow-feature.patch -ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch ANDROID-dm-bow-Fix-32-bit-compile-errors.patch ANDROID-cpufreq-times-don-t-copy-invalid-freqs-from-freq-table.patch -ANDROID-cuttlefish-enable-CONFIG_NET_SCH_INGRESS-y.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_OVERLAY_FS.patch -ANDROID-cuttlefish_defconfig-Enable-CONFIG_FUSE_FS.patch -ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking.patch ANDROID-gki_defconfig-initial-config-based-on-cuttlefish_defconfig.patch ANDROID-gki_defconfig-Remove-recommended-configs-not-present-on-b1c1.patch ANDROID-gki_defconfig-Remove-cuttlefish-specific-configs.patch ANDROID-gki_defconfig-common-configs-for-device-DLKMs.patch -ANDROID-cuttlefish_defconfig-sync-with-android-mainline-tracking-2.patch ANDROID-Expose-gki_defconfig-to-build.config.patch ANDROID-Move-from-clang-r349610-to-r353983c.patch ANDROID-gki_defconfig-disable-CONFIG_LCD_CLASS_DEVICE-module.patch @@ -98,7 +62,6 @@ ANDROID-Four-part-revert-of-asm-goto-usage-4-4.patch ANDROID-Removed-check-for-asm-goto.patch ANDROID-Add-initial-x86_64-gki_defconfig.patch ANDROID-added-configs-so-that-GKI-boots-on-x86-cuttlefish.patch -ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch ANDROID-gki_defconfig-enable-CMA-and-increase-CMA_AREAS.patch ANDROID-gki_defconfig-enable-SLAB_FREELIST_RANDOM-SLAB_FREELIST_HARDENED.patch ANDROID-gki_defconfig-Enable-CMA-SLAB_FREELIST-RANDOM-and-HARDENED-on-x86.patch @@ -137,7 +100,6 @@ ANDROID-Removed-hardcoded-kernel-command-line-arguments.patch ANDROID-gki_defconfig-disable-IP_PNP-ECRYPT_FS.patch ANDROID-Removed-unnecessary-modules-from-cuttlefish.patch ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch -ANDROID-Remove-unused-cuttlefish-build-infra.patch ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch