From 0f0506af5ddbf18aab7fbb5656c82f84e0ef2355 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Sun, 20 Jun 2021 19:47:54 +0000
Subject: [PATCH] buildsystem: move TARGET_KERNEL_PATCH_ARCH to
 config/arch.ARCH

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 config/arch.arm                               | 4 ++++
 projects/ARM/devices/ARMv8/options            | 1 -
 projects/Allwinner/devices/A64/options        | 1 -
 projects/Allwinner/devices/H5/options         | 1 -
 projects/Allwinner/devices/H6/options         | 1 -
 projects/Amlogic/devices/AMLGX/options        | 1 -
 projects/NXP/devices/iMX8/options             | 1 -
 projects/Qualcomm/devices/Dragonboard/options | 1 -
 projects/Rockchip/devices/RK3328/options      | 1 -
 projects/Rockchip/devices/RK3399/options      | 1 -
 10 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/config/arch.arm b/config/arch.arm
index c2198b1bd7..dfcce521ac 100644
--- a/config/arch.arm
+++ b/config/arch.arm
@@ -64,6 +64,10 @@
   TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
   TARGET_KERNEL_ARCH=${TARGET_KERNEL_ARCH:-arm}
 
+  if [ "${TARGET_KERNEL_ARCH}" = "arm64" ]; then
+    TARGET_KERNEL_PATCH_ARCH="aarch64"
+  fi
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
diff --git a/projects/ARM/devices/ARMv8/options b/projects/ARM/devices/ARMv8/options
index fb5cd5860b..b330c20a19 100644
--- a/projects/ARM/devices/ARMv8/options
+++ b/projects/ARM/devices/ARMv8/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options
index 9a6f702501..7fc0302edb 100644
--- a/projects/Allwinner/devices/A64/options
+++ b/projects/Allwinner/devices/A64/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Allwinner/devices/H5/options b/projects/Allwinner/devices/H5/options
index 693e9d8814..5bd87cea7b 100644
--- a/projects/Allwinner/devices/H5/options
+++ b/projects/Allwinner/devices/H5/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options
index f621b2ca89..d4c8c18c79 100644
--- a/projects/Allwinner/devices/H6/options
+++ b/projects/Allwinner/devices/H6/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Amlogic/devices/AMLGX/options b/projects/Amlogic/devices/AMLGX/options
index 0dc315f5f3..72cb6f1261 100644
--- a/projects/Amlogic/devices/AMLGX/options
+++ b/projects/Amlogic/devices/AMLGX/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/NXP/devices/iMX8/options b/projects/NXP/devices/iMX8/options
index 59245028c5..27df9ff809 100644
--- a/projects/NXP/devices/iMX8/options
+++ b/projects/NXP/devices/iMX8/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT=hard
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Qualcomm/devices/Dragonboard/options b/projects/Qualcomm/devices/Dragonboard/options
index bdfd6eba63..f7541977d8 100644
--- a/projects/Qualcomm/devices/Dragonboard/options
+++ b/projects/Qualcomm/devices/Dragonboard/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT=hard
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Rockchip/devices/RK3328/options b/projects/Rockchip/devices/RK3328/options
index 54ae34ccf6..fc905befaa 100644
--- a/projects/Rockchip/devices/RK3328/options
+++ b/projects/Rockchip/devices/RK3328/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc"
diff --git a/projects/Rockchip/devices/RK3399/options b/projects/Rockchip/devices/RK3399/options
index 3493faf853..874904dcfd 100644
--- a/projects/Rockchip/devices/RK3399/options
+++ b/projects/Rockchip/devices/RK3399/options
@@ -11,7 +11,6 @@
         ;;
       arm)
         TARGET_KERNEL_ARCH="arm64"
-        TARGET_KERNEL_PATCH_ARCH="aarch64"
         TARGET_FLOAT="hard"
         TARGET_CPU="cortex-a72.cortex-a53"
         TARGET_CPU_FLAGS="+crc"