diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-23 20:49:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-23 20:49:47 +0200 |
| commit | 01af213ee5720c929973534da555f89abaf301f5 (patch) | |
| tree | ec643a6706dbd897cda01502ca9334e5cb8c7e90 | |
| parent | 3b535417ea9a232a2e536a637e2fbf2440163d60 (diff) | |
linux: realtime patch breaks sparc v8, so change it to a conditional patch again
| -rw-r--r-- | target/linux/config/Config.in.kernel | 5 | ||||
| -rw-r--r-- | target/linux/patches/4.1.26/patch-realtime (renamed from target/linux/patches/4.1.26/realtime.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.4.13/patch-realtime (renamed from target/linux/patches/4.4.13/realtime.patch) | 0 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 5 |
4 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index c33fc2473..2485300e8 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -111,6 +111,9 @@ config ADK_KERNEL_KERNEL_MODE_NEON bool default y if ADK_TARGET_ARCH_ARM_WITH_NEON +config ADK_KERNEL_PATCH_REALTIME + bool + choice prompt "preemptive mode" @@ -134,6 +137,7 @@ config ADK_KERNEL_PREEMPT__LL config ADK_KERNEL_PREEMPT_RTB bool "Preemptible Kernel (Basic RealTime)" select ADK_KERNEL_HIGH_RES_TIMERS + select ADK_KERNEL_PATCH_REALTIME depends on ADK_TARGET_KERNEL_VERSION_4_1 \ || ADK_TARGET_KERNEL_VERSION_4_4 help @@ -142,6 +146,7 @@ config ADK_KERNEL_PREEMPT_RTB config ADK_KERNEL_PREEMPT_RT_FULL bool "Fully Preemptible Kernel (RealTime)" select ADK_KERNEL_HIGH_RES_TIMERS + select ADK_KERNEL_PATCH_REALTIME depends on ADK_TARGET_KERNEL_VERSION_4_1 \ || ADK_TARGET_KERNEL_VERSION_4_4 help diff --git a/target/linux/patches/4.1.26/realtime.patch b/target/linux/patches/4.1.26/patch-realtime index 6ecf019b9..6ecf019b9 100644 --- a/target/linux/patches/4.1.26/realtime.patch +++ b/target/linux/patches/4.1.26/patch-realtime diff --git a/target/linux/patches/4.4.13/realtime.patch b/target/linux/patches/4.4.13/patch-realtime index c677e4098..c677e4098 100644 --- a/target/linux/patches/4.4.13/realtime.patch +++ b/target/linux/patches/4.4.13/patch-realtime diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 13dd3b02d..ee4c8079c 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -28,6 +28,11 @@ ifneq ($(ADK_DISABLE_KERNEL_PATCHES),y) $(TRACE) kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER) \ $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_FILE_VER) *.patch $(MAKE_TRACE) +ifeq ($(ADK_KERNEL_PATCH_REALTIME),y) + $(TRACE) linux-rt-kernel-patch + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER) \ + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_FILE_VER) patch-realtime $(MAKE_TRACE) +endif endif ifneq ($(ADK_DISABLE_TARGET_KERNEL_PATCHES),y) $(TRACE) kernel-target-patch |