From 40bc18d26027ae8a311ba71a0c4cfc08416b2893 Mon Sep 17 00:00:00 2001 From: mylove90 Date: Sat, 11 May 2024 15:48:41 +0000 Subject: [PATCH] Remove KernelSU and all its related configs This reverts commit a706c3563c26855d7dd051a85c72e36b823dfc6a. --- .gitmodules | 3 --- KernelSU | 1 - arch/arm64/configs/genom_defconfig | 43 ++---------------------------- drivers/Kconfig | 1 - drivers/Makefile | 1 - drivers/kernelsu | 1 - repos/repos.ginkgo.json | 2 +- 7 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 .gitmodules delete mode 160000 KernelSU delete mode 120000 drivers/kernelsu diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 5526cf890b41..000000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "KernelSU"] - path = KernelSU - url = https://github.com/tiann/KernelSU diff --git a/KernelSU b/KernelSU deleted file mode 160000 index 92d4de3a73c0..000000000000 --- a/KernelSU +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92d4de3a73c005854244ee62eaf5a0cff1a95ee7 diff --git a/arch/arm64/configs/genom_defconfig b/arch/arm64/configs/genom_defconfig index 773f7736e119..e127a1f6e75c 100644 --- a/arch/arm64/configs/genom_defconfig +++ b/arch/arm64/configs/genom_defconfig @@ -107,6 +107,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_SCHED_THERMAL_PRESSURE=y # CONFIG_SCHED_WALT is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y @@ -257,13 +258,11 @@ CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_CPU_PARTIAL is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set -CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set # CONFIG_UPROBES is not set # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_KRETPROBES=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y @@ -311,7 +310,6 @@ CONFIG_HAVE_MOVE_PUD=y CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y @@ -331,7 +329,6 @@ CONFIG_VMAP_STACK=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_STRICT_MODULE_RWX=y CONFIG_REFCOUNT_FULL=y # CONFIG_PANIC_ON_REFCOUNT_ERROR is not set CONFIG_ARCH_HAS_RELR=y @@ -344,14 +341,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -# CONFIG_MODULE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -# CONFIG_TRIM_UNUSED_KSYMS is not set +# CONFIG_MODULES is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLK_SCSI_REQUEST=y @@ -656,8 +646,6 @@ CONFIG_ARM64_HW_AFDBM=y # CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set -CONFIG_ARM64_MODULE_CMODEL_LARGE=y -CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y @@ -1124,7 +1112,6 @@ CONFIG_BRIDGE_EBT_BROUTE=y # CONFIG_BRIDGE_EBT_NFLOG is not set # CONFIG_IP_DCCP is not set CONFIG_IP_SCTP=y -# CONFIG_NET_SCTPPROBE is not set # CONFIG_SCTP_DBG_OBJCNT is not set CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set @@ -1267,7 +1254,6 @@ CONFIG_SOCKEV_NLMCAST=y # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set CONFIG_BT=y @@ -1363,7 +1349,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set -# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y @@ -2432,7 +2417,6 @@ CONFIG_I2C_QCOM_GENI=y # Other I2C/SMBus bus drivers # # CONFIG_I2C_MSM_V2 is not set -# CONFIG_I2C_STUB is not set # CONFIG_I2C_SLAVE is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set @@ -2468,7 +2452,6 @@ CONFIG_SPI_QCOM_GENI=y # SPI Protocol Masters # CONFIG_SPI_SPIDEV=y -# CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_SLAVE is not set # CONFIG_SPI_DYNAMIC is not set @@ -3141,7 +3124,6 @@ CONFIG_MSM_SDE_ROTATOR=y # Media ancillary drivers (tuners, sensors, i2c, spi, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=y # @@ -4296,11 +4278,7 @@ CONFIG_STAGING=y # CONFIG_IRDA is not set # CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set -# CONFIG_RTL8192U is not set -# CONFIG_RTLLIB is not set -# CONFIG_RTL8723BS is not set # CONFIG_R8712U is not set -# CONFIG_R8188EU is not set # CONFIG_RTS5208 is not set # @@ -4398,8 +4376,6 @@ CONFIG_ION=y # CONFIG_ION_DEFER_FREE_NO_SCHED_IDLE is not set # CONFIG_ION_POOL_AUTO_REFILL is not set # CONFIG_STAGING_BOARD is not set -# CONFIG_LTE_GDM724X is not set -# CONFIG_LNET is not set # CONFIG_DGNC is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set @@ -5231,12 +5207,6 @@ CONFIG_SENSORS_SSC=y # CONFIG_RMNET_PERF is not set # CONFIG_RMNET_SHS is not set -# -# KernelSU -# -CONFIG_KSU=y -# CONFIG_KSU_DEBUG is not set - # # Firmware Drivers # @@ -5635,11 +5605,9 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_LKDTM is not set # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_STRING_HELPERS is not set @@ -5649,15 +5617,10 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_TEST_UUID is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_MEMTEST is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_TEST_KMOD is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set @@ -5676,7 +5639,6 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y # CONFIG_DEBUG_WX is not set CONFIG_DEBUG_ALIGN_RODATA=y # CONFIG_DEBUG_EFI is not set -# CONFIG_ARM64_RELOC_TEST is not set # CONFIG_ARM64_STRICT_BREAK_BEFORE_MAKE is not set # CONFIG_CORESIGHT is not set @@ -5774,7 +5736,6 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_MCRYPTD is not set CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_TEST is not set CONFIG_CRYPTO_SIMD=y # diff --git a/drivers/Kconfig b/drivers/Kconfig index 0abb07f9f9d6..aa1685071f74 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -229,5 +229,4 @@ source "drivers/esoc/Kconfig" source "techpack/data/drivers/Kconfig" -source "drivers/kernelsu/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index dd75b83daddb..ec04b87beb83 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -192,4 +192,3 @@ obj-$(CONFIG_ESOC) += esoc/ # GNSS driver obj-$(CONFIG_GNSS_SIRF) += gnsssirf/ obj-$(CONFIG_GNSS) += gnss/ -obj-$(CONFIG_KSU) += kernelsu/ diff --git a/drivers/kernelsu b/drivers/kernelsu deleted file mode 120000 index 9e51d0d62734..000000000000 --- a/drivers/kernelsu +++ /dev/null @@ -1 +0,0 @@ -../KernelSU/kernel \ No newline at end of file diff --git a/repos/repos.ginkgo.json b/repos/repos.ginkgo.json index 1c93d1691556..c80cc199db00 100644 --- a/repos/repos.ginkgo.json +++ b/repos/repos.ginkgo.json @@ -7,7 +7,7 @@ "device": "ginkgo", "defconfig": "genom_defconfig" }, - "withKernelSU": true, + "withKernelSU": false, "toolchains": [ { "url": "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/refs/tags/android-11.0.0_r48/clang-r383902b1.tar.gz",