From d819868342c12135161a13d2907eba8b9c39b34c Mon Sep 17 00:00:00 2001 From: Emil Kosz Date: Sun, 13 Sep 2026 20:11:40 +0200 Subject: [PATCH] patch: remove kernel & los patches --- ...-arch-msm-config-and-defconfig-fixes.patch | 42 ------------------- .../kernel/0002-kernel-timeconst-pl-fix.patch | 18 -------- .../kernel/0003-kernel-modpost-nonfatal.patch | 19 --------- .../0004-kernel-dtc-fcommon-host-build.patch | 15 ------- ...01-libbt-vendor-define-tiocpm-ioctls.patch | 27 ------------ 5 files changed, 121 deletions(-) delete mode 100644 patches/kernel/0001-kernel-arch-msm-config-and-defconfig-fixes.patch delete mode 100644 patches/kernel/0002-kernel-timeconst-pl-fix.patch delete mode 100644 patches/kernel/0003-kernel-modpost-nonfatal.patch delete mode 100644 patches/kernel/0004-kernel-dtc-fcommon-host-build.patch delete mode 100644 patches/los/0001-libbt-vendor-define-tiocpm-ioctls.patch diff --git a/patches/kernel/0001-kernel-arch-msm-config-and-defconfig-fixes.patch b/patches/kernel/0001-kernel-arch-msm-config-and-defconfig-fixes.patch deleted file mode 100644 index b6c9f2b..0000000 --- a/patches/kernel/0001-kernel-arch-msm-config-and-defconfig-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: rubenslte-builder -Date: Wed, 22 Jul 2026 10:30:00 +0200 -Subject: [PATCH 3/8] kernel-add-missing-ARCH_MSM-config-and-defconfig-fixes - -Add ARCH_MSM Kconfig entry and CONFIG_OF/CONFIG_ARCH_MSM to variant defconfig ---- -diff --git a/kernel/samsung/rubenslte/arch/arm/mach-msm/Kconfig b/kernel/samsung/rubenslte/arch/arm/mach-msm/Kconfig ---- a/kernel/samsung/rubenslte/arch/arm/mach-msm/Kconfig -+++ b/kernel/samsung/rubenslte/arch/arm/mach-msm/Kconfig -@@ -1,3 +1,14 @@ -+config ARCH_MSM -+ bool "Qualcomm MSM (Snapdragon)" -+ select ARM_GIC -+ select GENERIC_CLOCKEVENTS -+ select GENERIC_IRQ_CHIP -+ select ARM_HAS_SG_CHAIN -+ select SPARSE_IRQ -+ select MULTI_IRQ_HANDLER -+ select HAVE_SCHED_CLOCK -+ select CLKDEV_LOOKUP -+ - if ARCH_MSM - - menu "MSM SoC Type" -diff --git a/kernel/samsung/rubenslte/arch/arm/configs/msm8926-sec_rubenslte_defconfig b/kernel/samsung/rubenslte/arch/arm/configs/msm8926-sec_rubenslte_defconfig ---- a/kernel/samsung/rubenslte/arch/arm/configs/msm8926-sec_rubenslte_defconfig -+++ b/kernel/samsung/rubenslte/arch/arm/configs/msm8926-sec_rubenslte_defconfig -@@ -1,3 +1,6 @@ -+CONFIG_ARCH_MSM=y -+CONFIG_ARCH_MSM8226=y -+ - #variant defconfig - CONFIG_MACH_RUBENSLTE_OPEN=y - CONFIG_SEC_RUBENS_PROJECT=y -@@ -173,4 +176,6 @@ - CONFIG_CRYPTO_FIPS=y - CONFIG_CRYPTO_SHA512=y - CONFIG_LOG_BUF_SHIFT=18 -+CONFIG_OF=y -+CONFIG_OF_FLATTREE=y - # FIPS Cerified code merge - end -\ Brak znaku nowej linii na końcu pliku diff --git a/patches/kernel/0002-kernel-timeconst-pl-fix.patch b/patches/kernel/0002-kernel-timeconst-pl-fix.patch deleted file mode 100644 index 4f72f80..0000000 --- a/patches/kernel/0002-kernel-timeconst-pl-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: rubenslte-builder -Date: Wed, 22 Jul 2026 10:30:00 +0200 -Subject: [PATCH 6/8] kernel-timeconst-pl-fix-deprecated-defined-array - -Fix 'defined(@array)' deprecated warning in Perl 5.22+ by using !@val ---- -diff --git a/kernel/samsung/rubenslte/kernel/timeconst.pl b/kernel/samsung/rubenslte/kernel/timeconst.pl ---- a/kernel/samsung/rubenslte/kernel/timeconst.pl -+++ b/kernel/samsung/rubenslte/kernel/timeconst.pl -@@ -370,7 +370,7 @@ - } - - @val = @{$canned_values{$hz}}; -- if (!defined(@val)) { -+ if (!@val) { - @val = compute_values($hz); - } - output($hz, @val); diff --git a/patches/kernel/0003-kernel-modpost-nonfatal.patch b/patches/kernel/0003-kernel-modpost-nonfatal.patch deleted file mode 100644 index 5fd76a7..0000000 --- a/patches/kernel/0003-kernel-modpost-nonfatal.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: rubenslte-builder -Date: Wed, 22 Jul 2026 10:30:00 +0200 -Subject: [PATCH 7/8] scripts-Makefile-modpost-treat-section-mismatches-as-non-fatal - -Comment out -E flag in modpost invocation so section mismatches are warnings -not errors ---- -diff --git a/kernel/samsung/rubenslte/scripts/Makefile.modpost b/kernel/samsung/rubenslte/scripts/Makefile.modpost ---- a/kernel/samsung/rubenslte/scripts/Makefile.modpost -+++ b/kernel/samsung/rubenslte/scripts/Makefile.modpost -@@ -80,7 +80,7 @@ - $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \ - $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ - $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ -- $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E) \ -+ # $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ - $(if $(cross_build),-c) - diff --git a/patches/kernel/0004-kernel-dtc-fcommon-host-build.patch b/patches/kernel/0004-kernel-dtc-fcommon-host-build.patch deleted file mode 100644 index 5f829da..0000000 --- a/patches/kernel/0004-kernel-dtc-fcommon-host-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/kernel/samsung/rubenslte/scripts/dtc/Makefile b/kernel/samsung/rubenslte/scripts/dtc/Makefile -index 2a48022c..51531eab 100755 ---- a/kernel/samsung/rubenslte/scripts/dtc/Makefile -+++ b/kernel/samsung/rubenslte/scripts/dtc/Makefile -@@ -21,8 +21,8 @@ HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC) - HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC) - HOSTCFLAGS_util.o := $(HOSTCFLAGS_DTC) - --HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC) --HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) -+HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC) -fcommon -+HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) -fcommon - - # dependencies on generated files need to be listed explicitly - $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h diff --git a/patches/los/0001-libbt-vendor-define-tiocpm-ioctls.patch b/patches/los/0001-libbt-vendor-define-tiocpm-ioctls.patch deleted file mode 100644 index 0dfe8ef..0000000 --- a/patches/los/0001-libbt-vendor-define-tiocpm-ioctls.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix libbt-vendor (hardware/qcom/bt-caf) build - -TIOCPMGET/TIOCPMPUT/TIOCPMACT are MSM-serial power-management ioctls -used by bluedroid's UART clocking code but absent from the bionic -kernel uapi headers, so hci_uart.c / bt_vendor_qcom.c fail with -"use of undeclared identifier". Define them (guarded) in hci_uart.h. - -diff --git a/hardware/qcom/bt-caf/libbt-vendor/include/hci_uart.h b/hardware/qcom/bt-caf/libbt-vendor/include/hci_uart.h -index 21e9689..4997d8b 100644 ---- a/hardware/qcom/bt-caf/libbt-vendor/include/hci_uart.h -+++ b/hardware/qcom/bt-caf/libbt-vendor/include/hci_uart.h -@@ -93,6 +93,15 @@ - - /* UART CLOCK IOCTLS*/ - /* UART CLOCK IOCTLS*/ -+#ifndef TIOCPMGET -+#define TIOCPMGET 0x546C -+#endif -+#ifndef TIOCPMPUT -+#define TIOCPMPUT 0x546D -+#endif -+#ifndef TIOCPMACT -+#define TIOCPMACT 0x546E -+#endif - #define USERIAL_OP_CLK_ON TIOCPMGET /* PM get */ - #define USERIAL_OP_CLK_OFF TIOCPMPUT /* PM put */ - #define USERIAL_OP_CLK_STATE TIOCPMACT /* PM is active */