From 36801d87e5ae340f3be39b3060c8362d9c7c483c Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 9 May 2022 06:02:08 +0200
Subject: [PATCH] ipq807x: add qsdk kernel support

Signed-off-by: John Crispin <john@phrozen.org>
---
 include/kernel-version.mk    | 5 +++++
 include/kernel.mk            | 3 ++-
 include/package.mk           | 8 ++++----
 toolchain/gcc/Config.version | 3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 6f65918..40e6048 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,11 +7,16 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 
 LINUX_VERSION-4.14 = .193
+ifeq ($(CONFIG_TARGET_ipq807x_ipq807x)$(CONFIG_TARGET_ipq807x_ipq60xx)$(CONFIG_TARGET_ipq807x_ipq50xx),y)
+LINUX_VERSION-5.4 = .164
+else
 LINUX_VERSION-5.4 = .158
+endif
 LINUX_VERSION-5.10 = .27
 
 LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
 LINUX_KERNEL_HASH-5.4.158 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
+LINUX_KERNEL_HASH-5.4.164 = 925f59a86b9549afd5e4b88b468789ffac3a5dc7b4a8a0c9ca718405675bd3e8
 LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git a/include/kernel.mk b/include/kernel.mk
index e4074a4..6c99301 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -100,8 +100,9 @@ endif
 
 KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS)
 
+#KCFLAGS="$(call iremap,$(BUILD_DIR),$(notdir $(BUILD_DIR)))" \
+
 KERNEL_MAKE_FLAGS = \
-	KCFLAGS="$(call iremap,$(BUILD_DIR),$(notdir $(BUILD_DIR)))" \
 	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
 	CROSS_COMPILE="$(KERNEL_CROSS)" \
 	ARCH="$(LINUX_KARCH)" \
diff --git a/include/package.mk b/include/package.mk
index db0a869..89ddcbc 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -29,10 +29,10 @@ ifdef CONFIG_USE_MIPS16
     TARGET_CFLAGS += -mips16 -minterlink-mips16
   endif
 endif
-ifeq ($(strip $(PKG_IREMAP)),1)
-  IREMAP_CFLAGS = $(call iremap,$(PKG_BUILD_DIR),$(notdir $(PKG_BUILD_DIR)))
-  TARGET_CFLAGS += $(IREMAP_CFLAGS)
-endif
+#ifeq ($(strip $(PKG_IREMAP)),1)
+#  IREMAP_CFLAGS = $(call iremap,$(PKG_BUILD_DIR),$(notdir $(PKG_BUILD_DIR)))
+#  TARGET_CFLAGS += $(IREMAP_CFLAGS)
+#endif
 
 include $(INCLUDE_DIR)/hardening.mk
 include $(INCLUDE_DIR)/prereq.mk
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 09deae3..a06783f 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -4,6 +4,9 @@ config GCC_VERSION_5
 
 config GCC_VERSION_7
 	default y if GCC_USE_VERSION_7
+	default y if TARGET_ipq807x_ipq807x
+	default y if TARGET_ipq807x_ipq60xx
+	default y if TARGET_ipq807x_ipq50xx
 	bool
 
 config GCC_VERSION_9
-- 
2.7.4