Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12c7af34 authored by Matthias Maennich's avatar Matthias Maennich
Browse files

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: default avatarMatthias Maennich <maennich@google.com>
parent ada6a39d

patches/ANDROID-Add-dm-bow-to-cuttlefish-configuration.patch

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Paul Lawrence <paullawrence@google.com>

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 <paullawrence@google.com>

---

 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

patches/ANDROID-Add-initial-x86_64-gki_defconfig.patch

+3 −82
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ Change-Id: I685ccea29efc7ba14f7b0a24f41983e37203f9a2 
Signed-off-by: Ram Muthiah <rammuthiah@google.com>

Signed-off-by: Matthias Maennich <maennich@google.com>

---

 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

patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: "Jorge E. Moreira" <jemoreira@google.com>

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 <jemoreira@google.com>

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

patches/ANDROID-Move-from-clang-r328903-to-r346389b.patch

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Alistair Strachan <astrachan@google.com>

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 <astrachan@google.com>

---

 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

patches/ANDROID-Move-from-clang-r346389b-to-r349610.patch

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Alistair Strachan <astrachan@google.com>

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 <astrachan@google.com>

---

 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