From e480a7ecd08e0c234cfde4528913864f18308d1f Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Sat, 12 Jun 2021 07:10:15 +0000
Subject: [PATCH] config: source config/arch.ARCH in options instead of path

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 config/options | 11 ++++++++---
 config/path    |  5 -----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/options b/config/options
index 974860b1f5..bc3bba3bcb 100644
--- a/config/options
+++ b/config/options
@@ -43,21 +43,26 @@ fi
 # read DISTRO version information
 . "${DISTRO_DIR}/${DISTRO}/version" || die "\nERROR: No distro version present\n"
 
-# read DISTRO options if available
+# read DISTRO options
 if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
   . "${DISTRO_DIR}/${DISTRO}/options"
 fi
 
-# read PROJECT options if available
+# read PROJECT options
 if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
   . "${PROJECT_DIR}/${PROJECT}/options"
 fi
 
-# read DEVICE options if available
+# read DEVICE options
 if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
   . "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
 fi
 
+# read architecture defaults
+if [ -f "config/arch.${TARGET_ARCH}" ]; then
+  . "config/arch.${TARGET_ARCH}"
+fi
+
 # projects can set KERNEL_NAME (kernel.img)
 KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
diff --git a/config/path b/config/path
index cad9605d3b..9aec4f1249 100644
--- a/config/path
+++ b/config/path
@@ -13,11 +13,6 @@ set -e
   TARGET_IMG=${TARGET_DIR:-$ROOT/target}
   ADDONS=addons
 
-# include ARCH specific options
-  if [ -f config/arch.$TARGET_ARCH ]; then
-    . config/arch.$TARGET_ARCH
-  fi
-
 [ -z "${HOST_NAME}" ] && export HOST_NAME="$($LOCAL_CC -dumpmachine)"
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}